fix(evm): Added betanet evm chain id and renamed test_evm to testnet_evm

core/chain-configs/src/genesis_config.rs

@@ -25,9 +25,14 @@ use near_runtime_configs::RuntimeConfig;
 
 const MAX_GAS_PRICE: Balance = 10_000_000_000_000_000_000_000;
 
+#[cfg(feature = "protocol_feature_evm")]
+/// See https://github.com/ethereum-lists/chains/blob/master/_data/chains/1313161556.json
+pub const BETANET_EVM_CHAIN_ID: u64 = 1313161556;
+
 #[cfg(feature = "protocol_feature_evm")]
 /// See https://github.com/ethereum-lists/chains/blob/master/_data/chains/1313161555.json
-pub const TEST_EVM_CHAIN_ID: u64 = 1313161555;
+
+pub const TESTNET_EVM_CHAIN_ID: u64 = 1313161555;
 
 #[cfg(feature = "protocol_feature_evm")]
 /// See https://github.com/ethereum-lists/chains/blob/master/_data/chains/1313161554.json

core/chain-configs/src/lib.rs

@@ -4,4 +4,4 @@ mod genesis_config;
 pub use client_config::{ClientConfig, LogSummaryStyle};
 pub use genesis_config::{Genesis, GenesisConfig, GenesisRecords};
 #[cfg(feature = "protocol_feature_evm")]
-pub use genesis_config::{MAINNET_EVM_CHAIN_ID, TEST_EVM_CHAIN_ID};
+pub use genesis_config::{BETANET_EVM_CHAIN_ID, MAINNET_EVM_CHAIN_ID, TESTNET_EVM_CHAIN_ID};

neard/src/config.rs

@@ -130,7 +130,8 @@ pub const MINIMUM_STAKE_DIVISOR: u64 = 10;
 pub const PROTOCOL_UPGRADE_NUM_EPOCHS: EpochHeight = 2;
 
 #[cfg(feature = "protocol_feature_evm")]
-pub const TEST_EVM_CHAIN_ID: u64 = 0x99;
+
+pub const TESTNET_EVM_CHAIN_ID: u64 = 0x99;
 
 pub const CONFIG_FILENAME: &str = "config.json";
 pub const GENESIS_CONFIG_FILENAME: &str = "genesis.json";

neard/src/runtime.rs

@@ -15,7 +15,7 @@ use near_chain::types::{ApplyTransactionResult, BlockHeaderInfo};
 use near_chain::{BlockHeader, Error, ErrorKind, RuntimeAdapter};
 use near_chain_configs::{Genesis, GenesisConfig};
 #[cfg(feature = "protocol_feature_evm")]
-use near_chain_configs::{MAINNET_EVM_CHAIN_ID, TEST_EVM_CHAIN_ID};
+use near_chain_configs::{BETANET_EVM_CHAIN_ID, MAINNET_EVM_CHAIN_ID, TESTNET_EVM_CHAIN_ID};
 use near_crypto::{PublicKey, Signature};
 use near_epoch_manager::{EpochManager, RewardCalculator};
 use near_pool::types::PoolIterator;
@@ -1395,7 +1395,8 @@ impl RuntimeAdapter for NightshadeRuntime {
     fn evm_chain_id(&self) -> u64 {
         match self.genesis_config.chain_id.as_str() {
             "mainnet" => MAINNET_EVM_CHAIN_ID,
-            _ => TEST_EVM_CHAIN_ID,
+            "testnet" => TESTNET_EVM_CHAIN_ID,
+            _ => BETANET_EVM_CHAIN_ID,
         }
     }
 }

runtime/runtime-params-estimator/src/testbed.rs

