Introduce a gas-based storage limit [MBIP-5]

Cargo.toml

@@ -217,9 +217,9 @@ ethereum = { version = "0.14.0", default-features = false, features = [
 	"with-codec",
 ] }
 ethereum-types = { version = "0.14", default-features = false }
-evm = { git = "https://github.com/moonbeam-foundation/evm", branch = "tgm-record-external-cost", default-features = false }
-evm-gasometer = { git = "https://github.com/moonbeam-foundation/evm", branch = "tgm-record-external-cost", default-features = false }
-evm-runtime = { git = "https://github.com/moonbeam-foundation/evm", branch = "tgm-record-external-cost", default-features = false }
+evm = { git = "https://github.com/moonbeam-foundation/evm", rev = "a33ac87ad7462b7e7029d12c385492b2a8311d1c", default-features = false }
+evm-gasometer = { git = "https://github.com/moonbeam-foundation/evm", rev = "a33ac87ad7462b7e7029d12c385492b2a8311d1c", default-features = false }
+evm-runtime = { git = "https://github.com/moonbeam-foundation/evm", rev = "a33ac87ad7462b7e7029d12c385492b2a8311d1c", default-features = false }
 fp-ethereum = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43", default-features = false }
 fp-evm = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43", default-features = false }
 fp-rpc = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43", default-features = false }

pallets/ethereum-xcm/src/mock.rs

@@ -146,6 +146,8 @@ impl FindAuthor<H160> for FindAuthorTruncated {
 }
 
 const MAX_POV_SIZE: u64 = 5 * 1024 * 1024;
+/// Block storage limit in bytes. Set to 40 KB.
+const BLOCK_STORAGE_LIMIT: u64 = 40 * 1024;
 
 parameter_types! {
 	pub const TransactionByteFee: u64 = 1;
@@ -157,6 +159,10 @@ parameter_types! {
 		let block_gas_limit = BlockGasLimit::get().min(u64::MAX.into()).low_u64();
 		block_gas_limit.saturating_div(MAX_POV_SIZE)
 	};
+	pub GasLimitStorageGrowthRatio: u64 = {
+		let block_gas_limit = BlockGasLimit::get().min(u64::MAX.into()).low_u64();
+		block_gas_limit.saturating_div(BLOCK_STORAGE_LIMIT)
+	};
 }
 
 pub struct HashedAddressMapping;
@@ -188,6 +194,7 @@ impl pallet_evm::Config for Test {
 	type BlockHashMapping = pallet_ethereum::EthereumBlockHashMapping<Self>;
 	type OnCreate = ();
 	type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
+	type GasLimitStorageGrowthRatio = GasLimitStorageGrowthRatio;
 	type Timestamp = Timestamp;
 	type WeightInfo = pallet_evm::weights::SubstrateWeight<Test>;
 }

precompiles/assets-erc20/src/lib.rs

@@ -277,6 +277,7 @@ where
 					id: asset_id.clone().into(),
 					delegate: Runtime::Lookup::unlookup(spender.clone()),
 				},
+				0,
 			)?;
 		}
 		// Dispatch call (if enough gas).
@@ -288,6 +289,7 @@ where
 				delegate: Runtime::Lookup::unlookup(spender),
 				amount,
 			},
+			0,
 		)?;
 
 		Ok(())
@@ -319,6 +321,7 @@ where
 					target: Runtime::Lookup::unlookup(to),
 					amount: value,
 				},
+				SYSTEM_ACCOUNT_SIZE,
 			)?;
 		}
 
@@ -366,6 +369,7 @@ where
 						destination: Runtime::Lookup::unlookup(to),
 						amount: value,
 					},
+					SYSTEM_ACCOUNT_SIZE,
 				)?;
 			} else {
 				// Dispatch call (if enough gas).
@@ -377,6 +381,7 @@ where
 						target: Runtime::Lookup::unlookup(to),
 						amount: value,
 					},
+					SYSTEM_ACCOUNT_SIZE,
 				)?;
 			}
 		}
@@ -551,6 +556,7 @@ where
 					beneficiary: Runtime::Lookup::unlookup(to),
 					amount: value,
 				},
