Testnet Runtime Upgrade v136

README.md

@@ -47,6 +47,7 @@ To run a full network with multiple NeuroWeb nodes (collators and non-collators)
 #### Run A Relay Chain
 
 To start a relay chain we recommend reading and following instructions in [Cumulus Workshop](https://docs.substrate.io/tutorials/build-a-parachain/prepare-a-local-relay-chain/).
+
 NeuroWeb is currently compatible with Polkadot v1.11.0 version.
 
 #### Parachain Nodes (Collators)

node/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "neuroweb-node"
-version = "1.5.1"
+version = "1.5.0"
 authors = ["TraceLabs"]
 description = "NeuroWeb - Cumulus FRAME-based Substrate Node"
 license = "GPL-3.0-only"

runtime/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "neuroweb-runtime"
-version = "1.5.1"
+version = "1.5.2"
 authors = ["TraceLabs"]
 description = "NeuroWeb Runtime - Cumulus FRAME-based Substrate Runtime"
 license = "GPL-3.0-only"
@@ -11,9 +11,6 @@ edition = "2021"
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
-[build-dependencies]
-substrate-wasm-builder = { workspace = true }
-
 [dependencies]
 codec = { workspace = true }
 hex-literal = { workspace = true, optional = true }
@@ -101,6 +98,9 @@ pallet-democracy = { workspace = true }
 pallet-identity = { workspace = true }
 pallet-preimage = { workspace = true }
 
+[build-dependencies]
+substrate-wasm-builder = { workspace = true, optional = true }
+
 [features]
 default = ["std"]
 std = [
@@ -166,6 +166,7 @@ std = [
 	"sp-session/std",
 	"sp-std/std",
 	"sp-transaction-pool/std",
+	"substrate-wasm-builder",
 	"sp-version/std",
 	"xcm-builder/std",
 	"xcm-executor/std",
@@ -232,3 +233,5 @@ try-runtime = [
 	"pallet-xcm/try-runtime",
 	"parachain-info/try-runtime",
 ]
+
+metadata-hash = ["substrate-wasm-builder/metadata-hash"]

runtime/src/lib.rs

@@ -141,7 +141,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("origintrail-parachain"),
     impl_name: create_runtime_str!("neuroweb"),
     authoring_version: 1,
-    spec_version: 135,
+    spec_version: 136,
     impl_version: 0,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 1,
@@ -1456,6 +1456,8 @@ impl_runtime_apis! {
 			estimate: bool,
 			access_list: Option<Vec<(H160, Vec<H256>)>>,
 		) -> Result<pallet_evm::CallInfo, sp_runtime::DispatchError> {
+            use pallet_evm::GasWeightMapping as _;
+
 			let config = if estimate {
 				let mut config = <Runtime as pallet_evm::Config>::config().clone();
 				config.estimate = true;
@@ -1464,8 +1466,49 @@ impl_runtime_apis! {
 				None
 			};
 
-			let is_transactional = false;
+            let is_transactional = false;
             let validate = true;
+
+            // Estimated encoded transaction size must be based on the heaviest transaction
+            // type (EIP1559Transaction) to be compatible with all transaction types.
+            let mut estimated_transaction_len = data.len() +
+                // pallet ethereum index: 1
+                // transact call index: 1
+                // Transaction enum variant: 1
+                // chain_id 8 bytes
+                // nonce: 32
+                // max_priority_fee_per_gas: 32
+                // max_fee_per_gas: 32
+                // gas_limit: 32
+                // action: 21 (enum varianrt + call address)
+                // value: 32
+                // access_list: 1 (empty vec size)
+                // 65 bytes signature
+                258;
+
+            if access_list.is_some() {
+                estimated_transaction_len += access_list.encoded_size();
+            }
+
+
+            let gas_limit = if gas_limit > U256::from(u64::MAX) {
+                u64::MAX
+            } else {
+                gas_limit.low_u64()
+            };
+			let without_base_extrinsic_weight = true;
+
+			let (weight_limit, proof_size_base_cost) =
+				match <Runtime as pallet_evm::Config>::GasWeightMapping::gas_to_weight(
+					gas_limit,
+					without_base_extrinsic_weight
+				) {
+					weight_limit if weight_limit.proof_size() > 0 => {
+						(Some(weight_limit), Some(estimated_transaction_len as u64))
+					}
+					_ => (None, None),
+				};
+
 			<Runtime as pallet_evm::Config>::Runner::call(
 				from,
 				to,
@@ -1477,11 +1520,10 @@ impl_runtime_apis! {
 				nonce,
 				access_list.unwrap_or_default(),
 				is_transactional,
-                validate,
-                // TODO we probably want to support external cost recording in non-transactional calls
-				None,
-				None,
-				config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),
+				validate,
+				weight_limit,
+				proof_size_base_cost,
+				config.as_ref().unwrap_or(<Runtime as pallet_evm::Config>::config()),
 			).map_err(|err| err.error.into())
 		}
 
@@ -1496,6 +1538,8 @@ impl_runtime_apis! {
 			estimate: bool,
 			access_list: Option<Vec<(H160, Vec<H256>)>>,
 		) -> Result<pallet_evm::CreateInfo, sp_runtime::DispatchError> {
+			use pallet_evm::GasWeightMapping as _;
+
 			let config = if estimate {
 				let mut config = <Runtime as pallet_evm::Config>::config().clone();
 				config.estimate = true;
@@ -1504,8 +1548,48 @@ impl_runtime_apis! {
 				None
 			};
 
-			let is_transactional = false;
+            let is_transactional = false;
             let validate = true;
+
+			let mut estimated_transaction_len = data.len() +
+				// from: 20
+				// value: 32
+				// gas_limit: 32
+				// nonce: 32
+				// 1 byte transaction action variant
+				// chain id 8 bytes
+				// 65 bytes signature
+				190;
+
+			if max_fee_per_gas.is_some() {
+				estimated_transaction_len += 32;
+			}
+			if max_priority_fee_per_gas.is_some() {
+				estimated_transaction_len += 32;
+			}
+			if access_list.is_some() {
+				estimated_transaction_len += access_list.encoded_size();
+			}
+
+
+			let gas_limit = if gas_limit > U256::from(u64::MAX) {
+				u64::MAX
+			} else {
+				gas_limit.low_u64()
+			};
+			let without_base_extrinsic_weight = true;
+
+			let (weight_limit, proof_size_base_cost) =
+				match <Runtime as pallet_evm::Config>::GasWeightMapping::gas_to_weight(
+					gas_limit,
+					without_base_extrinsic_weight
+				) {
+					weight_limit if weight_limit.proof_size() > 0 => {
+						(Some(weight_limit), Some(estimated_transaction_len as u64))
+					}
+					_ => (None, None),
+				};
+
 			<Runtime as pallet_evm::Config>::Runner::create(
 				from,
 				data,
@@ -1515,12 +1599,11 @@ impl_runtime_apis! {
 				max_priority_fee_per_gas,
 				nonce,
 				access_list.unwrap_or_default(),
-				is_transactional,
+                is_transactional,
                 validate,
-                // TODO we probably want to support external cost recording in non-transactional calls
-				None,
-				None,
-				config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),
+				weight_limit,
+				proof_size_base_cost,
+				config.as_ref().unwrap_or(<Runtime as pallet_evm::Config>::config()),
 			).map_err(|err| err.error.into())
 		}
 
@@ -1682,7 +1765,7 @@ impl_runtime_apis! {
         fn get_preset(id: &Option<sp_genesis_builder::PresetId>) -> Option<Vec<u8>> {
             get_preset::<RuntimeGenesisConfig>(id, |_| None)
         }
-
+      
         fn preset_names() -> Vec<sp_genesis_builder::PresetId> {
             vec![]
         }