@@ -93,7 +93,7 @@ impl RuntimeTestbed {
             config: Arc::new(runtime_config),
             cache: Some(Arc::new(StoreCompiledContractCache { store: tries.get_store() })),
             #[cfg(feature = "protocol_feature_evm")]
-            evm_chain_id: near_chain_configs::TEST_EVM_CHAIN_ID,
+            evm_chain_id: near_chain_configs::TESTNET_EVM_CHAIN_ID,
         };
         Self {
             workdir,

runtime/runtime/src/lib.rs

@@ -1541,7 +1541,7 @@ mod tests {
             config: Arc::new(RuntimeConfig::default()),
             cache: Some(Arc::new(StoreCompiledContractCache { store: tries.get_store() })),
             #[cfg(feature = "protocol_feature_evm")]
-            evm_chain_id: near_chain_configs::TEST_EVM_CHAIN_ID,
+            evm_chain_id: near_chain_configs::TESTNET_EVM_CHAIN_ID,
         };
 
         (runtime, tries, root, apply_state, signer, MockEpochInfoProvider::default())

runtime/runtime/src/state_viewer.rs

@@ -201,7 +201,7 @@ impl TrieViewer {
 #[cfg(test)]
 mod tests {
     #[cfg(feature = "protocol_feature_evm")]
-    use near_chain_configs::TEST_EVM_CHAIN_ID;
+    use near_chain_configs::TESTNET_EVM_CHAIN_ID;
     use near_primitives::test_utils::MockEpochInfoProvider;
     use near_primitives::trie_key::TrieKey;
     use near_primitives::types::{EpochId, StateChangeCause};
@@ -226,7 +226,7 @@ mod tests {
             current_protocol_version: PROTOCOL_VERSION,
             cache: None,
             #[cfg(feature = "protocol_feature_evm")]
-            evm_chain_id: TEST_EVM_CHAIN_ID,
+            evm_chain_id: TESTNET_EVM_CHAIN_ID,
         };
         let result = viewer.call_function(
             root,
@@ -255,7 +255,7 @@ mod tests {
             current_protocol_version: PROTOCOL_VERSION,
             cache: None,
             #[cfg(feature = "protocol_feature_evm")]
-            evm_chain_id: TEST_EVM_CHAIN_ID,
+            evm_chain_id: TESTNET_EVM_CHAIN_ID,
         };
         let result = viewer.call_function(
             root,

runtime/runtime/tests/runtime_group_tools/mod.rs

@@ -69,7 +69,7 @@ impl StandaloneRuntime {
             config: Arc::new(runtime_config),
             cache: None,
             #[cfg(feature = "protocol_feature_evm")]
-            evm_chain_id: near_chain_configs::TEST_EVM_CHAIN_ID,
+            evm_chain_id: near_chain_configs::TESTNET_EVM_CHAIN_ID,
         };
 
         Self {

test-utils/testlib/src/user/runtime_user.rs

@@ -19,7 +19,7 @@ use near_primitives::views::{
 use near_store::{ShardTries, TrieUpdate};
 use neard::config::MIN_GAS_PRICE;
 #[cfg(feature = "protocol_feature_evm")]
-use neard::config::TEST_EVM_CHAIN_ID;
+use neard::config::TESTNET_EVM_CHAIN_ID;
 use node_runtime::config::RuntimeConfig;
 use node_runtime::state_viewer::TrieViewer;
 use node_runtime::{ApplyState, Runtime};
@@ -139,7 +139,7 @@ impl RuntimeUser {
             config: self.runtime_config.clone(),
             cache: None,
             #[cfg(feature = "protocol_feature_evm")]
-            evm_chain_id: TEST_EVM_CHAIN_ID,
+            evm_chain_id: TESTNET_EVM_CHAIN_ID,
         }
     }
 
@@ -245,7 +245,7 @@ impl User for RuntimeUser {
             current_protocol_version: PROTOCOL_VERSION,
             cache: apply_state.cache,
             #[cfg(feature = "protocol_feature_evm")]
-            evm_chain_id: TEST_EVM_CHAIN_ID,
+            evm_chain_id: TESTNET_EVM_CHAIN_ID,
         };
         result.result = self
             .trie_viewer