Merge remote-tracking branch 'origin/main' into 2039-refactor-blockstore

Zilliqa · Jan 29, 2025 · a845a55 · a845a55
2 parents 5dce6ae + 521ad2f
commit a845a55
Show file tree

Hide file tree

Showing 15 changed files with 367 additions and 122 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/config-example.toml b/config-example.toml
@@ -58,3 +58,5 @@ consensus.minimum_stake = "10_000_000_000_000_000_000_000_000"
 # Gas parameters
 consensus.eth_block_gas_limit = 84000000
 consensus.gas_price = "4_761_904_800_000"
+
+consensus.genesis_fork = { at_height = 0, call_mode_1_sets_caller_to_parent_caller = false, failed_scilla_call_from_gas_exempt_caller_causes_revert = false, scilla_messages_can_call_evm_contracts = false, scilla_contract_creation_increments_account_balance = false }
diff --git a/config-single-node.toml b/config-single-node.toml
@@ -28,3 +28,5 @@ consensus.minimum_stake = "10_000_000_000_000_000_000_000_000"
 consensus.eth_block_gas_limit = 84000000
 consensus.gas_price = "4_761_904_800_000"
 consensus.local_address = "host.docker.internal"
+
+consensus.genesis_fork = { at_height = 0, call_mode_1_sets_caller_to_parent_caller = false, failed_scilla_call_from_gas_exempt_caller_causes_revert = false, scilla_messages_can_call_evm_contracts = false, scilla_contract_creation_increments_account_balance = true }
diff --git a/infra/config_docker.toml b/infra/config_docker.toml
@@ -87,3 +87,4 @@ consensus.minimum_stake = "10_000_000_000_000_000_000_000_000"
 # Gas parameters
 consensus.eth_block_gas_limit = 84000000
 consensus.gas_price = "4_761_904_800_000"
+consensus.contract_upgrade_block_heights = { deposit_v3 = 0 }
diff --git a/infra/config_rpc_disabled.toml b/infra/config_rpc_disabled.toml
@@ -28,3 +28,4 @@ consensus.minimum_stake = "10_000_000_000_000_000_000_000_000"
 # Gas parameters
 consensus.eth_block_gas_limit = 84000000
 consensus.gas_price = "4_761_904_800_000"
