From edea176fa0a93cb2d152772523ee0fe30a0880dd Mon Sep 17 00:00:00 2001 From: gaetan cabaret Date: Fri, 9 Feb 2024 13:50:00 +0100 Subject: [PATCH] fix(cli): Update default evm id --- crates/ash_sdk/src/avalanche/blockchains.rs | 4 ++-- crates/ash_sdk/src/avalanche/txs/p.rs | 4 ++-- crates/ash_sdk/src/avalanche/vms/subnet_evm.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/ash_sdk/src/avalanche/blockchains.rs b/crates/ash_sdk/src/avalanche/blockchains.rs index 95787f5..6f3b5e3 100644 --- a/crates/ash_sdk/src/avalanche/blockchains.rs +++ b/crates/ash_sdk/src/avalanche/blockchains.rs @@ -171,12 +171,12 @@ impl From for AvalancheBlockchain { #[cfg(test)] mod tests { use super::*; - use crate::avalanche::{vms::encode_genesis_data, AvalancheNetwork, AvalancheSubnet}; + use crate::avalanche::{vms::encode_genesis_data, AvalancheNetwork, AvalancheSubnet, vms::subnet_evm::AVAX_SUBNET_EVM_ID}; use std::{env, fs, str::FromStr}; const AVAX_EWOQ_PRIVATE_KEY: &str = "PrivateKey-ewoqjP7PxY4yr3iLTpLisriqt94hdyDFNgchSxGGztUrTXtNN"; - const SUBNET_EVM_VM_ID: &str = "spePNvBxaWSYL2tB5e2xMmMNBQkXMN8z2XEbz1ML2Aahatwoc"; + const SUBNET_EVM_VM_ID: &str = AVAX_SUBNET_EVM_ID; // Load the test network from the ASH_TEST_CONFIG file fn load_test_network() -> AvalancheNetwork { diff --git a/crates/ash_sdk/src/avalanche/txs/p.rs b/crates/ash_sdk/src/avalanche/txs/p.rs index d9b811d..e6112c7 100644 --- a/crates/ash_sdk/src/avalanche/txs/p.rs +++ b/crates/ash_sdk/src/avalanche/txs/p.rs @@ -164,7 +164,7 @@ pub async fn add_avalanche_validator( mod tests { use super::*; use crate::avalanche::{ - vms::{encode_genesis_data, AvalancheVmType}, + vms::{encode_genesis_data, AvalancheVmType, subnet_evm::AVAX_SUBNET_EVM_ID}, AvalancheNetwork, }; use chrono::Duration; @@ -173,7 +173,7 @@ mod tests { const AVAX_EWOQ_PRIVATE_KEY: &str = "PrivateKey-ewoqjP7PxY4yr3iLTpLisriqt94hdyDFNgchSxGGztUrTXtNN"; const NETWORK_RUNNER_PCHAIN_ADDR: &str = "P-custom18jma8ppw3nhx5r4ap8clazz0dps7rv5u9xde7p"; - const SUBNET_EVM_VM_ID: &str = "spePNvBxaWSYL2tB5e2xMmMNBQkXMN8z2XEbz1ML2Aahatwoc"; + const SUBNET_EVM_VM_ID: &str = AVAX_SUBNET_EVM_ID; const NETWORK_RUNNER_NODE_ID: &str = "NodeID-7Xhw2mDxuDS44j42TCB6U5579esbSt3Lg"; // Load the test network using avalanche-network-runner diff --git a/crates/ash_sdk/src/avalanche/vms/subnet_evm.rs b/crates/ash_sdk/src/avalanche/vms/subnet_evm.rs index 587ed94..396fcd6 100644 --- a/crates/ash_sdk/src/avalanche/vms/subnet_evm.rs +++ b/crates/ash_sdk/src/avalanche/vms/subnet_evm.rs @@ -12,7 +12,7 @@ use crate::errors::*; use avalanche_types::subnet_evm::genesis::Genesis; /// Known ID for the Subnet-EVM -pub const AVAX_SUBNET_EVM_ID: &str = "spePNvBxaWSYL2tB5e2xMmMNBQkXMN8z2XEbz1ML2Aahatwoc"; +pub const AVAX_SUBNET_EVM_ID: &str = "srEXiWaHuhNyGwPUi444Tu47ZEDwxTWrbQiuD7FmgSAQ6X7Dy"; /// Encode the genesis data (JSON) to bytes pub fn encode_genesis_data(genesis_json: &str) -> Result, AshError> {