From ecae5f1c47fcd17deb86f390ccb8a9591f9afd9e Mon Sep 17 00:00:00 2001 From: sunce86 Date: Tue, 3 Aug 2021 11:47:01 +0200 Subject: [PATCH 1/2] Revert "Sunce86/eip1559 for x dai (#499)" This reverts commit 87ae05d99efed326162aeffd956a19a9775d1cc2. --- bin/oe/cli/mod.rs | 2 +- crates/concensus/miner/src/pool/queue.rs | 5 +- crates/concensus/miner/src/pool/verifier.rs | 36 +--- .../res/chainspec/test/contract_ver_4.sol | 65 ------- .../test/contract_ver_4_genesis.json | 44 ----- crates/ethcore/res/contracts/tx_acl_1559.json | 91 ---------- crates/ethcore/src/client/client.rs | 6 +- crates/ethcore/src/tx_filter.rs | 167 +----------------- .../types/src/transaction/transaction.rs | 16 -- 9 files changed, 15 insertions(+), 417 deletions(-) delete mode 100644 crates/ethcore/res/chainspec/test/contract_ver_4.sol delete mode 100644 crates/ethcore/res/chainspec/test/contract_ver_4_genesis.json delete mode 100644 crates/ethcore/res/contracts/tx_acl_1559.json diff --git a/bin/oe/cli/mod.rs b/bin/oe/cli/mod.rs index 82115ad9a..216b7177c 100644 --- a/bin/oe/cli/mod.rs +++ b/bin/oe/cli/mod.rs @@ -680,7 +680,7 @@ usage! { ARG arg_min_gas_price: (Option) = None, or |c: &Config| c.mining.as_ref()?.min_gas_price.clone(), "--min-gas-price=[STRING]", - "Minimum amount of Wei per GAS to be paid for a transaction on top of base fee, to be accepted for mining. Overrides --usd-per-tx.", + "Minimum amount of Wei per GAS to be paid for a transaction to be accepted for mining. Overrides --usd-per-tx.", ARG arg_gas_price_percentile: (usize) = 50usize, or |c: &Config| c.mining.as_ref()?.gas_price_percentile, "--gas-price-percentile=[PCT]", diff --git a/crates/concensus/miner/src/pool/queue.rs b/crates/concensus/miner/src/pool/queue.rs index 11ad76050..82d41b84c 100644 --- a/crates/concensus/miner/src/pool/queue.rs +++ b/crates/concensus/miner/src/pool/queue.rs @@ -659,10 +659,7 @@ impl TransactionQueue { Some(tx) => tx .signed() .effective_gas_price(self.options.read().block_base_fee), - None => { - self.options.read().minimal_gas_price - + self.options.read().block_base_fee.unwrap_or_default() - } + None => self.options.read().minimal_gas_price, } } diff --git a/crates/concensus/miner/src/pool/verifier.rs b/crates/concensus/miner/src/pool/verifier.rs index 1f08d9ce8..b8053bb8f 100644 --- a/crates/concensus/miner/src/pool/verifier.rs +++ b/crates/concensus/miner/src/pool/verifier.rs @@ -42,7 +42,7 @@ use super::{ /// Verification options. #[derive(Debug, Clone, PartialEq)] pub struct Options { - /// Minimal allowed gas price (actually minimal block producer reward = effective_priority_fee). + /// Minimal allowed gas price. pub minimal_gas_price: U256, /// Current block gas limit. pub block_gas_limit: U256, @@ -122,24 +122,6 @@ impl Transaction { } } - /// Return effective fee - part of the transaction fee that goes to the miner - pub fn effective_priority_fee(&self, block_base_fee: Option) -> U256 { - match *self { - Transaction::Unverified(ref tx) => tx.effective_priority_fee(block_base_fee), - Transaction::Retracted(ref tx) => tx.effective_priority_fee(block_base_fee), - Transaction::Local(ref tx) => tx.effective_priority_fee(block_base_fee), - } - } - - /// Cheeck if transaction is service transaction - pub fn is_service(&self) -> bool { - match *self { - Transaction::Unverified(ref tx) => tx.is_service(), - Transaction::Retracted(ref tx) => tx.is_service(), - Transaction::Local(ref tx) => tx.is_service(), - } - } - fn transaction(&self) -> &transaction::TypedTransaction { match *self { Transaction::Unverified(ref tx) => &*tx, @@ -243,26 +225,24 @@ impl txpool::Verifier } let is_own = tx.is_local(); - let is_service = tx.is_service(); + let gas_price = tx.effective_gas_price(self.options.block_base_fee); // Quick exit for non-service and non-local transactions // // We're checking if the transaction is below configured minimal gas price // or the effective minimal gas price in case the pool is full. - if !is_service && !is_own { - let effective_priority_fee = tx.effective_priority_fee(self.options.block_base_fee); - - if effective_priority_fee < self.options.minimal_gas_price { + if !gas_price.is_zero() && !is_own { + if gas_price < self.options.minimal_gas_price { trace!( target: "txqueue", "[{:?}] Rejected tx below minimal gas price threshold: {} < {}", hash, - effective_priority_fee, + gas_price, self.options.minimal_gas_price, ); bail!(transaction::Error::InsufficientGasPrice { minimal: self.options.minimal_gas_price, - got: effective_priority_fee, + got: gas_price, }); } @@ -272,7 +252,7 @@ impl txpool::Verifier target: "txqueue", "[{:?}] Rejected tx early, cause it doesn't have any chance to get to the pool: (gas price: {} < {})", hash, - tx.effective_gas_price(self.options.block_base_fee), + gas_price, vtx.transaction.effective_gas_price(self.options.block_base_fee), ); return Err(transaction::Error::TooCheapToReplace { @@ -280,7 +260,7 @@ impl txpool::Verifier vtx.transaction .effective_gas_price(self.options.block_base_fee), ), - new: Some(tx.effective_gas_price(self.options.block_base_fee)), + new: Some(gas_price), }); } } diff --git a/crates/ethcore/res/chainspec/test/contract_ver_4.sol b/crates/ethcore/res/chainspec/test/contract_ver_4.sol deleted file mode 100644 index 66ab051a4..000000000 --- a/crates/ethcore/res/chainspec/test/contract_ver_4.sol +++ /dev/null @@ -1,65 +0,0 @@ -pragma solidity ^0.4.20; - -// Adapted from https://gist.github.com/VladLupashevskyi/84f18eabb1e4afadf572cf92af3e7e7f -// and: https://github.com/poanetwork/posdao-contracts/blob/master/contracts/TxPermission.sol - -contract TxPermission { - /// Allowed transaction types mask - uint32 constant None = 0; - uint32 constant All = 0xffffffff; - uint32 constant Basic = 0x01; - uint32 constant Call = 0x02; - uint32 constant Create = 0x04; - uint32 constant Private = 0x08; - - /// Contract name - function contractName() public constant returns (string) { - return "TX_PERMISSION_CONTRACT"; - } - - /// Contract name hash - function contractNameHash() public constant returns (bytes32) { - return keccak256(contractName()); - } - - /// Contract version - function contractVersion() public constant returns (uint256) { - return 4; - } - - /// @dev Defines the allowed transaction types which may be initiated by the specified sender with - /// the specified gas price and data. Used by node's engine each time a transaction is about to be - /// included into a block. See https://openethereum.github.io/Permissioning.html#how-it-works-1 - /// @param _sender Transaction sender address. - /// @param _to Transaction recipient address. If creating a contract, the `_to` address is zero. - /// @param _value Transaction amount in wei. - /// @param _maxFeePerGas The `maxFeePerGas` in Wei for EIP-1559 transaction, or gas price for a legacy transaction. - /// @param _maxInclusionFeePerGas The `maxInclusionFeePerGas` in Wei for EIP-1559 transaction. - /// Equals to gas price for a legacy transaction. - /// @param _gasLimit Gas limit for the transaction. - /// @param _data Transaction data. - /// @return `uint32 typesMask` - Set of allowed transactions for `_sender` depending on tx `_to` address, - /// `_gasPrice`, and `_data`. The result is represented as a set of flags: - /// 0x01 - basic transaction (e.g. ether transferring to user wallet); - /// 0x02 - contract call; - /// 0x04 - contract creation; - /// 0x08 - private transaction. - /// `bool cache` - If `true` is returned, the same permissions will be applied from the same - /// `_sender` without calling this contract again. - function allowedTxTypes( - address _sender, - address _to, - uint256 _value, - uint256 _maxFeePerGas, // equals to gasPrice for legacy transactions - uint256 _maxInclusionFeePerGas, // equals to gasPrice for legacy transactions - uint256 _gasLimit, - bytes memory _data - ) - public - view - returns(uint32 typesMask, bool cache) - { - if (_maxFeePerGas > 0 || _data.length < 4) return (All, false); - return (None, false); - } -} \ No newline at end of file diff --git a/crates/ethcore/res/chainspec/test/contract_ver_4_genesis.json b/crates/ethcore/res/chainspec/test/contract_ver_4_genesis.json deleted file mode 100644 index c6e855238..000000000 --- a/crates/ethcore/res/chainspec/test/contract_ver_4_genesis.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "name": "TestNodeFilterContract", - "engine": { - "authorityRound": { - "params": { - "stepDuration": 1, - "startStep": 2, - "validators": { - "contract": "0x0000000000000000000000000000000000000000" - } - } - } - }, - "params": { - "accountStartNonce": "0x0", - "maximumExtraDataSize": "0x20", - "minGasLimit": "0x1388", - "networkID" : "0x69", - "gasLimitBoundDivisor": "0x0400", - "transactionPermissionContract": "0xAB5b100cf7C8deFB3c8f3C48474223997A50fB13", - "transactionPermissionContractTransition": "1" - }, - "genesis": { - "seal": { - "generic": "0xc180" - }, - "difficulty": "0x20000", - "author": "0x0000000000000000000000000000000000000000", - "timestamp": "0x00", - "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000", - "extraData": "0x", - "gasLimit": "0x222222" - }, - "accounts": { - "0000000000000000000000000000000000000001": { "balance": "1", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } }, - "0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } }, - "0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } }, - "0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } }, - "0xAB5b100cf7C8deFB3c8f3C48474223997A50fB13": { - "balance": "1", - "constructor": "608060405234801561001057600080fd5b50610370806100206000396000f300608060405260043610610062576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063469ab1e31461006757806375d0c0dc1461009a578063a0a8e4601461012a578063e4e3b5e514610155575b600080fd5b34801561007357600080fd5b5061007c610251565b60405180826000191660001916815260200191505060405180910390f35b3480156100a657600080fd5b506100af6102c2565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156100ef5780820151818401526020810190506100d4565b50505050905090810190601f16801561011c5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561013657600080fd5b5061013f6102ff565b6040518082815260200191505060405180910390f35b34801561016157600080fd5b50610224600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190803590602001909291908035906020019092919080359060200190929190803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509192919290505050610308565b604051808363ffffffff1663ffffffff168152602001821515151581526020019250505060405180910390f35b600061025b6102c2565b6040518082805190602001908083835b602083101515610290578051825260208201915060208101905060208303925061026b565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040518091039020905090565b60606040805190810160405280601681526020017f54585f5045524d495353494f4e5f434f4e545241435400000000000000000000815250905090565b60006004905090565b600080600086118061031b575060048351105b156103305763ffffffff600091509150610338565b600080915091505b975097955050505050505600a165627a7a72305820592b45ee74cc856b6c84f99ed8ddd4790d844a9065a07c7bbfc5dfa05cc394c50029" - } - } -} \ No newline at end of file diff --git a/crates/ethcore/res/contracts/tx_acl_1559.json b/crates/ethcore/res/contracts/tx_acl_1559.json deleted file mode 100644 index 8b8ba7bcd..000000000 --- a/crates/ethcore/res/contracts/tx_acl_1559.json +++ /dev/null @@ -1,91 +0,0 @@ -[ - { - "constant": true, - "inputs": [], - "name": "contractNameHash", - "outputs": [ - { - "name": "", - "type": "bytes32" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "contractName", - "outputs": [ - { - "name": "", - "type": "string" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "contractVersion", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "sender", - "type": "address" - }, - { - "name": "to", - "type": "address" - }, - { - "name": "value", - "type": "uint256" - }, - { - "name": "maxFeePerGas", - "type": "uint256" - }, - { - "name": "maxPriorityFeePerGas", - "type": "uint256" - }, - { - "name": "gasLimit", - "type": "uint256" - }, - { - "name": "data", - "type": "bytes" - } - ], - "name": "allowedTxTypes", - "outputs": [ - { - "name": "", - "type": "uint32" - }, - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - } -] \ No newline at end of file diff --git a/crates/ethcore/src/client/client.rs b/crates/ethcore/src/client/client.rs index e0af43403..38bbaa1bd 100644 --- a/crates/ethcore/src/client/client.rs +++ b/crates/ethcore/src/client/client.rs @@ -1955,7 +1955,7 @@ impl Call for Client { gas_used: U256::default(), gas_limit: U256::max_value(), //if gas pricing is not defined, force base_fee to zero - base_fee: if transaction.effective_gas_price(header.base_fee()).is_zero() { + base_fee: if transaction.effective_gas_price(header.base_fee()) == 0.into() { Some(0.into()) } else { header.base_fee() @@ -1988,7 +1988,7 @@ impl Call for Client { for &(ref t, analytics) in transactions { //if gas pricing is not defined, force base_fee to zero - if t.effective_gas_price(header.base_fee()).is_zero() { + if t.effective_gas_price(header.base_fee()) == 0.into() { env_info.base_fee = Some(0.into()); } else { env_info.base_fee = header.base_fee() @@ -2020,7 +2020,7 @@ impl Call for Client { last_hashes: self.build_last_hashes(header.parent_hash()), gas_used: U256::default(), gas_limit: max, - base_fee: if t.effective_gas_price(header.base_fee()).is_zero() { + base_fee: if t.effective_gas_price(header.base_fee()) == 0.into() { Some(0.into()) } else { header.base_fee() diff --git a/crates/ethcore/src/tx_filter.rs b/crates/ethcore/src/tx_filter.rs index 963dcb06a..30f0744e7 100644 --- a/crates/ethcore/src/tx_filter.rs +++ b/crates/ethcore/src/tx_filter.rs @@ -39,7 +39,6 @@ use_contract!( transact_acl_gas_price, "res/contracts/tx_acl_gas_price.json" ); -use_contract!(transact_acl_1559, "res/contracts/tx_acl_1559.json"); const MAX_CACHE_SIZE: usize = 4096; @@ -105,8 +104,6 @@ impl TransactionFilter { let sender = transaction.sender(); let value = transaction.tx().value; let gas_price = transaction.tx().gas_price; - let max_priority_fee_per_gas = transaction.max_priority_fee_per_gas(); - let gas_limit = transaction.tx().gas; let key = (*parent_hash, sender); if let Some(permissions) = permission_cache.get_mut(&key) { @@ -164,25 +161,6 @@ impl TransactionFilter { (tx_permissions::NONE, true) }) } - 4 => { - trace!(target: "tx_filter", "Using filter with maxFeePerGas and maxPriorityFeePerGas and data"); - let (data, decoder) = transact_acl_1559::functions::allowed_tx_types::call( - sender, - to, - value, - gas_price, - max_priority_fee_per_gas, - gas_limit, - transaction.tx().data.clone(), - ); - client.call_contract(BlockId::Hash(*parent_hash), contract_address, data) - .and_then(|value| decoder.decode(&value).map_err(|e| e.to_string())) - .map(|(p, f)| (p.low_u32(), f)) - .unwrap_or_else(|e| { - error!(target: "tx_filter", "Error calling tx permissions contract: {:?}", e); - (tx_permissions::NONE, true) - }) - } _ => { error!(target: "tx_filter", "Unknown version of tx permissions contract is used"); (tx_permissions::NONE, true) @@ -223,9 +201,7 @@ mod test { use std::{str::FromStr, sync::Arc}; use tempdir::TempDir; use test_helpers; - use types::transaction::{ - AccessListTx, Action, EIP1559TransactionTx, Transaction, TypedTransaction, - }; + use types::transaction::{Action, Transaction, TypedTransaction}; /// Contract code: https://gist.github.com/VladLupashevskyi/84f18eabb1e4afadf572cf92af3e7e7f #[test] @@ -462,7 +438,7 @@ mod test { )); } - /// Contract code: res/chainspec/test/contract_ver_3.sol + /// Contract code: res/tx_permission_tests/contract_ver_3.sol #[test] fn transaction_filter_ver_3() { let spec_data = include_str!("../res/chainspec/test/contract_ver_3_genesis.json"); @@ -530,145 +506,6 @@ mod test { )); } - /// Contract code: res/chainspec/test/contract_ver_4.sol - #[test] - fn transaction_filter_ver_4_legacy() { - let spec_data = include_str!("../res/chainspec/test/contract_ver_4_genesis.json"); - - let db = test_helpers::new_db(); - let tempdir = TempDir::new("").unwrap(); - let spec = Spec::load(&tempdir.path(), spec_data.as_bytes()).unwrap(); - - let client = Client::new( - ClientConfig::default(), - &spec, - db, - Arc::new(Miner::new_for_tests(&spec, None)), - IoChannel::disconnected(), - ) - .unwrap(); - let key1 = KeyPair::from_secret( - Secret::from_str("0000000000000000000000000000000000000000000000000000000000000001") - .unwrap(), - ) - .unwrap(); - - // The only difference to version 2 is that the contract now knows the transaction's gas price and data. - // So we only test those: The contract allows only transactions with either nonzero gas price or short data. - - let filter = TransactionFilter::from_params(spec.params()).unwrap(); - let mut tx = TypedTransaction::Legacy(Transaction::default()); - tx.tx_mut().action = - Action::Call(Address::from_str("0000000000000000000000000000000000000042").unwrap()); - tx.tx_mut().data = b"01234567".to_vec(); - tx.tx_mut().gas_price = 0.into(); - - let genesis = client.block_hash(BlockId::Latest).unwrap(); - let block_number = 1; - - // Data too long and gas price zero. This transaction is not allowed. - assert!(!filter.transaction_allowed( - &genesis, - block_number, - &tx.clone().sign(key1.secret(), None), - &*client - )); - - // But if we either set a nonzero gas price or short data or both, it is allowed. - tx.tx_mut().gas_price = 1.into(); - assert!(filter.transaction_allowed( - &genesis, - block_number, - &tx.clone().sign(key1.secret(), None), - &*client - )); - tx.tx_mut().data = b"01".to_vec(); - assert!(filter.transaction_allowed( - &genesis, - block_number, - &tx.clone().sign(key1.secret(), None), - &*client - )); - tx.tx_mut().gas_price = 0.into(); - assert!(filter.transaction_allowed( - &genesis, - block_number, - &tx.clone().sign(key1.secret(), None), - &*client - )); - } - - /// Contract code: res/chainspec/test/contract_ver_4.sol - #[test] - fn transaction_filter_ver_4_1559() { - let spec_data = include_str!("../res/chainspec/test/contract_ver_4_genesis.json"); - - let db = test_helpers::new_db(); - let tempdir = TempDir::new("").unwrap(); - let spec = Spec::load(&tempdir.path(), spec_data.as_bytes()).unwrap(); - - let client = Client::new( - ClientConfig::default(), - &spec, - db, - Arc::new(Miner::new_for_tests(&spec, None)), - IoChannel::disconnected(), - ) - .unwrap(); - let key1 = KeyPair::from_secret( - Secret::from_str("0000000000000000000000000000000000000000000000000000000000000001") - .unwrap(), - ) - .unwrap(); - - // The only difference to version 2 is that the contract now knows the transaction's gas price and data. - // So we only test those: The contract allows only transactions with either nonzero gas price or short data. - - let filter = TransactionFilter::from_params(spec.params()).unwrap(); - let mut tx = TypedTransaction::EIP1559Transaction(EIP1559TransactionTx { - transaction: AccessListTx::new(Transaction::default(), vec![]), - max_priority_fee_per_gas: U256::from(0), - }); - tx.tx_mut().action = - Action::Call(Address::from_str("0000000000000000000000000000000000000042").unwrap()); - tx.tx_mut().data = b"01234567".to_vec(); - tx.tx_mut().gas_price = 0.into(); - - let genesis = client.block_hash(BlockId::Latest).unwrap(); - let block_number = 1; - - // Data too long and gas price zero. This transaction is not allowed. - assert!(!filter.transaction_allowed( - &genesis, - block_number, - &tx.clone().sign(key1.secret(), None), - &*client - )); - - // But if we either set a nonzero gas price or short data or both, it is allowed. - tx.tx_mut().gas_price = 1.into(); - assert!(filter.transaction_allowed( - &genesis, - block_number, - &tx.clone().sign(key1.secret(), None), - &*client - )); - tx.tx_mut().data = b"01".to_vec(); - assert!(filter.transaction_allowed( - &genesis, - block_number, - &tx.clone().sign(key1.secret(), None), - &*client - )); - tx.tx_mut().gas_price = 0.into(); - assert!(filter.transaction_allowed( - &genesis, - block_number, - &tx.clone().sign(key1.secret(), None), - &*client - )); - } - /// Contract code: https://gist.github.com/arkpar/38a87cb50165b7e683585eec71acb05a #[test] fn transaction_filter_deprecated() { diff --git a/crates/ethcore/types/src/transaction/transaction.rs b/crates/ethcore/types/src/transaction/transaction.rs index 1954e665d..bd3f41048 100644 --- a/crates/ethcore/types/src/transaction/transaction.rs +++ b/crates/ethcore/types/src/transaction/transaction.rs @@ -651,22 +651,6 @@ impl TypedTransaction { } } - pub fn effective_priority_fee(&self, block_base_fee: Option) -> U256 { - self.effective_gas_price(block_base_fee) - .checked_sub(block_base_fee.unwrap_or_default()) - .unwrap_or_default() - } - - pub fn is_service(&self) -> bool { - match self { - Self::EIP1559Transaction(tx) => { - tx.tx().gas_price.is_zero() && tx.max_priority_fee_per_gas.is_zero() - } - Self::AccessList(tx) => tx.tx().gas_price.is_zero(), - Self::Legacy(tx) => tx.gas_price.is_zero(), - } - } - fn decode_new(tx: &[u8]) -> Result { if tx.is_empty() { // at least one byte needs to be present From 2ae294990ad4865e79b3d72d6f0c2af0f6502bdb Mon Sep 17 00:00:00 2001 From: varasev <33550681+varasev@users.noreply.github.com> Date: Tue, 3 Aug 2021 15:02:37 +0300 Subject: [PATCH 2/2] London HF on Kovan (#502) * London HF on Kovan Block number 26741100 * Set wasmDisableTransition for Kovan Co-authored-by: Dusan Stanivukovic --- crates/ethcore/res/chainspec/kovan.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/crates/ethcore/res/chainspec/kovan.json b/crates/ethcore/res/chainspec/kovan.json index 64ce4264e..b56343a21 100644 --- a/crates/ethcore/res/chainspec/kovan.json +++ b/crates/ethcore/res/chainspec/kovan.json @@ -59,6 +59,7 @@ "eip214Transition": "0x4d50f8", "eip658Transition": "0x4d50f8", "wasmActivationTransition": "0x64b540", + "wasmDisableTransition": "0x198096c", "eip145Transition": "0x8c6180", "eip1014Transition": "0x8c6180", "eip1052Transition": "0x8c6180", @@ -71,6 +72,13 @@ "eip2028Transition": "0xd751a5", "eip2929Transition": "0x179f954", "eip2930Transition": "0x179f954", + "eip1559Transition": "0x198096c", + "eip3198Transition": "0x198096c", + "eip3541Transition": "0x198096c", + "eip3529Transition": "0x198096c", + "eip1559BaseFeeMaxChangeDenominator": "0x8", + "eip1559ElasticityMultiplier": "0x2", + "eip1559BaseFeeInitialValue": "0x3B9ACA00", "kip4Transition": "0x8c6180", "kip6Transition": "0x8c6180" },