Merge branch 'develop' into merge_v1.0.0

forcodedancing · forcodedancing · commit ffa5238b316c · 2024-06-25T10:36:51.000+08:00
diff --git a/bin/reth/Cargo.toml b/bin/reth/Cargo.toml
@@ -169,7 +169,7 @@ bsc = [
     "dep:reth-node-bsc",
     "reth-node-core/bsc",
     "reth-stages/bsc",
-    "reth-node-builder/bsc"
+    "reth-node-builder/bsc",
 ]
 
 # no-op feature flag for switching between the `optimism` and default functionality in CI matrices
diff --git a/crates/bsc/consensus/Cargo.toml b/crates/bsc/consensus/Cargo.toml
@@ -59,4 +59,7 @@ reth-provider = { workspace = true, features = ["test-utils"] }
 rand = "0.8.5"
 
 [features]
-bsc = ["reth-primitives/bsc"]
+bsc = [
+    "reth-primitives/bsc",
+    "reth-consensus-common/bsc"
+]
diff --git a/crates/bsc/node/Cargo.toml b/crates/bsc/node/Cargo.toml
@@ -49,4 +49,5 @@ bsc = [
     "reth-evm-bsc/bsc",
     "reth-primitives/bsc",
     "reth-config/bsc",
+    "reth-bsc-consensus/bsc",
 ]
diff --git a/crates/consensus/common/Cargo.toml b/crates/consensus/common/Cargo.toml
@@ -20,3 +20,6 @@ reth-consensus.workspace = true
 reth-storage-api.workspace = true
 rand.workspace = true
 mockall = "0.12"
+
+[features]
+bsc = ["reth-chainspec/bsc"]
diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml
@@ -118,6 +118,7 @@ opbnb = [
     "revm/opbnb",
 ]
 bsc = [
+    "reth-primitives-traits/bsc",
     "reth-chainspec/bsc",
     "reth-ethereum-forks/bsc",
     "revm/bsc",

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ bsc = [`
`169`	`169`	`"dep:reth-node-bsc",`
`170`	`170`	`"reth-node-core/bsc",`
`171`	`171`	`"reth-stages/bsc",`
`172`		`- "reth-node-builder/bsc"`
	`172`	`+ "reth-node-builder/bsc",`
`173`	`173`	`]`
`174`	`174`
`175`	`175`	# no-op feature flag for switching between the `optimism` and default functionality in CI matrices