+				SYSTEM_ACCOUNT_SIZE,
 			)?;
 		}
 
@@ -596,6 +602,7 @@ where
 					who: Runtime::Lookup::unlookup(from),
 					amount: value,
 				},
+				0,
 			)?;
 		}
 
@@ -636,6 +643,7 @@ where
 					id: asset_id.into(),
 					who: Runtime::Lookup::unlookup(account),
 				},
+				0,
 			)?;
 		}
 
@@ -667,6 +675,7 @@ where
 					id: asset_id.into(),
 					who: Runtime::Lookup::unlookup(account),
 				},
+				0,
 			)?;
 		}
 
@@ -694,6 +703,7 @@ where
 				pallet_assets::Call::<Runtime, Instance>::freeze_asset {
 					id: asset_id.into(),
 				},
+				0,
 			)?;
 		}
 
@@ -721,6 +731,7 @@ where
 				pallet_assets::Call::<Runtime, Instance>::thaw_asset {
 					id: asset_id.into(),
 				},
+				0,
 			)?;
 		}
 
@@ -754,6 +765,7 @@ where
 					id: asset_id.into(),
 					owner: Runtime::Lookup::unlookup(owner),
 				},
+				0,
 			)?;
 		}
 
@@ -794,6 +806,7 @@ where
 					admin: Runtime::Lookup::unlookup(admin),
 					freezer: Runtime::Lookup::unlookup(freezer),
 				},
+				0,
 			)?;
 		}
 
@@ -827,6 +840,7 @@ where
 					symbol: symbol.into(),
 					decimals,
 				},
+				0,
 			)?;
 		}
 
@@ -854,6 +868,7 @@ where
 				pallet_assets::Call::<Runtime, Instance>::clear_metadata {
 					id: asset_id.into(),
 				},
+				0,
 			)?;
 		}
 

precompiles/assets-erc20/src/mock.rs

@@ -180,6 +180,8 @@ pub type LocalPCall = Erc20AssetsPrecompileSetCall<Runtime, IsLocal, pallet_asse
 pub type ForeignPCall = Erc20AssetsPrecompileSetCall<Runtime, IsLocal, pallet_assets::Instance1>;
 
 const MAX_POV_SIZE: u64 = 5 * 1024 * 1024;
+/// Block Storage Limit in bytes. Set to 40KB.
+const BLOCK_STORAGE_LIMIT: u64 = 40 * 1024;
 
 parameter_types! {
 	pub BlockGasLimit: U256 = U256::from(u64::MAX);
@@ -189,6 +191,10 @@ parameter_types! {
 		let block_gas_limit = BlockGasLimit::get().min(u64::MAX.into()).low_u64();
 		block_gas_limit.saturating_div(MAX_POV_SIZE)
 	};
+	pub GasLimitStorageGrowthRatio: u64 = {
+		let block_gas_limit = BlockGasLimit::get().min(u64::MAX.into()).low_u64();
+		block_gas_limit.saturating_div(BLOCK_STORAGE_LIMIT)
+	};
 }
 
 impl pallet_evm::Config for Runtime {
@@ -210,6 +216,7 @@ impl pallet_evm::Config for Runtime {
 	type FindAuthor = ();
 	type OnCreate = ();
 	type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
+	type GasLimitStorageGrowthRatio = GasLimitStorageGrowthRatio;
 	type Timestamp = Timestamp;
 	type WeightInfo = pallet_evm::weights::SubstrateWeight<Runtime>;
 }

precompiles/author-mapping/src/lib.rs

@@ -78,7 +78,7 @@ where
 		let origin = Runtime::AddressMapping::into_account_id(handle.context().caller);
 		let call = AuthorMappingCall::<Runtime>::add_association { nimbus_id };
 
-		RuntimeHelper::<Runtime>::try_dispatch(handle, Some(origin).into(), call)?;
+		RuntimeHelper::<Runtime>::try_dispatch(handle, Some(origin).into(), call, 0)?;
 
 		Ok(())
 	}
@@ -104,7 +104,7 @@ where
 			new_nimbus_id,
 		};
 
