diff --git a/client/consensus/Cargo.toml b/client/consensus/Cargo.toml index 7c9dffbbed..bd78f90538 100644 --- a/client/consensus/Cargo.toml +++ b/client/consensus/Cargo.toml @@ -11,13 +11,13 @@ repository = "https://github.com/paritytech/frontier/" async-trait = "0.1" thiserror = "1.0" -sp-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sp-consensus = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sp-runtime = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sc-client-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sc-consensus = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } +sp-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sp-consensus = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sp-runtime = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sc-client-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sc-consensus = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } fp-consensus = { version = "2.0.0-dev", path = "../../primitives/consensus" } fp-rpc = { version = "3.0.0-dev", path = "../../primitives/rpc" } diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml index e61e0d4bbc..c0955a1647 100644 --- a/client/db/Cargo.toml +++ b/client/db/Cargo.toml @@ -12,8 +12,8 @@ kvdb-rocksdb = "0.15.1" parking_lot = "0.11.2" codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"] } -sp-core = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sp-database = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sp-runtime = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } +sp-core = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sp-database = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sp-runtime = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } fp-storage = { version = "2.0.0-dev", path = "../../primitives/storage" } diff --git a/client/mapping-sync/Cargo.toml b/client/mapping-sync/Cargo.toml index 01789f78ea..45a81f4551 100644 --- a/client/mapping-sync/Cargo.toml +++ b/client/mapping-sync/Cargo.toml @@ -11,10 +11,10 @@ futures = { version = "0.3.1", features = ["compat"] } futures-timer = "3.0.1" log = "0.4.8" -sp-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sp-runtime = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sc-client-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } +sp-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sp-runtime = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sc-client-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } fp-consensus = { version = "2.0.0-dev", path = "../../primitives/consensus" } fp-rpc = { version = "3.0.0-dev", path = "../../primitives/rpc" } diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml index f513998128..783fd16499 100644 --- a/client/rpc/Cargo.toml +++ b/client/rpc/Cargo.toml @@ -24,20 +24,20 @@ rlp = "0.5" tokio = { version = "1.14", features = [ "sync" ] } codec = { package = "parity-scale-codec", version = "3.0.0" } -prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sp-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sp-core = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sp-io = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sp-runtime = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sp-storage = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sc-client-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sc-network = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sc-rpc = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sc-service = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sc-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } +prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sp-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sp-core = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sp-io = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sp-runtime = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sp-storage = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sc-client-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sc-network = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sc-rpc = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sc-service = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sc-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } fp-rpc = { version = "3.0.0-dev", path = "../../primitives/rpc" } fp-storage = { version = "2.0.0-dev", path = "../../primitives/storage" } diff --git a/frame/base-fee/Cargo.toml b/frame/base-fee/Cargo.toml index a0317e75d9..608a1028a7 100644 --- a/frame/base-fee/Cargo.toml +++ b/frame/base-fee/Cargo.toml @@ -16,15 +16,15 @@ serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } -sp-core = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-runtime = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -frame-support = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -frame-system = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-core = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-runtime = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +frame-support = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +frame-system = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } pallet-evm = { path = "../evm", default-features = false } [dev-dependencies] -sp-io = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } [features] default = ["std"] diff --git a/frame/dynamic-fee/Cargo.toml b/frame/dynamic-fee/Cargo.toml index 30999479ce..c16898c239 100644 --- a/frame/dynamic-fee/Cargo.toml +++ b/frame/dynamic-fee/Cargo.toml @@ -12,18 +12,18 @@ serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } -sp-core = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-std = { version = "4.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-inherents = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-runtime = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -frame-system = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -frame-support = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-core = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-std = { version = "4.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-inherents = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-runtime = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +frame-system = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +frame-support = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } pallet-evm = { path = "../evm", version = "6.0.0-dev", default-features = false } [dev-dependencies] -sp-io = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -pallet-timestamp = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +pallet-timestamp = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } [features] default = ["std"] diff --git a/frame/ethereum/Cargo.toml b/frame/ethereum/Cargo.toml index dca179555b..12759c917d 100644 --- a/frame/ethereum/Cargo.toml +++ b/frame/ethereum/Cargo.toml @@ -16,13 +16,13 @@ sha3 = { version = "0.10", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } -sp-io = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-runtime = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-std = { version = "4.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -frame-support = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -frame-system = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -pallet-balances = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -pallet-timestamp = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-runtime = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-std = { version = "4.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +frame-support = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +frame-system = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +pallet-balances = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +pallet-timestamp = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } fp-consensus = { version = "2.0.0-dev", path = "../../primitives/consensus", default-features = false } fp-evm = { version = "3.0.0-dev", default-features = false, path = "../../primitives/evm" } @@ -35,7 +35,7 @@ num_enum = { version = "0.5.4", default-features = false } [dev-dependencies] libsecp256k1 = { version = "0.7", features = ["static-context", "hmac"] } rustc-hex = { version = "2.1.0", default-features = false } -sp-core = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } +sp-core = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } [features] default = ["std"] diff --git a/frame/evm/Cargo.toml b/frame/evm/Cargo.toml index 4a46570ebb..a0b8f4a808 100644 --- a/frame/evm/Cargo.toml +++ b/frame/evm/Cargo.toml @@ -23,16 +23,16 @@ sha3 = { version = "0.8", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } -sp-core = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-runtime = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-std = { version = "4.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-io = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-core = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-runtime = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-std = { version = "4.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-io = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } -frame-benchmarking = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false, optional = true } -frame-support = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -frame-system = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -pallet-balances = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -pallet-timestamp = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-benchmarking = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false, optional = true } +frame-support = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +frame-system = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +pallet-balances = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +pallet-timestamp = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } fp-evm = { version = "3.0.0-dev", default-features = false, path = "../../primitives/evm" } diff --git a/frame/evm/precompile/bn128/Cargo.toml b/frame/evm/precompile/bn128/Cargo.toml index 4711868d95..c4b4485555 100644 --- a/frame/evm/precompile/bn128/Cargo.toml +++ b/frame/evm/precompile/bn128/Cargo.toml @@ -11,7 +11,7 @@ description = "BN128 precompiles for EVM pallet." [dependencies] bn = { package = "substrate-bn", version = "0.6", default-features = false } -sp-core = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-core = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } fp-evm = { version = "3.0.0-dev", path = "../../../../primitives/evm", default-features = false } diff --git a/frame/evm/precompile/dispatch/Cargo.toml b/frame/evm/precompile/dispatch/Cargo.toml index 38f2f7350d..61a12c5362 100644 --- a/frame/evm/precompile/dispatch/Cargo.toml +++ b/frame/evm/precompile/dispatch/Cargo.toml @@ -9,7 +9,7 @@ repository = "https://github.com/paritytech/frontier/" description = "DISPATCH precompiles for EVM pallet." [dependencies] -frame-support = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-support = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } fp-evm = { version = "3.0.0-dev", path = "../../../../primitives/evm", default-features = false } pallet-evm = { version = "6.0.0-dev", path = "../..", default-features = false } diff --git a/frame/evm/precompile/simple/Cargo.toml b/frame/evm/precompile/simple/Cargo.toml index a32f93f083..64f61ce7f5 100644 --- a/frame/evm/precompile/simple/Cargo.toml +++ b/frame/evm/precompile/simple/Cargo.toml @@ -11,7 +11,7 @@ description = "Simple precompiles for EVM pallet." [dependencies] ripemd = { version = "0.1", default-features = false } -sp-io = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } fp-evm = { version = "3.0.0-dev", path = "../../../../primitives/evm", default-features = false } diff --git a/primitives/consensus/Cargo.toml b/primitives/consensus/Cargo.toml index 42ffbc3b31..87756d2213 100644 --- a/primitives/consensus/Cargo.toml +++ b/primitives/consensus/Cargo.toml @@ -12,9 +12,9 @@ repository = "https://github.com/paritytech/frontier/" ethereum = { version = "0.12.0", default-features = false, features = ["with-codec"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -sp-core = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-runtime = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-std = { version = "4.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-core = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-runtime = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-std = { version = "4.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } [features] default = ["std"] diff --git a/primitives/evm/Cargo.toml b/primitives/evm/Cargo.toml index b480cdcb91..7990637445 100644 --- a/primitives/evm/Cargo.toml +++ b/primitives/evm/Cargo.toml @@ -17,8 +17,8 @@ evm = { version = "0.35.0", default-features = false, features = [ "with-codec" serde = { version = "1.0.101", features = ["derive"], optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-core = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-std = { version = "4.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-core = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-std = { version = "4.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } [features] default = ["std"] diff --git a/primitives/rpc/Cargo.toml b/primitives/rpc/Cargo.toml index 67acb77e62..631902f750 100644 --- a/primitives/rpc/Cargo.toml +++ b/primitives/rpc/Cargo.toml @@ -12,11 +12,11 @@ ethereum-types = { version = "0.13", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } -sp-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-core = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-io = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-runtime = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-std = { version = "4.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-core = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-io = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-runtime = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-std = { version = "4.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } fp-evm = { version = "3.0.0-dev", default-features = false, path = "../../primitives/evm" } diff --git a/primitives/self-contained/Cargo.toml b/primitives/self-contained/Cargo.toml index 90a7b97b31..76b2a60872 100644 --- a/primitives/self-contained/Cargo.toml +++ b/primitives/self-contained/Cargo.toml @@ -16,10 +16,10 @@ serde = { version = "1.0.101", features = ["derive"], optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } parity-util-mem = { version = "0.11", optional = true } -sp-debug-derive = { version = "4.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-runtime = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-io = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -frame-support = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-debug-derive = { version = "4.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-runtime = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-io = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +frame-support = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } [features] default = ["std"] diff --git a/template/node/Cargo.toml b/template/node/Cargo.toml index dc3f5bfdd4..0a912c408d 100644 --- a/template/node/Cargo.toml +++ b/template/node/Cargo.toml @@ -21,39 +21,39 @@ log = "0.4.8" jsonrpc-core = "18.0.0" jsonrpc-pubsub = "18.0.0" -sp-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sp-consensus = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sp-consensus-aura = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sp-core = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sp-finality-grandpa = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sp-runtime = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sp-timestamp = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sp-inherents = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } +sp-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sp-consensus = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sp-consensus-aura = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sp-core = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sp-finality-grandpa = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sp-runtime = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sp-timestamp = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sp-inherents = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } -sc-basic-authorship = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sc-cli = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", features = ["wasmtime"] } -sc-client-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sc-consensus = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sc-consensus-aura = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sc-consensus-manual-seal = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sc-executor = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", features = ["wasmtime"] } -sc-finality-grandpa = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sc-keystore = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sc-network = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sc-rpc = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sc-rpc-api = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sc-service = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", features = ["wasmtime"] } -sc-telemetry = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sc-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -substrate-frame-rpc-system = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } -pallet-transaction-payment-rpc = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } +sc-basic-authorship = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sc-cli = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", features = ["wasmtime"] } +sc-client-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sc-consensus = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sc-consensus-aura = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sc-consensus-manual-seal = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sc-executor = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", features = ["wasmtime"] } +sc-finality-grandpa = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sc-keystore = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sc-network = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sc-rpc = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sc-rpc-api = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sc-service = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", features = ["wasmtime"] } +sc-telemetry = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sc-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +substrate-frame-rpc-system = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } +pallet-transaction-payment-rpc = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } # These dependencies are used for runtime benchmarking -frame-benchmarking = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", optional = false } -frame-benchmarking-cli = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", optional = false } +frame-benchmarking = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", optional = false } +frame-benchmarking-cli = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", optional = false } fp-consensus = { path = "../../primitives/consensus" } fp-rpc = { path = "../../primitives/rpc" } @@ -73,7 +73,7 @@ pallet-evm = { path = "../../frame/evm" } frontier-template-runtime = { path = "../runtime", default-features = false, features = ["std"] } [build-dependencies] -substrate-build-script-utils = { version = "3.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } +substrate-build-script-utils = { version = "3.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } [features] default = ["aura"] diff --git a/template/runtime/Cargo.toml b/template/runtime/Cargo.toml index 0df9d289fb..3f4a574740 100644 --- a/template/runtime/Cargo.toml +++ b/template/runtime/Cargo.toml @@ -16,31 +16,31 @@ serde = { version = "1.0.101", features = ["derive"], optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } -sp-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-consensus-aura = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-core = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-inherents = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-io = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-offchain = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-runtime = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-session = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-std = { version = "4.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -sp-version = { version = "5.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-consensus-aura = { version = "0.10.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-core = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-inherents = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-io = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-offchain = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-runtime = { version = "6.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-session = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-std = { version = "4.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +sp-version = { version = "5.0.0", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } -frame-executive = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -frame-support = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -frame-system = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -frame-system-rpc-runtime-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -pallet-aura = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -pallet-balances = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -pallet-grandpa = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -pallet-randomness-collective-flip = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -pallet-sudo = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -pallet-timestamp = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -pallet-transaction-payment = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-executive = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +frame-support = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +frame-system = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +frame-system-rpc-runtime-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +pallet-aura = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +pallet-balances = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +pallet-grandpa = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +pallet-randomness-collective-flip = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +pallet-sudo = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +pallet-timestamp = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +pallet-transaction-payment = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false } fp-rpc = { default-features = false, path = "../../primitives/rpc" } fp-self-contained = { default-features = false, path = "../../primitives/self-contained" } @@ -53,11 +53,11 @@ pallet-evm-precompile-sha3fips = { default-features = false, path = "../../frame pallet-evm-precompile-modexp = { default-features = false, path = "../../frame/evm/precompile/modexp" } # benchmarking dependencies -frame-benchmarking = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false, optional = true } -frame-system-benchmarking = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18", default-features = false, optional = true } +frame-benchmarking = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false, optional = true } +frame-system-benchmarking = { version = "4.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix", default-features = false, optional = true } [build-dependencies] -substrate-wasm-builder = { version = "5.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18" } +substrate-wasm-builder = { version = "5.0.0-dev", git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix" } [features] default = ["std", "aura"]