Merge pull request #156 from j75689/merge/develop_to_new_engine

chore: merge upstream develop
bnb-chain · Oct 8, 2024 · 6b73e06 · 6b73e06
2 parents a99ce85 + 362f25a
commit 6b73e06
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -364,7 +364,7 @@ reth-network-types = { path = "crates/net/network-types" }
 reth-nippy-jar = { path = "crates/storage/nippy-jar" }
 reth-node-api = { path = "crates/node/api" }
 reth-node-builder = { path = "crates/node/builder" }
-reth-node-bsc= { path = "crates/bsc/node" }
+reth-node-bsc = { path = "crates/bsc/node" }
 reth-node-core = { path = "crates/node/core" }
 reth-node-ethereum = { path = "crates/ethereum/node" }
 reth-node-events = { path = "crates/node/events" }
@@ -430,7 +430,7 @@ revm-primitives = { version = "9.0.2", features = [
 ], default-features = false }
 
 # eth
-alloy-chains = "0.1.32"
+alloy-chains = "0.1.33"
 alloy-dyn-abi = "0.8.0"
 alloy-json-abi = "0.8.0"
 alloy-primitives = { version = "0.8.0", default-features = false }
@@ -603,7 +603,6 @@ tracy-client = "0.17.3"
 revm = { git = "https://github.com/bnb-chain/revm", rev = "fbc92f58052227c06f8a2a4e25227d111ed8e08e" }
 revm-interpreter = { git = "https://github.com/bnb-chain/revm", rev = "fbc92f58052227c06f8a2a4e25227d111ed8e08e" }
 revm-primitives = { git = "https://github.com/bnb-chain/revm", rev = "fbc92f58052227c06f8a2a4e25227d111ed8e08e" }
-alloy-chains = { git = "https://github.com/bnb-chain/alloy-chains-rs.git", rev = "6be74c75424a31a0d98a906084c778a9d74769fc" }
 alloy-rpc-types-eth = { git = "https://github.com/bnb-chain/alloy", rev = "718aee579dc000019582245226eebf8b40d24c41" }
 alloy-consensus = { git = "https://github.com/bnb-chain/alloy", rev = "718aee579dc000019582245226eebf8b40d24c41" }
 alloy-eips = { git = "https://github.com/bnb-chain/alloy", rev = "718aee579dc000019582245226eebf8b40d24c41" }

diff --git a/crates/bsc/chainspec/src/bsc.rs b/crates/bsc/chainspec/src/bsc.rs
@@ -17,7 +17,7 @@ use crate::BscChainSpec;
 pub static BSC_MAINNET: Lazy<Arc<BscChainSpec>> = Lazy::new(|| {
     BscChainSpec {
         inner: ChainSpec {
-            chain: Chain::from_named(NamedChain::BNBSmartChain),
+            chain: Chain::from_named(NamedChain::BinanceSmartChain),
             genesis: serde_json::from_str(include_str!("../res/genesis/bsc.json"))
                 .expect("Can't deserialize BSC Mainnet genesis json"),
             genesis_hash: once_cell_set(b256!(

diff --git a/crates/bsc/chainspec/src/bsc_chapel.rs b/crates/bsc/chainspec/src/bsc_chapel.rs
@@ -17,7 +17,7 @@ use crate::BscChainSpec;
 pub static BSC_CHAPEL: Lazy<Arc<BscChainSpec>> = Lazy::new(|| {
     BscChainSpec {
         inner: ChainSpec {
-            chain: Chain::from_named(NamedChain::BNBSmartChainTestnet),
+            chain: Chain::from_named(NamedChain::BinanceSmartChainTestnet),
             genesis: serde_json::from_str(include_str!("../res/genesis/bsc_chapel.json"))
                 .expect("Can't deserialize BSC Testnet genesis json"),
             genesis_hash: once_cell_set(b256!(

diff --git a/crates/chainspec/src/spec.rs b/crates/chainspec/src/spec.rs
@@ -617,9 +617,13 @@ impl ChainSpec {
             C::Optimism => Some(op_nodes()),
             C::BaseGoerli | C::BaseSepolia => Some(base_testnet_nodes()),
             C::OptimismSepolia | C::OptimismGoerli | C::OptimismKovan => Some(op_testnet_nodes()),
-            C::BNBSmartChain => Some(bsc_mainnet_nodes()),
-            C::BNBSmartChainTestnet => Some(bsc_testnet_nodes()),
+            #[cfg(feature = "bsc")]
+            C::BinanceSmartChain => Some(bsc_mainnet_nodes()),
+            #[cfg(feature = "bsc")]
+            C::BinanceSmartChainTestnet => Some(bsc_testnet_nodes()),
+            #[cfg(all(feature = "optimism", feature = "opbnb"))]
             C::OpBNBTestnet => Some(opbnb_testnet_nodes()),
+            #[cfg(all(feature = "optimism", feature = "opbnb"))]
             C::OpBNBMainnet => Some(opbnb_mainnet_nodes()),
             _ => None,
         }

diff --git a/crates/net/eth-wire-types/src/status.rs b/crates/net/eth-wire-types/src/status.rs
@@ -285,7 +285,7 @@ mod tests {
         let expected = hex!("f850423884024190faa0f8514c4680ef27700751b08f37645309ce65a449616a3ea966bf39dd935bb27ba00d21840abff46b96c84b2ac9e10e4f5cdaeb5693cb665db62a2f3b02d2d57b5bc6845d43d2fd80");
         let status = Status {
             version: EthVersion::Eth66 as u8,
-            chain: Chain::from_named(NamedChain::BNBSmartChain),
+            chain: Chain::from_named(NamedChain::BinanceSmartChain),
             total_difficulty: U256::from(37851386u64),
             blockhash: B256::from_str(
                 "f8514c4680ef27700751b08f37645309ce65a449616a3ea966bf39dd935bb27b",
@@ -308,7 +308,7 @@ mod tests {
         let data = hex!("f850423884024190faa0f8514c4680ef27700751b08f37645309ce65a449616a3ea966bf39dd935bb27ba00d21840abff46b96c84b2ac9e10e4f5cdaeb5693cb665db62a2f3b02d2d57b5bc6845d43d2fd80");
         let expected = Status {
             version: EthVersion::Eth66 as u8,
-            chain: Chain::from_named(NamedChain::BNBSmartChain),
+            chain: Chain::from_named(NamedChain::BinanceSmartChain),
             total_difficulty: U256::from(37851386u64),
             blockhash: B256::from_str(
                 "f8514c4680ef27700751b08f37645309ce65a449616a3ea966bf39dd935bb27b",