-		RuntimeHelper::<Runtime>::try_dispatch(handle, Some(origin).into(), call)?;
+		RuntimeHelper::<Runtime>::try_dispatch(handle, Some(origin).into(), call, 0)?;
 
 		Ok(())
 	}
@@ -122,7 +122,7 @@ where
 		let origin = Runtime::AddressMapping::into_account_id(handle.context().caller);
 		let call = AuthorMappingCall::<Runtime>::clear_association { nimbus_id };
 
-		RuntimeHelper::<Runtime>::try_dispatch(handle, Some(origin).into(), call)?;
+		RuntimeHelper::<Runtime>::try_dispatch(handle, Some(origin).into(), call, 0)?;
 
 		Ok(())
 	}
@@ -138,7 +138,7 @@ where
 		let origin = Runtime::AddressMapping::into_account_id(handle.context().caller);
 		let call = AuthorMappingCall::<Runtime>::remove_keys {};
 
-		RuntimeHelper::<Runtime>::try_dispatch(handle, Some(origin).into(), call)?;
+		RuntimeHelper::<Runtime>::try_dispatch(handle, Some(origin).into(), call, 0)?;
 
 		Ok(())
 	}
@@ -152,7 +152,7 @@ where
 		let origin = Runtime::AddressMapping::into_account_id(handle.context().caller);
 		let call = AuthorMappingCall::<Runtime>::set_keys { keys: keys.into() };
 
-		RuntimeHelper::<Runtime>::try_dispatch(handle, Some(origin).into(), call)?;
+		RuntimeHelper::<Runtime>::try_dispatch(handle, Some(origin).into(), call, 0)?;
 
 		Ok(())
 	}

precompiles/author-mapping/src/mock.rs

@@ -108,6 +108,8 @@ pub type PCall = AuthorMappingPrecompileCall<Runtime>;
 mock_account!(AuthorMappingAccount, |_| MockAccount::from_u64(1));
 
 const MAX_POV_SIZE: u64 = 5 * 1024 * 1024;
+/// Block storage limit in bytes. Set to 40 KB.
+const BLOCK_STORAGE_LIMIT: u64 = 40 * 1024;
 
 parameter_types! {
 	pub BlockGasLimit: U256 = U256::from(u64::MAX);
@@ -117,6 +119,10 @@ parameter_types! {
 		let block_gas_limit = BlockGasLimit::get().min(u64::MAX.into()).low_u64();
 		block_gas_limit.saturating_div(MAX_POV_SIZE)
 	};
+	pub GasLimitStorageGrowthRatio: u64 = {
+		let block_gas_limit = BlockGasLimit::get().min(u64::MAX.into()).low_u64();
+		block_gas_limit.saturating_div(BLOCK_STORAGE_LIMIT)
+	};
 }
 
 impl pallet_evm::Config for Runtime {
@@ -138,6 +144,7 @@ impl pallet_evm::Config for Runtime {
 	type FindAuthor = ();
 	type OnCreate = ();
 	type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
+	type GasLimitStorageGrowthRatio = GasLimitStorageGrowthRatio;
 	type Timestamp = Timestamp;
 	type WeightInfo = pallet_evm::weights::SubstrateWeight<Runtime>;
 }

precompiles/balances-erc20/src/lib.rs

@@ -288,6 +288,7 @@ where
 					dest: Runtime::Lookup::unlookup(to),
 					value: value,
 				},
+				SYSTEM_ACCOUNT_SIZE,
 			)?;
 		}
 
@@ -353,6 +354,7 @@ where
 					dest: Runtime::Lookup::unlookup(to),
 					value: value,
 				},
+				SYSTEM_ACCOUNT_SIZE,
 			)?;
 		}
 
@@ -414,6 +416,7 @@ where
 				dest: Runtime::Lookup::unlookup(caller),
 				value: amount,
 			},