+consensus.contract_upgrade_block_heights = { deposit_v3 = 0 }
diff --git a/z2/resources/chain-specs/zq2-protomainnet.toml b/z2/resources/chain-specs/zq2-protomainnet.toml
@@ -19,7 +19,8 @@ consensus.scilla_call_gas_exempt_addrs = ["0x95347b860Bd49818AFAccCA8403C55C23e7
 consensus.contract_upgrade_block_heights = { deposit_v3 = 5342400 }
 
 api_servers = [{ port = 4201, enabled_apis = [{ apis = ["blockNumber"], namespace = "eth" }] }, { enabled_apis = ["admin", "erigon", "eth", "net", "ots", "trace", "txpool", "web3", "zilliqa"], port = 4202 }]
+
+consensus.genesis_fork = { at_height = 0, call_mode_1_sets_caller_to_parent_caller = false, failed_scilla_call_from_gas_exempt_caller_causes_revert = false, scilla_messages_can_call_evm_contracts = false, scilla_contract_creation_increments_account_balance = false }
 consensus.forks = [
-    { at_height = 0, call_mode_1_sets_caller_to_parent_caller = false, failed_scilla_call_from_gas_exempt_caller_causes_revert = false, scilla_messages_can_call_evm_contracts = false, scilla_contract_creation_increments_account_balance = false },
-    { at_height = 5342400, call_mode_1_sets_caller_to_parent_caller = true, failed_scilla_call_from_gas_exempt_caller_causes_revert = true, scilla_messages_can_call_evm_contracts = false, scilla_contract_creation_increments_account_balance = false }
+    { at_height = 5342400, call_mode_1_sets_caller_to_parent_caller = true, failed_scilla_call_from_gas_exempt_caller_causes_revert = true }
 ]
diff --git a/z2/resources/chain-specs/zq2-prototestnet.toml b/z2/resources/chain-specs/zq2-prototestnet.toml
@@ -19,8 +19,9 @@ consensus.scilla_call_gas_exempt_addrs = ["0x60E6b5b1B8D3E373E1C04dC0b4f5624776b
 consensus.contract_upgrade_block_heights = { deposit_v3 = 8406000 }
 
 api_servers = [{ port = 4201, enabled_apis = [{ apis = ["blockNumber"], namespace = "eth" }] }, { enabled_apis = ["admin", "erigon", "eth", "net", "ots", "trace", "txpool", "web3", "zilliqa"], port = 4202 }]
+
+consensus.genesis_fork = { at_height = 0, call_mode_1_sets_caller_to_parent_caller = false, failed_scilla_call_from_gas_exempt_caller_causes_revert = false, scilla_messages_can_call_evm_contracts = false, scilla_contract_creation_increments_account_balance = false }
 consensus.forks = [
-    { at_height = 0, call_mode_1_sets_caller_to_parent_caller = false, failed_scilla_call_from_gas_exempt_caller_causes_revert = false, scilla_messages_can_call_evm_contracts = false, scilla_contract_creation_increments_account_balance = false },
-    { at_height = 8404000, call_mode_1_sets_caller_to_parent_caller = true, failed_scilla_call_from_gas_exempt_caller_causes_revert = true, scilla_messages_can_call_evm_contracts = false, scilla_contract_creation_increments_account_balance = false },
-    { at_height = 10200000, call_mode_1_sets_caller_to_parent_caller = true, failed_scilla_call_from_gas_exempt_caller_causes_revert = true, scilla_messages_can_call_evm_contracts = true, scilla_contract_creation_increments_account_balance = false }
+    { at_height = 8404000, call_mode_1_sets_caller_to_parent_caller = true, failed_scilla_call_from_gas_exempt_caller_causes_revert = true },
+    { at_height = 10200000, scilla_messages_can_call_evm_contracts = true }
 ]
diff --git a/z2/src/setup.rs b/z2/src/setup.rs
@@ -18,7 +18,9 @@ use tokio::fs;
 /// For now, it just generates secret keys (which should be different each run, or we will become dependent on their values)
 use zilliqa::{
     api,
-    cfg::{max_rpc_response_size_default, state_cache_size_default, ApiServer},
+    cfg::{
+        genesis_fork_default, max_rpc_response_size_default, state_cache_size_default, ApiServer,
+    },
     crypto::{SecretKey, TransactionPublicKey},
 };
 use zilliqa::{
@@ -28,7 +30,7 @@ use zilliqa::{
         eth_chain_id_default, failed_request_sleep_duration_default, local_address_default,
         max_blocks_in_flight_default, scilla_address_default, scilla_ext_libs_path_default,
         scilla_stdlib_dir_default, state_rpc_limit_default, total_native_token_supply_default,
-        Amount, ConsensusConfig, ContractUpgradesBlockHeights, Forks, GenesisDeposit,
+        Amount, ConsensusConfig, ContractUpgradesBlockHeights, GenesisDeposit,
     },
     transaction::EvmGas,
 };
@@ -537,7 +539,8 @@ impl Setup {
                     total_native_token_supply: total_native_token_supply_default(),
                     scilla_call_gas_exempt_addrs: vec![],
                     contract_upgrade_block_heights: ContractUpgradesBlockHeights::default(),
-                    forks: Forks::default(),
+                    forks: vec![],
+                    genesis_fork: genesis_fork_default(),
                 },
                 block_request_limit: block_request_limit_default(),
                 max_blocks_in_flight: max_blocks_in_flight_default(),

diff --git a/zilliqa/Cargo.toml b/zilliqa/Cargo.toml
@@ -59,7 +59,7 @@ rand_chacha = "0.3.1"
 rand_core = "0.6.4"
 revm = { version = "18.0.0", features = ["optional_no_base_fee"] }
 revm-inspectors = { version = "0.11.0", features = ["js-tracer"] }
-rusqlite = { version = "0.32.1", features = ["bundled", "trace"] }
+rusqlite = { version = "0.33.0", features = ["bundled", "trace"] }
 serde = { version = "1.0.217", features = ["derive", "rc"] }
 serde_bytes = "0.11.14"
 serde_json = { version = "1.0.137", features = ["raw_value","arbitrary_precision"] }