Skip to content

Commit d395f6f

Browse files
committed
Merge branch 'stage' into dev
# Conflicts: # Cargo.lock # node/core/Cargo.toml # runtime/dev/src/lib.rs
2 parents b9d27e4 + 2b49379 commit d395f6f

21 files changed

Lines changed: 2801 additions & 1106 deletions

File tree

node/dev/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ fp-ext = { workspace = true, features = ["std"] }
6565
fp-rpc = { workspace = true, features = ["std"] }
6666
fp-rpc-txpool = { workspace = true, features = ["std"] }
6767
pallet-ethereum = { workspace = true, features = [
68-
"std",
69-
"forbid-evm-reentrancy",
68+
"std",
69+
"forbid-evm-reentrancy",
7070
] }
7171

7272
# benchmarking dependencies

node/mainnet/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ fp-ext = { workspace = true, features = ["std"] }
6464
fp-rpc = { workspace = true, features = ["std"] }
6565
fp-rpc-txpool = { workspace = true, features = ["std"] }
6666
pallet-ethereum = { workspace = true, features = [
67-
"std",
68-
"forbid-evm-reentrancy",
67+
"std",
68+
"forbid-evm-reentrancy",
6969
] }
7070

7171
# benchmarking dependencies
@@ -74,8 +74,8 @@ frame-benchmarking = { workspace = true, optional = true, features = ["std"] }
7474
# Local Dependencies
7575
bp-core = { workspace = true }
7676
bifrost-mainnet-runtime = { workspace = true, features = [
77-
"std",
78-
"evm-tracing",
77+
"std",
78+
"evm-tracing",
7979
] }
8080
bifrost-mainnet-constants = { workspace = true }
8181
bifrost-common-node = { workspace = true }

node/testnet/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ fp-ext = { workspace = true, features = ["std"] }
6464
fp-rpc = { workspace = true, features = ["std"] }
6565
fp-rpc-txpool = { workspace = true, features = ["std"] }
6666
pallet-ethereum = { workspace = true, features = [
67-
"std",
68-
"forbid-evm-reentrancy",
67+
"std",
68+
"forbid-evm-reentrancy",
6969
] }
7070

7171
# benchmarking dependencies
@@ -74,8 +74,8 @@ frame-benchmarking = { workspace = true, optional = true, features = ["std"] }
7474
# Local Dependencies
7575
bp-core = { workspace = true }
7676
bifrost-testnet-runtime = { workspace = true, features = [
77-
"std",
78-
"evm-tracing",
77+
"std",
78+
"evm-tracing",
7979
] }
8080
bifrost-testnet-constants = { workspace = true }
8181
bifrost-common-node = { workspace = true }

0 commit comments

Comments
 (0)