+			SYSTEM_ACCOUNT_SIZE,
 		)?;
 
 		log2(

precompiles/balances-erc20/src/mock.rs

@@ -101,6 +101,8 @@ pub type Precompiles<R> = PrecompileSetBuilder<
 pub type PCall = Erc20BalancesPrecompileCall<Runtime, NativeErc20Metadata, ()>;
 
 const MAX_POV_SIZE: u64 = 5 * 1024 * 1024;
+/// Block storage limit in bytes. Set to 40 KB.
+const BLOCK_STORAGE_LIMIT: u64 = 40 * 1024;
 
 parameter_types! {
 	pub BlockGasLimit: U256 = U256::from(u64::MAX);
@@ -110,6 +112,10 @@ parameter_types! {
 		let block_gas_limit = BlockGasLimit::get().min(u64::MAX.into()).low_u64();
 		block_gas_limit.saturating_div(MAX_POV_SIZE)
 	};
+	pub GasLimitStorageGrowthRatio: u64 = {
+		let block_gas_limit = BlockGasLimit::get().min(u64::MAX.into()).low_u64();
+		block_gas_limit.saturating_div(BLOCK_STORAGE_LIMIT)
+	};
 }
 
 impl pallet_evm::Config for Runtime {
@@ -131,6 +137,7 @@ impl pallet_evm::Config for Runtime {
 	type FindAuthor = ();
 	type OnCreate = ();
 	type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
+	type GasLimitStorageGrowthRatio = GasLimitStorageGrowthRatio;
 	type Timestamp = Timestamp;
 	type WeightInfo = pallet_evm::weights::SubstrateWeight<Runtime>;
 }

precompiles/batch/src/mock.rs

@@ -122,6 +122,8 @@ mock_account!(Batch, |_| MockAccount::from_u64(1));
 mock_account!(Revert, |_| MockAccount::from_u64(2));
 
 const MAX_POV_SIZE: u64 = 5 * 1024 * 1024;
+/// Block storage limit in bytes. Set to 40 KB.
+const BLOCK_STORAGE_LIMIT: u64 = 40 * 1024;
 
 parameter_types! {
 	pub BlockGasLimit: U256 = U256::from(u64::MAX);
@@ -131,6 +133,10 @@ parameter_types! {
 		let block_gas_limit = BlockGasLimit::get().min(u64::MAX.into()).low_u64();
 		block_gas_limit.saturating_div(MAX_POV_SIZE)
 	};
+	pub GasLimitStorageGrowthRatio: u64 = {
+		let block_gas_limit = BlockGasLimit::get().min(u64::MAX.into()).low_u64();
+		block_gas_limit.saturating_div(BLOCK_STORAGE_LIMIT)
+	};
 }
 
 impl pallet_evm::Config for Runtime {
@@ -152,6 +158,7 @@ impl pallet_evm::Config for Runtime {
 	type FindAuthor = ();
 	type OnCreate = ();
 	type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
+	type GasLimitStorageGrowthRatio = GasLimitStorageGrowthRatio;
 	type Timestamp = Timestamp;
 	type WeightInfo = pallet_evm::weights::SubstrateWeight<Runtime>;
 }

precompiles/call-permit/src/mock.rs

@@ -137,6 +137,7 @@ impl pallet_evm::Config for Runtime {
 	type FindAuthor = ();
 	type OnCreate = ();
 	type GasLimitPovSizeRatio = ();
+	type GasLimitStorageGrowthRatio = ();
 	type Timestamp = Timestamp;
 	type WeightInfo = pallet_evm::weights::SubstrateWeight<Runtime>;
 }

precompiles/collective/src/lib.rs

@@ -136,6 +136,7 @@ where
 				proposal,
 				length_bound: proposal_length,
 			},
+			SYSTEM_ACCOUNT_SIZE,
 		)?;
 
 		log.record(handle)?;
@@ -196,6 +197,7 @@ where
 					proposal,
 					length_bound: proposal_length,
 				},
+				SYSTEM_ACCOUNT_SIZE,
 			)?;
 		}
 
@@ -230,6 +232,7 @@ where
 				index: proposal_index,
 				approve,
 			},
+			SYSTEM_ACCOUNT_SIZE,
 		)?;
 
 		log.record(handle)?;
@@ -262,6 +265,7 @@ where
 				),
 				length_bound,
 			},
+			SYSTEM_ACCOUNT_SIZE,
 		)?;
 
 		// We can know if the proposal was executed or not based on the `pays_fee` in