Introduce a gas-based Storage limit per tx

Cargo.toml

@@ -48,9 +48,9 @@ bn = { package = "substrate-bn", version = "0.6", default-features = false }
 clap = { version = "4.4.3", features = ["derive", "deprecated"] }
 derive_more = "0.99"
 environmental = { version = "1.1.4", default-features = false }
-ethereum = { version = "0.14.0", default-features = false }
+ethereum = { version = "0.15.0", default-features = false }
 ethereum-types = { version = "0.14.1", default-features = false }
-evm = { git = "https://github.com/rust-blockchain/evm", rev = "b7b82c7e1fc57b7449d6dfa6826600de37cc1e65", default-features = false }
+evm = { version = "0.41.0", default-features = false }
 futures = "0.3.28"
 hash-db = { version = "0.16.0", default-features = false }
 hex = { version = "0.4.3", default-features = false, features = ["alloc"] }

frame/ethereum/src/mock.rs

@@ -132,13 +132,15 @@ impl FindAuthor<H160> for FindAuthorTruncated {
 
 const BLOCK_GAS_LIMIT: u64 = 150_000_000;
 const MAX_POV_SIZE: u64 = 5 * 1024 * 1024;
-
+/// The maximum storage growth per block in bytes.
+const MAX_STORAGE_GROWTH: u64 = 800 * 1024;
 parameter_types! {
  pub const TransactionByteFee: u64 = 1;
  pub const ChainId: u64 = 42;
  pub const EVMModuleId: PalletId = PalletId(*b"py/evmpa");
  pub BlockGasLimit: U256 = U256::from(BLOCK_GAS_LIMIT);
  pub const GasLimitPovSizeRatio: u64 = BLOCK_GAS_LIMIT.saturating_div(MAX_POV_SIZE);
+ pub const GasLimitStorageGrowthRatio: u64 = BLOCK_GAS_LIMIT.saturating_div(MAX_STORAGE_GROWTH);
  pub const WeightPerGas: Weight = Weight::from_parts(20_000, 0);
 }
 
@@ -174,6 +176,7 @@ impl pallet_evm::Config for Test {
  type OnCreate = ();
  type FindAuthor = FindAuthorTruncated;
  type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
+ type GasLimitStorageGrowthRatio = GasLimitStorageGrowthRatio;
  type SuicideQuickClearLimit = SuicideQuickClearLimit;
  type Timestamp = Timestamp;
  type WeightInfo = ();

frame/evm/precompile/dispatch/src/lib.rs

@@ -85,8 +85,11 @@ where
  return Err(err);
  }
 
- handle
- .record_external_cost(Some(info.weight.ref_time()), Some(info.weight.proof_size()))?;
+ handle.record_external_cost(
+ Some(info.weight.ref_time()),
+ Some(info.weight.proof_size()),
+ None,
+ )?;
 
  match call.dispatch(Some(origin).into()) {
  Ok(post_info) => {

frame/evm/precompile/dispatch/src/mock.rs

@@ -155,6 +155,7 @@ impl pallet_evm::Config for Test {
  type FindAuthor = FindAuthorTruncated;
  type SuicideQuickClearLimit = SuicideQuickClearLimit;
  type GasLimitPovSizeRatio = ();
+ type GasLimitStorageGrowthRatio = ();
  type Timestamp = Timestamp;
  type WeightInfo = ();
 }
@@ -185,6 +186,7 @@ impl PrecompileHandle for MockHandle {
  &mut self,
  _ref_time: Option<u64>,
  _proof_size: Option<u64>,
+ _storage_growth: Option<u64>,
  ) -> Result<(), ExitError> {
  Ok(())
  }

frame/evm/src/lib.rs

@@ -172,6 +172,9 @@ pub mod pallet {
  /// Define the quick clear limit of storage clearing when a contract suicides. Set to 0 to disable it.
  type SuicideQuickClearLimit: Get<u32>;
 
+ /// Gas limit storage growth ratio.
+ type GasLimitStorageGrowthRatio: Get<u64>;
+
  /// Get the timestamp for the current block.
  type Timestamp: Time;
 

frame/evm/src/mock.rs

@@ -122,10 +122,13 @@ impl FindAuthor<H160> for FindAuthorTruncated {
 }
 const BLOCK_GAS_LIMIT: u64 = 150_000_000;
 const MAX_POV_SIZE: u64 = 5 * 1024 * 1024;
+/// The maximum storage growth per block in bytes.
+const MAX_STORAGE_GROWTH: u64 = 400 * 1024;
 
 parameter_types! {
  pub BlockGasLimit: U256 = U256::from(BLOCK_GAS_LIMIT);
  pub const GasLimitPovSizeRatio: u64 = BLOCK_GAS_LIMIT.saturating_div(MAX_POV_SIZE);
+ pub const GasLimitStorageGrowthRatio: u64 = BLOCK_GAS_LIMIT.saturating_div(MAX_STORAGE_GROWTH);
  pub WeightPerGas: Weight = Weight::from_parts(20_000, 0);
  pub MockPrecompiles: MockPrecompileSet = MockPrecompileSet;
  pub SuicideQuickClearLimit: u32 = 0;
@@ -153,6 +156,7 @@ impl crate::Config for Test {
  type FindAuthor = FindAuthorTruncated;
  type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
  type SuicideQuickClearLimit = SuicideQuickClearLimit;
+ type GasLimitStorageGrowthRatio = GasLimitStorageGrowthRatio;
  type Timestamp = Timestamp;
  type WeightInfo = ();
 }

frame/evm/src/res/StorageGrowthTest.sol

@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.2;
+
+contract StorageGrowthTest {
+ mapping(uint256 => uint256) public map;
+ uint256 foo;
+ uint256 bar;
+ uint256 baz;
+
+ constructor() {
+ foo = 1;
+ bar = 2;
+ baz = 3;
+ }
+
+ function store() public {
+ map[0] = 1;
+ map[1] = 2;
+ map[2] = 3;
+ }
+
+ function update() public {
+ foo = 2;
+ bar = 3;
+ baz = 4;
+ }
+}

frame/evm/src/res/storage_growth_test_contract_bytecode.txt

@@ -0,0 +1 @@
+608060405234801561001057600080fd5b506001808190555060028081905550600380819055506101c7806100356000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c8063975057e714610046578063a2e6204514610050578063b8dda9c71461005a575b600080fd5b61004e61008a565b005b6100586100d6565b005b610074600480360381019061006f919061011d565b6100f0565b6040516100819190610155565b60405180910390f35b6001600080808152602001908152602001600020819055506002600080600181526020019081526020016000208190555060036000806002815260200190815260200160002081905550565b600260018190555060036002819055506004600381905550565b60006020528060005260406000206000915090505481565b6000813590506101178161017a565b92915050565b60006020828403121561012f57600080fd5b600061013d84828501610108565b91505092915050565b61014f81610170565b82525050565b600060208201905061016a6000830184610146565b92915050565b6000819050919050565b61018381610170565b811461018e57600080fd5b5056fea2646970667358221220b25685afab962e465f0b43f6c4de10c82a565f50f6995c1cd444b002bcdd43e964736f6c63430008020033