diff --git a/Cargo.lock b/Cargo.lock index f291ee70b4..a40ccf5f85 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2526,6 +2526,7 @@ dependencies = [ name = "domain-block-preprocessor" version = "0.1.0" dependencies = [ + "async-trait", "domain-runtime-primitives", "parity-scale-codec", "rand 0.8.5", @@ -2537,10 +2538,12 @@ dependencies = [ "sp-blockchain", "sp-core", "sp-domains", + "sp-inherents", "sp-keyring", "sp-messenger", "sp-runtime", "sp-state-machine", + "sp-timestamp 4.0.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "subspace-core-primitives", "subspace-runtime-primitives", "tracing", @@ -2624,11 +2627,11 @@ dependencies = [ "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-consensus-slots", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-core", "sp-domain-digests", "sp-domains", - "sp-keystore", + "sp-keystore 0.27.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-messenger", "sp-runtime", "sp-state-machine", @@ -2695,6 +2698,7 @@ dependencies = [ "sp-block-builder", "sp-blockchain", "sp-core", + "sp-inherents", "sp-runtime", "substrate-frame-rpc-system", ] @@ -2770,7 +2774,7 @@ dependencies = [ "sc-rpc-api", "sc-rpc-spec-v2", "sc-service", - "sc-telemetry", + "sc-telemetry 4.0.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sc-transaction-pool", "sc-transaction-pool-api", "sc-utils", @@ -2779,11 +2783,11 @@ dependencies = [ "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-consensus-slots", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-core", "sp-domains", "sp-inherents", - "sp-keystore", + "sp-keystore 0.27.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-messenger", "sp-offchain", "sp-runtime", @@ -2834,7 +2838,7 @@ dependencies = [ "rand 0.8.5", "sc-client-api", "sc-consensus", - "sc-consensus-slots", + "sc-consensus-slots 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sc-executor", "sc-network", "sc-network-sync", @@ -2847,8 +2851,8 @@ dependencies = [ "serde", "serde_json", "sp-api", - "sp-application-crypto", - "sp-arithmetic", + "sp-application-crypto 23.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", + "sp-arithmetic 16.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-block-builder", "sp-blockchain", "sp-core", @@ -2859,7 +2863,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-timestamp", + "sp-timestamp 4.0.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-transaction-pool", "subspace-networking", "subspace-proof-of-space", @@ -3391,7 +3395,7 @@ checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "fc-api" version = "1.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=068cb2eaae8b732a2a7d2c28e07a920684e19b69#068cb2eaae8b732a2a7d2c28e07a920684e19b69" +source = "git+https://github.com/subspace/frontier?rev=01b56190c0ed019b187c34d23422b9fea7ca4393#01b56190c0ed019b187c34d23422b9fea7ca4393" dependencies = [ "async-trait", "fp-storage", @@ -3403,7 +3407,7 @@ dependencies = [ [[package]] name = "fc-consensus" version = "2.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=068cb2eaae8b732a2a7d2c28e07a920684e19b69#068cb2eaae8b732a2a7d2c28e07a920684e19b69" +source = "git+https://github.com/subspace/frontier?rev=01b56190c0ed019b187c34d23422b9fea7ca4393#01b56190c0ed019b187c34d23422b9fea7ca4393" dependencies = [ "async-trait", "fp-consensus", @@ -3419,7 +3423,7 @@ dependencies = [ [[package]] name = "fc-db" version = "2.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=068cb2eaae8b732a2a7d2c28e07a920684e19b69#068cb2eaae8b732a2a7d2c28e07a920684e19b69" +source = "git+https://github.com/subspace/frontier?rev=01b56190c0ed019b187c34d23422b9fea7ca4393#01b56190c0ed019b187c34d23422b9fea7ca4393" dependencies = [ "async-trait", "fc-api", @@ -3438,7 +3442,7 @@ dependencies = [ [[package]] name = "fc-mapping-sync" version = "2.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=068cb2eaae8b732a2a7d2c28e07a920684e19b69#068cb2eaae8b732a2a7d2c28e07a920684e19b69" +source = "git+https://github.com/subspace/frontier?rev=01b56190c0ed019b187c34d23422b9fea7ca4393#01b56190c0ed019b187c34d23422b9fea7ca4393" dependencies = [ "fc-db", "fc-storage", @@ -3459,7 +3463,7 @@ dependencies = [ [[package]] name = "fc-rpc" version = "2.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=068cb2eaae8b732a2a7d2c28e07a920684e19b69#068cb2eaae8b732a2a7d2c28e07a920684e19b69" +source = "git+https://github.com/subspace/frontier?rev=01b56190c0ed019b187c34d23422b9fea7ca4393#01b56190c0ed019b187c34d23422b9fea7ca4393" dependencies = [ "ethereum", "ethereum-types", @@ -3482,6 +3486,7 @@ dependencies = [ "rand 0.8.5", "rlp", "sc-client-api", + "sc-consensus-aura", "sc-network", "sc-network-common", "sc-network-sync", @@ -3496,19 +3501,23 @@ dependencies = [ "sp-block-builder", "sp-blockchain", "sp-consensus", + "sp-consensus-aura 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=master)", "sp-core", + "sp-inherents", "sp-io", "sp-runtime", "sp-state-machine", "sp-storage", + "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=master)", "substrate-prometheus-endpoint", + "thiserror", "tokio", ] [[package]] name = "fc-rpc-core" version = "1.1.0-dev" -source = "git+https://github.com/subspace/frontier?rev=068cb2eaae8b732a2a7d2c28e07a920684e19b69#068cb2eaae8b732a2a7d2c28e07a920684e19b69" +source = "git+https://github.com/subspace/frontier?rev=01b56190c0ed019b187c34d23422b9fea7ca4393#01b56190c0ed019b187c34d23422b9fea7ca4393" dependencies = [ "ethereum", "ethereum-types", @@ -3521,7 +3530,7 @@ dependencies = [ [[package]] name = "fc-storage" version = "1.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=068cb2eaae8b732a2a7d2c28e07a920684e19b69#068cb2eaae8b732a2a7d2c28e07a920684e19b69" +source = "git+https://github.com/subspace/frontier?rev=01b56190c0ed019b187c34d23422b9fea7ca4393#01b56190c0ed019b187c34d23422b9fea7ca4393" dependencies = [ "ethereum", "ethereum-types", @@ -3686,7 +3695,7 @@ dependencies = [ [[package]] name = "fp-account" version = "1.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=068cb2eaae8b732a2a7d2c28e07a920684e19b69#068cb2eaae8b732a2a7d2c28e07a920684e19b69" +source = "git+https://github.com/subspace/frontier?rev=01b56190c0ed019b187c34d23422b9fea7ca4393#01b56190c0ed019b187c34d23422b9fea7ca4393" dependencies = [ "hex", "impl-serde", @@ -3705,7 +3714,7 @@ dependencies = [ [[package]] name = "fp-consensus" version = "2.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=068cb2eaae8b732a2a7d2c28e07a920684e19b69#068cb2eaae8b732a2a7d2c28e07a920684e19b69" +source = "git+https://github.com/subspace/frontier?rev=01b56190c0ed019b187c34d23422b9fea7ca4393#01b56190c0ed019b187c34d23422b9fea7ca4393" dependencies = [ "ethereum", "parity-scale-codec", @@ -3717,7 +3726,7 @@ dependencies = [ [[package]] name = "fp-ethereum" version = "1.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=068cb2eaae8b732a2a7d2c28e07a920684e19b69#068cb2eaae8b732a2a7d2c28e07a920684e19b69" +source = "git+https://github.com/subspace/frontier?rev=01b56190c0ed019b187c34d23422b9fea7ca4393#01b56190c0ed019b187c34d23422b9fea7ca4393" dependencies = [ "ethereum", "ethereum-types", @@ -3730,7 +3739,7 @@ dependencies = [ [[package]] name = "fp-evm" version = "3.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=068cb2eaae8b732a2a7d2c28e07a920684e19b69#068cb2eaae8b732a2a7d2c28e07a920684e19b69" +source = "git+https://github.com/subspace/frontier?rev=01b56190c0ed019b187c34d23422b9fea7ca4393#01b56190c0ed019b187c34d23422b9fea7ca4393" dependencies = [ "evm", "frame-support", @@ -3746,7 +3755,7 @@ dependencies = [ [[package]] name = "fp-rpc" version = "3.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=068cb2eaae8b732a2a7d2c28e07a920684e19b69#068cb2eaae8b732a2a7d2c28e07a920684e19b69" +source = "git+https://github.com/subspace/frontier?rev=01b56190c0ed019b187c34d23422b9fea7ca4393#01b56190c0ed019b187c34d23422b9fea7ca4393" dependencies = [ "ethereum", "ethereum-types", @@ -3763,7 +3772,7 @@ dependencies = [ [[package]] name = "fp-self-contained" version = "1.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=068cb2eaae8b732a2a7d2c28e07a920684e19b69#068cb2eaae8b732a2a7d2c28e07a920684e19b69" +source = "git+https://github.com/subspace/frontier?rev=01b56190c0ed019b187c34d23422b9fea7ca4393#01b56190c0ed019b187c34d23422b9fea7ca4393" dependencies = [ "frame-support", "parity-scale-codec", @@ -3775,7 +3784,7 @@ dependencies = [ [[package]] name = "fp-storage" version = "2.0.0" -source = "git+https://github.com/subspace/frontier?rev=068cb2eaae8b732a2a7d2c28e07a920684e19b69#068cb2eaae8b732a2a7d2c28e07a920684e19b69" +source = "git+https://github.com/subspace/frontier?rev=01b56190c0ed019b187c34d23422b9fea7ca4393#01b56190c0ed019b187c34d23422b9fea7ca4393" dependencies = [ "parity-scale-codec", "serde", @@ -3802,7 +3811,7 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto", + "sp-application-crypto 23.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-core", "sp-io", "sp-runtime", @@ -3834,7 +3843,7 @@ dependencies = [ "parity-scale-codec", "rand 0.8.5", "rand_pcg", - "sc-block-builder", + "sc-block-builder 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sc-cli", "sc-client-api", "sc-client-db", @@ -3850,7 +3859,7 @@ dependencies = [ "sp-externalities", "sp-inherents", "sp-io", - "sp-keystore", + "sp-keystore 0.27.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-runtime", "sp-state-machine", "sp-storage", @@ -3912,7 +3921,7 @@ dependencies = [ "serde_json", "smallvec", "sp-api", - "sp-arithmetic", + "sp-arithmetic 16.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-core", "sp-core-hashing-proc-macro", "sp-debug-derive", @@ -7134,7 +7143,7 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto", + "sp-application-crypto 23.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-consensus-babe", "sp-core", "sp-io", @@ -7162,7 +7171,7 @@ dependencies = [ [[package]] name = "pallet-base-fee" version = "1.0.0" -source = "git+https://github.com/subspace/frontier?rev=068cb2eaae8b732a2a7d2c28e07a920684e19b69#068cb2eaae8b732a2a7d2c28e07a920684e19b69" +source = "git+https://github.com/subspace/frontier?rev=01b56190c0ed019b187c34d23422b9fea7ca4393#01b56190c0ed019b187c34d23422b9fea7ca4393" dependencies = [ "fp-evm", "frame-support", @@ -7211,7 +7220,7 @@ dependencies = [ [[package]] name = "pallet-ethereum" version = "4.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=068cb2eaae8b732a2a7d2c28e07a920684e19b69#068cb2eaae8b732a2a7d2c28e07a920684e19b69" +source = "git+https://github.com/subspace/frontier?rev=01b56190c0ed019b187c34d23422b9fea7ca4393#01b56190c0ed019b187c34d23422b9fea7ca4393" dependencies = [ "ethereum", "ethereum-types", @@ -7234,7 +7243,7 @@ dependencies = [ [[package]] name = "pallet-evm" version = "6.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=068cb2eaae8b732a2a7d2c28e07a920684e19b69#068cb2eaae8b732a2a7d2c28e07a920684e19b69" +source = "git+https://github.com/subspace/frontier?rev=01b56190c0ed019b187c34d23422b9fea7ca4393#01b56190c0ed019b187c34d23422b9fea7ca4393" dependencies = [ "environmental", "evm", @@ -7259,7 +7268,7 @@ dependencies = [ [[package]] name = "pallet-evm-chain-id" version = "1.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=068cb2eaae8b732a2a7d2c28e07a920684e19b69#068cb2eaae8b732a2a7d2c28e07a920684e19b69" +source = "git+https://github.com/subspace/frontier?rev=01b56190c0ed019b187c34d23422b9fea7ca4393#01b56190c0ed019b187c34d23422b9fea7ca4393" dependencies = [ "frame-support", "frame-system", @@ -7271,7 +7280,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-modexp" version = "2.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=068cb2eaae8b732a2a7d2c28e07a920684e19b69#068cb2eaae8b732a2a7d2c28e07a920684e19b69" +source = "git+https://github.com/subspace/frontier?rev=01b56190c0ed019b187c34d23422b9fea7ca4393#01b56190c0ed019b187c34d23422b9fea7ca4393" dependencies = [ "fp-evm", "num", @@ -7280,7 +7289,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-sha3fips" version = "2.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=068cb2eaae8b732a2a7d2c28e07a920684e19b69#068cb2eaae8b732a2a7d2c28e07a920684e19b69" +source = "git+https://github.com/subspace/frontier?rev=01b56190c0ed019b187c34d23422b9fea7ca4393#01b56190c0ed019b187c34d23422b9fea7ca4393" dependencies = [ "fp-evm", "tiny-keccak", @@ -7289,7 +7298,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-simple" version = "2.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=068cb2eaae8b732a2a7d2c28e07a920684e19b69#068cb2eaae8b732a2a7d2c28e07a920684e19b69" +source = "git+https://github.com/subspace/frontier?rev=01b56190c0ed019b187c34d23422b9fea7ca4393#01b56190c0ed019b187c34d23422b9fea7ca4393" dependencies = [ "fp-evm", "ripemd", @@ -7326,7 +7335,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-application-crypto", + "sp-application-crypto 23.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-consensus-grandpa", "sp-core", "sp-io", @@ -7467,7 +7476,7 @@ dependencies = [ "scale-info", "schnorrkel", "serde", - "sp-consensus-slots", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-consensus-subspace", "sp-core", "sp-io", @@ -7515,7 +7524,7 @@ dependencies = [ "sp-runtime", "sp-std", "sp-storage", - "sp-timestamp", + "sp-timestamp 4.0.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", ] [[package]] @@ -8972,10 +8981,10 @@ dependencies = [ "futures-timer", "log", "parity-scale-codec", - "sc-block-builder", + "sc-block-builder 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sc-client-api", "sc-proposer-metrics", - "sc-telemetry", + "sc-telemetry 4.0.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sc-transaction-pool-api", "sp-api", "sp-blockchain", @@ -8986,6 +8995,21 @@ dependencies = [ "substrate-prometheus-endpoint", ] +[[package]] +name = "sc-block-builder" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#033d4e86cc7eff0066cd376b9375f815761d653c" +dependencies = [ + "parity-scale-codec", + "sc-client-api", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-core", + "sp-inherents", + "sp-runtime", +] + [[package]] name = "sc-block-builder" version = "0.10.0-dev" @@ -9011,7 +9035,7 @@ dependencies = [ "sc-client-api", "sc-executor", "sc-network", - "sc-telemetry", + "sc-telemetry 4.0.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "serde", "serde_json", "sp-blockchain", @@ -9054,7 +9078,7 @@ dependencies = [ "sc-keystore", "sc-network", "sc-service", - "sc-telemetry", + "sc-telemetry 4.0.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sc-tracing", "sc-utils", "serde", @@ -9062,7 +9086,7 @@ dependencies = [ "sp-blockchain", "sp-core", "sp-keyring", - "sp-keystore", + "sp-keystore 0.27.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-panic-handler", "sp-runtime", "sp-version", @@ -9113,7 +9137,7 @@ dependencies = [ "sc-client-api", "sc-state-db", "schnellru", - "sp-arithmetic", + "sp-arithmetic 16.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-blockchain", "sp-core", "sp-database", @@ -9147,6 +9171,35 @@ dependencies = [ "thiserror", ] +[[package]] +name = "sc-consensus-aura" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#033d4e86cc7eff0066cd376b9375f815761d653c" +dependencies = [ + "async-trait", + "futures", + "log", + "parity-scale-codec", + "sc-block-builder 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=master)", + "sc-client-api", + "sc-consensus", + "sc-consensus-slots 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=master)", + "sc-telemetry 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=master)", + "sp-api", + "sp-application-crypto 23.0.0 (git+https://github.com/paritytech/substrate?branch=master)", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-aura 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=master)", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=master)", + "sp-core", + "sp-inherents", + "sp-keystore 0.27.0 (git+https://github.com/paritytech/substrate?branch=master)", + "sp-runtime", + "substrate-prometheus-endpoint", + "thiserror", +] + [[package]] name = "sc-consensus-fraud-proof" version = "0.1.0" @@ -9161,6 +9214,29 @@ dependencies = [ "subspace-fraud-proof", ] +[[package]] +name = "sc-consensus-slots" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#033d4e86cc7eff0066cd376b9375f815761d653c" +dependencies = [ + "async-trait", + "futures", + "futures-timer", + "log", + "parity-scale-codec", + "sc-client-api", + "sc-consensus", + "sc-telemetry 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=master)", + "sp-arithmetic 16.0.0 (git+https://github.com/paritytech/substrate?branch=master)", + "sp-blockchain", + "sp-consensus", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=master)", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-state-machine", +] + [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" @@ -9173,11 +9249,11 @@ dependencies = [ "parity-scale-codec", "sc-client-api", "sc-consensus", - "sc-telemetry", - "sp-arithmetic", + "sc-telemetry 4.0.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", + "sp-arithmetic 16.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-blockchain", "sp-consensus", - "sp-consensus-slots", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-core", "sp-inherents", "sp-runtime", @@ -9200,9 +9276,9 @@ dependencies = [ "rand_chacha 0.3.1", "sc-client-api", "sc-consensus", - "sc-consensus-slots", + "sc-consensus-slots 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sc-proof-of-time", - "sc-telemetry", + "sc-telemetry 4.0.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sc-transaction-pool-api", "sc-utils", "schnorrkel", @@ -9211,7 +9287,7 @@ dependencies = [ "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-consensus-slots", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-consensus-subspace", "sp-core", "sp-inherents", @@ -9246,7 +9322,7 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-consensus-slots", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-consensus-subspace", "sp-core", "sp-objects", @@ -9334,9 +9410,9 @@ dependencies = [ "array-bytes", "parking_lot 0.12.1", "serde_json", - "sp-application-crypto", + "sp-application-crypto 23.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-core", - "sp-keystore", + "sp-keystore 0.27.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "thiserror", ] @@ -9371,7 +9447,7 @@ dependencies = [ "serde", "serde_json", "smallvec", - "sp-arithmetic", + "sp-arithmetic 16.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-blockchain", "sp-core", "sp-runtime", @@ -9483,7 +9559,7 @@ dependencies = [ "sc-utils", "schnellru", "smallvec", - "sp-arithmetic", + "sp-arithmetic 16.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-blockchain", "sp-consensus", "sp-consensus-grandpa", @@ -9538,7 +9614,7 @@ dependencies = [ "sp-api", "sp-core", "sp-externalities", - "sp-keystore", + "sp-keystore 0.27.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-offchain", "sp-runtime", "threadpool", @@ -9559,13 +9635,13 @@ dependencies = [ "parking_lot 0.12.1", "rayon", "sc-client-api", - "sc-consensus-slots", + "sc-consensus-slots 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sc-network", "sc-network-gossip", "sp-api", "sp-blockchain", "sp-consensus", - "sp-consensus-slots", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-consensus-subspace", "sp-core", "sp-inherents", @@ -9596,7 +9672,7 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.12.1", - "sc-block-builder", + "sc-block-builder 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sc-chain-spec", "sc-client-api", "sc-rpc-api", @@ -9607,7 +9683,7 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-core", - "sp-keystore", + "sp-keystore 0.27.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-offchain", "sp-rpc", "sp-runtime", @@ -9695,7 +9771,7 @@ dependencies = [ "parking_lot 0.12.1", "pin-project", "rand 0.8.5", - "sc-block-builder", + "sc-block-builder 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sc-chain-spec", "sc-client-api", "sc-client-db", @@ -9713,7 +9789,7 @@ dependencies = [ "sc-rpc-server", "sc-rpc-spec-v2", "sc-sysinfo", - "sc-telemetry", + "sc-telemetry 4.0.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sc-tracing", "sc-transaction-pool", "sc-transaction-pool-api", @@ -9725,7 +9801,7 @@ dependencies = [ "sp-consensus", "sp-core", "sp-externalities", - "sp-keystore", + "sp-keystore 0.27.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-runtime", "sp-session", "sp-state-machine", @@ -9795,7 +9871,7 @@ version = "0.1.0" dependencies = [ "sc-chain-spec", "sc-service", - "sc-telemetry", + "sc-telemetry 4.0.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "serde", "sp-core", "sp-runtime", @@ -9812,7 +9888,7 @@ dependencies = [ "rand 0.8.5", "rand_pcg", "regex", - "sc-telemetry", + "sc-telemetry 4.0.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "serde", "serde_json", "sp-core", @@ -9820,6 +9896,25 @@ dependencies = [ "sp-std", ] +[[package]] +name = "sc-telemetry" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#033d4e86cc7eff0066cd376b9375f815761d653c" +dependencies = [ + "chrono", + "futures", + "libp2p 0.51.3", + "log", + "parking_lot 0.12.1", + "pin-project", + "rand 0.8.5", + "sc-utils", + "serde", + "serde_json", + "thiserror", + "wasm-timer", +] + [[package]] name = "sc-telemetry" version = "4.0.0-dev" @@ -9933,7 +10028,7 @@ dependencies = [ "log", "parking_lot 0.12.1", "prometheus", - "sp-arithmetic", + "sp-arithmetic 16.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", ] [[package]] @@ -10489,6 +10584,19 @@ dependencies = [ "syn 2.0.32", ] +[[package]] +name = "sp-application-crypto" +version = "23.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#033d4e86cc7eff0066cd376b9375f815761d653c" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-core", + "sp-io", + "sp-std", +] + [[package]] name = "sp-application-crypto" version = "23.0.0" @@ -10502,6 +10610,20 @@ dependencies = [ "sp-std", ] +[[package]] +name = "sp-arithmetic" +version = "16.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#033d4e86cc7eff0066cd376b9375f815761d653c" +dependencies = [ + "integer-sqrt", + "num-traits", + "parity-scale-codec", + "scale-info", + "serde", + "sp-std", + "static_assertions", +] + [[package]] name = "sp-arithmetic" version = "16.0.0" @@ -10560,6 +10682,23 @@ dependencies = [ "thiserror", ] +[[package]] +name = "sp-consensus-aura" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#033d4e86cc7eff0066cd376b9375f815761d653c" +dependencies = [ + "async-trait", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-application-crypto 23.0.0 (git+https://github.com/paritytech/substrate?branch=master)", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=master)", + "sp-inherents", + "sp-runtime", + "sp-std", + "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=master)", +] + [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" @@ -10569,12 +10708,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-application-crypto", - "sp-consensus-slots", + "sp-application-crypto 23.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-inherents", "sp-runtime", "sp-std", - "sp-timestamp", + "sp-timestamp 4.0.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", ] [[package]] @@ -10587,13 +10726,13 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto", - "sp-consensus-slots", + "sp-application-crypto 23.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-core", "sp-inherents", "sp-runtime", "sp-std", - "sp-timestamp", + "sp-timestamp 4.0.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", ] [[package]] @@ -10607,13 +10746,25 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto", + "sp-application-crypto 23.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-core", - "sp-keystore", + "sp-keystore 0.27.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-runtime", "sp-std", ] +[[package]] +name = "sp-consensus-slots" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#033d4e86cc7eff0066cd376b9375f815761d653c" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-std", + "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=master)", +] + [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" @@ -10623,7 +10774,7 @@ dependencies = [ "scale-info", "serde", "sp-std", - "sp-timestamp", + "sp-timestamp 4.0.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", ] [[package]] @@ -10636,8 +10787,8 @@ dependencies = [ "scale-info", "schnorrkel", "sp-api", - "sp-application-crypto", - "sp-consensus-slots", + "sp-application-crypto 23.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-core", "sp-externalities", "sp-inherents", @@ -10645,7 +10796,7 @@ dependencies = [ "sp-runtime", "sp-runtime-interface 17.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-std", - "sp-timestamp", + "sp-timestamp 4.0.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "subspace-archiving", "subspace-core-primitives", "subspace-proof-of-space", @@ -10766,12 +10917,12 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto", + "sp-application-crypto 23.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-blockchain", - "sp-consensus-slots", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-core", "sp-externalities", - "sp-keystore", + "sp-keystore 0.27.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-runtime", "sp-runtime-interface 17.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-state-machine", @@ -10833,7 +10984,7 @@ dependencies = [ "secp256k1", "sp-core", "sp-externalities", - "sp-keystore", + "sp-keystore 0.27.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-runtime-interface 17.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-state-machine", "sp-std", @@ -10854,6 +11005,18 @@ dependencies = [ "strum", ] +[[package]] +name = "sp-keystore" +version = "0.27.0" +source = "git+https://github.com/paritytech/substrate?branch=master#033d4e86cc7eff0066cd376b9375f815761d653c" +dependencies = [ + "parity-scale-codec", + "parking_lot 0.12.1", + "sp-core", + "sp-externalities", + "thiserror", +] + [[package]] name = "sp-keystore" version = "0.27.0" @@ -10876,8 +11039,8 @@ dependencies = [ "rand 0.8.5", "scale-info", "schnorrkel", - "sp-arithmetic", - "sp-consensus-slots", + "sp-arithmetic 16.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-consensus-subspace", "sp-io", "sp-runtime", @@ -10983,8 +11146,8 @@ dependencies = [ "rand 0.8.5", "scale-info", "serde", - "sp-application-crypto", - "sp-arithmetic", + "sp-application-crypto 23.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", + "sp-arithmetic 16.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-core", "sp-io", "sp-std", @@ -11060,7 +11223,7 @@ dependencies = [ "scale-info", "sp-api", "sp-core", - "sp-keystore", + "sp-keystore 0.27.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-runtime", "sp-staking", "sp-std", @@ -11115,7 +11278,7 @@ dependencies = [ "scale-info", "sha2 0.10.7", "sp-api", - "sp-application-crypto", + "sp-application-crypto 23.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-core", "sp-externalities", "sp-runtime", @@ -11143,6 +11306,19 @@ dependencies = [ "sp-std", ] +[[package]] +name = "sp-timestamp" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#033d4e86cc7eff0066cd376b9375f815761d653c" +dependencies = [ + "async-trait", + "parity-scale-codec", + "sp-inherents", + "sp-runtime", + "sp-std", + "thiserror", +] + [[package]] name = "sp-timestamp" version = "4.0.0-dev" @@ -11290,7 +11466,7 @@ dependencies = [ "scale-info", "serde", "smallvec", - "sp-arithmetic", + "sp-arithmetic 16.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-core", "sp-debug-derive", "sp-std", @@ -11703,7 +11879,7 @@ dependencies = [ "sc-cli", "sc-client-api", "sc-consensus", - "sc-consensus-slots", + "sc-consensus-slots 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sc-consensus-subspace", "sc-executor", "sc-network", @@ -11712,7 +11888,7 @@ dependencies = [ "sc-service", "sc-storage-monitor", "sc-subspace-chain-specs", - "sc-telemetry", + "sc-telemetry 4.0.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sc-tracing", "sc-transaction-pool-api", "sc-utils", @@ -11812,7 +11988,7 @@ dependencies = [ "scale-info", "sp-api", "sp-block-builder", - "sp-consensus-slots", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-consensus-subspace", "sp-core", "sp-domains", @@ -11870,7 +12046,7 @@ dependencies = [ "sc-client-api", "sc-consensus", "sc-consensus-fraud-proof", - "sc-consensus-slots", + "sc-consensus-slots 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sc-consensus-subspace", "sc-consensus-subspace-rpc", "sc-executor", @@ -11883,7 +12059,7 @@ dependencies = [ "sc-rpc-spec-v2", "sc-service", "sc-subspace-block-relay", - "sc-telemetry", + "sc-telemetry 4.0.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sc-tracing", "sc-transaction-pool", "sc-transaction-pool-api", @@ -11891,7 +12067,7 @@ dependencies = [ "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-consensus-slots", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-consensus-subspace", "sp-core", "sp-domains", @@ -11900,7 +12076,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-timestamp", + "sp-timestamp 4.0.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-transaction-pool", "sp-trie", "static_assertions", @@ -11985,7 +12161,7 @@ dependencies = [ "scale-info", "sp-api", "sp-block-builder", - "sp-consensus-slots", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-consensus-subspace", "sp-core", "sp-domains", @@ -12019,7 +12195,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "rand 0.8.5", - "sc-block-builder", + "sc-block-builder 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sc-client-api", "sc-consensus", "sc-consensus-fraud-proof", @@ -12032,10 +12208,10 @@ dependencies = [ "sc-transaction-pool-api", "sc-utils", "sp-api", - "sp-application-crypto", + "sp-application-crypto 23.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-blockchain", "sp-consensus", - "sp-consensus-slots", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-consensus-subspace", "sp-core", "sp-domains", @@ -12043,7 +12219,7 @@ dependencies = [ "sp-inherents", "sp-keyring", "sp-runtime", - "sp-timestamp", + "sp-timestamp 4.0.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "subspace-core-primitives", "subspace-fraud-proof", "subspace-node", @@ -12090,7 +12266,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "schnorrkel", - "sp-arithmetic", + "sp-arithmetic 16.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-std", "subspace-archiving", "subspace-core-primitives", @@ -12169,7 +12345,7 @@ dependencies = [ "sp-consensus", "sp-core", "sp-keyring", - "sp-keystore", + "sp-keystore 0.27.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-runtime", "sp-state-machine", ] @@ -12194,9 +12370,9 @@ dependencies = [ "serde", "serde_json", "sp-api", - "sp-application-crypto", + "sp-application-crypto 23.0.0 (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-block-builder", - "sp-consensus-aura", + "sp-consensus-aura 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sp-consensus-babe", "sp-consensus-grandpa", "sp-core", @@ -12223,7 +12399,7 @@ version = "2.0.0" source = "git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898#48c5ebae44b90d45863195b91e0e489eca670898" dependencies = [ "futures", - "sc-block-builder", + "sc-block-builder 0.10.0-dev (git+https://github.com/subspace/substrate?rev=48c5ebae44b90d45863195b91e0e489eca670898)", "sc-client-api", "sc-consensus", "sp-api", diff --git a/crates/subspace-node/Cargo.toml b/crates/subspace-node/Cargo.toml index 2e47600abb..9f675f171f 100644 --- a/crates/subspace-node/Cargo.toml +++ b/crates/subspace-node/Cargo.toml @@ -29,7 +29,7 @@ domain-eth-service = { version = "0.1.0", path = "../../domains/client/eth-servi domain-service = { version = "0.1.0", path = "../../domains/service" } domain-runtime-primitives = { version = "0.1.0", path = "../../domains/primitives/runtime" } evm-domain-runtime = { version = "0.1.0", path = "../../domains/runtime/evm" } -fp-evm = { version = "3.0.0-dev", git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } +fp-evm = { version = "3.0.0-dev", git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } frame-benchmarking = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898", default-features = false } frame-benchmarking-cli = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898", default-features = false } frame-support = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } diff --git a/domains/client/block-preprocessor/Cargo.toml b/domains/client/block-preprocessor/Cargo.toml index 4a22bddebf..2263662774 100644 --- a/domains/client/block-preprocessor/Cargo.toml +++ b/domains/client/block-preprocessor/Cargo.toml @@ -12,6 +12,7 @@ include = [ ] [dependencies] +async-trait = { version = "0.1.57" } codec = { package = "parity-scale-codec", version = "3.6.5", features = [ "derive" ] } domain-runtime-primitives = { version = "0.1.0", path = "../../primitives/runtime" } rand = "0.8.5" @@ -23,9 +24,11 @@ sp-api = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } sp-core = { version = "21.0.0", git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } sp-domains = { version = "0.1.0", path = "../../../crates/sp-domains" } +sp-inherents = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } sp-messenger = { version = "0.1.0", path = "../../primitives/messenger" } sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } sp-state-machine = { version = "0.28.0", git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } +sp-timestamp = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } subspace-core-primitives = { version = "0.1.0", path = "../../../crates/subspace-core-primitives" } subspace-runtime-primitives = { version = "0.1.0", path = "../../../crates/subspace-runtime-primitives" } tracing = "0.1.37" diff --git a/domains/client/block-preprocessor/src/inherents.rs b/domains/client/block-preprocessor/src/inherents.rs index 0b79b3419f..3371e2f8fa 100644 --- a/domains/client/block-preprocessor/src/inherents.rs +++ b/domains/client/block-preprocessor/src/inherents.rs @@ -14,13 +14,18 @@ use crate::runtime_api::InherentExtrinsicConstructor; use sp_api::ProvideRuntimeApi; +use sp_blockchain::HeaderBackend; use sp_domains::DomainsApi; +use sp_inherents::CreateInherentDataProviders; use sp_runtime::traits::{Block as BlockT, NumberFor}; +use sp_timestamp::InherentType; +use std::error::Error; +use std::marker::PhantomData; use std::sync::Arc; /// Returns required inherent extrinsics for the domain block based on the primary block. /// Note: consensus block hash must be used to construct domain block. -pub fn construct_inherent_extrinsics( +pub(crate) fn construct_inherent_extrinsics( consensus_client: &Arc, domain_runtime_api: &DomainRuntimeApi, consensus_block_hash: CBlock::Hash, @@ -46,3 +51,54 @@ where Ok(inherent_exts) } + +#[derive(Debug)] +#[allow(dead_code)] +pub struct CreateInherentDataProvider { + consensus_client: Arc, + _marker: PhantomData, +} + +impl Clone for CreateInherentDataProvider { + fn clone(&self) -> Self { + Self { + consensus_client: self.consensus_client.clone(), + _marker: Default::default(), + } + } +} + +impl CreateInherentDataProvider { + pub fn new(consensus_client: Arc) -> Self { + Self { + consensus_client, + _marker: Default::default(), + } + } +} + +#[async_trait::async_trait] +impl CreateInherentDataProviders + for CreateInherentDataProvider +where + Block: BlockT, + CBlock: BlockT, + CClient: ProvideRuntimeApi + HeaderBackend, + CClient::Api: DomainsApi, Block::Hash>, +{ + // TODO: we need to include the runtime upgrade + type InherentDataProviders = sp_timestamp::InherentDataProvider; + + async fn create_inherent_data_providers( + &self, + _parent: Block::Hash, + _extra_args: (), + ) -> Result> { + let best_consensus_hash = self.consensus_client.info().best_hash; + let runtime_api = self.consensus_client.runtime_api(); + let timestamp = runtime_api.timestamp(best_consensus_hash)?; + Ok(sp_timestamp::InherentDataProvider::new(InherentType::new( + timestamp, + ))) + } +} diff --git a/domains/client/block-preprocessor/src/lib.rs b/domains/client/block-preprocessor/src/lib.rs index 0c62474571..43720ee7dd 100644 --- a/domains/client/block-preprocessor/src/lib.rs +++ b/domains/client/block-preprocessor/src/lib.rs @@ -10,7 +10,7 @@ #![warn(rust_2018_idioms)] -mod inherents; +pub mod inherents; pub mod runtime_api; pub mod runtime_api_full; pub mod runtime_api_light; diff --git a/domains/client/eth-service/Cargo.toml b/domains/client/eth-service/Cargo.toml index d8d96a9862..aede8bc56d 100644 --- a/domains/client/eth-service/Cargo.toml +++ b/domains/client/eth-service/Cargo.toml @@ -15,13 +15,13 @@ include = [ clap = { version = "4.4.3", features = ["derive"] } domain-runtime-primitives = { version = "0.1.0", path = "../../primitives/runtime" } domain-service = { version = "0.1.0", path = "../../service" } -fc-consensus = { version = "2.0.0-dev", git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } -fc-db = { version = "2.0.0-dev", git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69", default-features = false } -fc-mapping-sync = { version = "2.0.0-dev", git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69", default-features = false } -fc-rpc = { version = "2.0.0-dev", git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69", default-features = false, features = ['rpc-binary-search-estimate'] } -fc-rpc-core = { version = "1.1.0-dev", git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } -fc-storage = { version = "1.0.0-dev", git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } -fp-rpc = { version = "3.0.0-dev", git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69", features = ['default'] } +fc-consensus = { version = "2.0.0-dev", git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } +fc-db = { version = "2.0.0-dev", git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393", default-features = false } +fc-mapping-sync = { version = "2.0.0-dev", git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393", default-features = false } +fc-rpc = { version = "2.0.0-dev", git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393", default-features = false, features = ['rpc-binary-search-estimate'] } +fc-rpc-core = { version = "1.1.0-dev", git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } +fc-storage = { version = "1.0.0-dev", git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } +fp-rpc = { version = "3.0.0-dev", git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393", features = ['default'] } futures = "0.3.28" jsonrpsee = { version = "0.16.3", features = ["server"] } pallet-transaction-payment-rpc = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } @@ -37,5 +37,6 @@ sp-api = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } sp-core = { version = "21.0.0", git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } +sp-inherents = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } substrate-frame-rpc-system = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } diff --git a/domains/client/eth-service/src/provider.rs b/domains/client/eth-service/src/provider.rs index 0b5c5631c1..800aced23b 100644 --- a/domains/client/eth-service/src/provider.rs +++ b/domains/client/eth-service/src/provider.rs @@ -24,6 +24,7 @@ use sp_block_builder::BlockBuilder; use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata}; use sp_core::traits::SpawnEssentialNamed; use sp_core::H256; +use sp_inherents::CreateInherentDataProviders; use sp_runtime::codec::{Decode, Encode}; use std::error::Error; use std::fmt::{Debug, Display}; @@ -80,8 +81,8 @@ where } } -impl - RpcProvider for EthProvider +impl + RpcProvider for EthProvider where Block: BlockT, BE: Backend + 'static, @@ -107,12 +108,13 @@ where TxPool: TransactionPool + Sync + Send + 'static, CA: ChainApi + 'static, AccountId: DeserializeOwned + Encode + Debug + Decode + Display + Clone + Sync + Send + 'static, + CIDP: CreateInherentDataProviders + Send + Clone + 'static, { - type Deps = EthDeps; + type Deps = EthDeps; fn deps( &self, - full_deps: FullDeps, + full_deps: FullDeps, ) -> Result { let client = full_deps.client.clone(); let overrides = overrides_handle(client.clone()); @@ -153,6 +155,7 @@ where fee_history_cache_limit, execute_gas_limit_multiplier: self.eth_config.execute_gas_limit_multiplier, forced_parent_hashes: None, + pending_inherent_data_provider: full_deps.create_inherent_data_provider, }) } @@ -185,7 +188,7 @@ where > = Default::default(); let pubsub_notification_sinks = Arc::new(pubsub_notification_sinks); - let io = create_eth_rpc::( + let io = create_eth_rpc::( io, deps.clone(), subscription_task_executor, diff --git a/domains/client/eth-service/src/rpc.rs b/domains/client/eth-service/src/rpc.rs index 55ddb0702f..70a81570b6 100644 --- a/domains/client/eth-service/src/rpc.rs +++ b/domains/client/eth-service/src/rpc.rs @@ -20,6 +20,7 @@ use sp_api::{CallApiAt, ProvideRuntimeApi}; use sp_block_builder::BlockBuilder as BlockBuilderApi; use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata}; use sp_core::H256; +use sp_inherents::CreateInherentDataProviders; use sp_runtime::traits::Block as BlockT; use std::collections::BTreeMap; use std::sync::Arc; @@ -38,9 +39,9 @@ where } /// Extra dependencies for Ethereum compatibility. -pub struct EthDeps { +pub struct EthDeps { /// Full Rpc deps - pub full_deps: FullDeps, + pub full_deps: FullDeps, /// Ethereum transaction converter. pub converter: Option, /// Whether to enable dev signer @@ -66,10 +67,12 @@ pub struct EthDeps { pub execute_gas_limit_multiplier: u64, /// Mandated parent hashes for a given block hash. pub forced_parent_hashes: Option>, + /// Pending inherent data provider + pub pending_inherent_data_provider: CIDP, } -impl Clone - for EthDeps +impl Clone + for EthDeps { fn clone(&self) -> Self { Self { @@ -86,14 +89,15 @@ impl Clone fee_history_cache_limit: self.fee_history_cache_limit, execute_gas_limit_multiplier: self.execute_gas_limit_multiplier, forced_parent_hashes: self.forced_parent_hashes.clone(), + pending_inherent_data_provider: self.pending_inherent_data_provider.clone(), } } } /// Instantiate Ethereum-compatible RPC extensions. -pub(crate) fn create_eth_rpc>( +pub(crate) fn create_eth_rpc( mut io: RpcModule<()>, - deps: EthDeps, + deps: EthDeps, subscription_task_executor: SubscriptionTaskExecutor, pubsub_notification_sinks: Arc< EthereumBlockNotificationSinks>, @@ -112,11 +116,14 @@ where TxPool: TransactionPool + 'static, CA: ChainApi + 'static, CT: ConvertTransaction<::Extrinsic> + Send + Sync + 'static, + EC: EthConfig, + CIDP: CreateInherentDataProviders + Send + 'static, { let EthDeps { full_deps, converter, enable_dev_signer, + sync: _, frontier_backend, overrides, block_data_cache, @@ -126,7 +133,7 @@ where fee_history_cache_limit, execute_gas_limit_multiplier, forced_parent_hashes, - .. + pending_inherent_data_provider, } = deps; let FullDeps { @@ -145,7 +152,7 @@ where } io.merge( - Eth::::new( + Eth::::new( client.clone(), pool.clone(), graph.clone(), @@ -160,6 +167,8 @@ where fee_history_cache_limit, execute_gas_limit_multiplier, forced_parent_hashes, + pending_inherent_data_provider, + None, ) .replace_config::() .into_rpc(), diff --git a/domains/runtime/evm/Cargo.toml b/domains/runtime/evm/Cargo.toml index 2f8f83c40a..1e0b0ff920 100644 --- a/domains/runtime/evm/Cargo.toml +++ b/domains/runtime/evm/Cargo.toml @@ -20,10 +20,10 @@ targets = ["x86_64-unknown-linux-gnu"] codec = { package = "parity-scale-codec", version = "3.2.1", default-features = false, features = ["derive"] } domain-pallet-executive = { version = "0.1.0", path = "../../pallets/executive", default-features = false } domain-runtime-primitives = { version = "0.1.0", path = "../../primitives/runtime", default-features = false } -fp-account = { version = "1.0.0-dev", default-features = false, features = ["serde"], git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } -fp-evm = { version = "3.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } -fp-rpc = { version = "3.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } -fp-self-contained = { version = "1.0.0-dev", default-features = false, features = ["serde"], git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } +fp-account = { version = "1.0.0-dev", default-features = false, features = ["serde"], git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } +fp-evm = { version = "3.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } +fp-rpc = { version = "3.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } +fp-self-contained = { version = "1.0.0-dev", default-features = false, features = ["serde"], git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true, git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } @@ -32,15 +32,15 @@ frame-system-rpc-runtime-api = { version = "4.0.0-dev", default-features = false hex-literal = { version = '0.4.0', optional = true } log = { version = "0.4.20", default-features = false } pallet-balances = { version = "4.0.0-dev", default-features = false, git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } -pallet-base-fee = { version = "1.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } +pallet-base-fee = { version = "1.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } pallet-domain-id = { version = "0.1.0", path = "../../pallets/domain-id", default-features = false } pallet-operator-rewards = { version = "0.1.0", path = "../../pallets/operator-rewards", default-features = false } -pallet-ethereum = { version = "4.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } -pallet-evm = { version = "6.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } -pallet-evm-chain-id = { version = "1.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } -pallet-evm-precompile-modexp = { version = "2.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } -pallet-evm-precompile-sha3fips = { version = "2.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } -pallet-evm-precompile-simple = { version = "2.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } +pallet-ethereum = { version = "4.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } +pallet-evm = { version = "6.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } +pallet-evm-chain-id = { version = "1.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } +pallet-evm-precompile-modexp = { version = "2.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } +pallet-evm-precompile-sha3fips = { version = "2.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } +pallet-evm-precompile-simple = { version = "2.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } pallet-messenger = { version = "0.1.0", path = "../../pallets/messenger", default-features = false } pallet-sudo = { version = "4.0.0-dev", default-features = false, git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } pallet-timestamp = { version = "4.0.0-dev", default-features = false, git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } diff --git a/domains/service/src/domain.rs b/domains/service/src/domain.rs index fc54bc8448..d4b78d9bb8 100644 --- a/domains/service/src/domain.rs +++ b/domains/service/src/domain.rs @@ -1,5 +1,6 @@ use crate::providers::{BlockImportProvider, RpcProvider}; use crate::{FullBackend, FullClient}; +use domain_client_block_preprocessor::inherents::CreateInherentDataProvider; use domain_client_block_preprocessor::runtime_api_full::RuntimeApiFull; use domain_client_consensus_relay_chain::DomainBlockImport; use domain_client_message_relayer::GossipMessageSink; @@ -338,6 +339,7 @@ where >, TFullBackend, AccountId, + CreateInherentDataProvider, > + BlockImportProvider> + 'static, { @@ -408,6 +410,9 @@ where database_source: domain_config.database.clone(), task_spawner: task_manager.spawn_handle(), backend: backend.clone(), + create_inherent_data_provider: CreateInherentDataProvider::new( + consensus_client.clone(), + ), }; let spawn_essential = task_manager.spawn_essential_handle(); diff --git a/domains/service/src/providers.rs b/domains/service/src/providers.rs index f9667b89b4..e6ab64289c 100644 --- a/domains/service/src/providers.rs +++ b/domains/service/src/providers.rs @@ -53,7 +53,7 @@ where } /// Provides adding custom ID to the RPC module. -pub trait RpcProvider +pub trait RpcProvider where Block: BlockT, Client: ProvideRuntimeApi + StorageProvider, @@ -67,7 +67,7 @@ where fn deps( &self, - full_deps: FullDeps, + full_deps: FullDeps, ) -> Result; fn rpc_id(&self) -> Option>; @@ -82,8 +82,8 @@ where SE: SpawnEssentialNamed + Clone; } -impl RpcProvider - for DefaultProvider +impl + RpcProvider for DefaultProvider where Block: BlockT, Client: ProvideRuntimeApi @@ -102,12 +102,13 @@ where CA: ChainApi + 'static, BE: Backend + 'static, AccountId: DeserializeOwned + Encode + Debug + Decode + Display + Clone + Sync + Send + 'static, + CIDP: Clone, { - type Deps = FullDeps; + type Deps = FullDeps; fn deps( &self, - full_deps: FullDeps, + full_deps: FullDeps, ) -> Result { Ok(full_deps) } @@ -125,6 +126,6 @@ where where SE: SpawnEssentialNamed + Clone, { - crate::rpc::create_full::<_, _, _, _, AccountId, BE>(deps).map_err(Into::into) + crate::rpc::create_full::<_, _, _, _, AccountId, BE, CIDP>(deps).map_err(Into::into) } } diff --git a/domains/service/src/rpc.rs b/domains/service/src/rpc.rs index f97792d04f..9ff6927893 100644 --- a/domains/service/src/rpc.rs +++ b/domains/service/src/rpc.rs @@ -28,7 +28,7 @@ use substrate_frame_rpc_system::{System, SystemApiServer}; use substrate_prometheus_endpoint::Registry; /// Full RPC dependencies. -pub struct FullDeps { +pub struct FullDeps { /// The client instance to use. pub client: Arc, /// The chain backend. @@ -53,9 +53,13 @@ pub struct FullDeps { pub database_source: DatabaseSource, /// Task Spawner. pub task_spawner: SpawnTaskHandle, + /// Create inherent data provider + pub create_inherent_data_provider: CIDP, } -impl Clone for FullDeps { +impl Clone + for FullDeps +{ fn clone(&self) -> Self { Self { client: self.client.clone(), @@ -70,13 +74,14 @@ impl Clone for FullDeps( - deps: FullDeps, +pub fn create_full( + deps: FullDeps, ) -> Result, Box> where Block: BlockT, diff --git a/domains/test/runtime/evm/Cargo.toml b/domains/test/runtime/evm/Cargo.toml index 683c736365..99d5695730 100644 --- a/domains/test/runtime/evm/Cargo.toml +++ b/domains/test/runtime/evm/Cargo.toml @@ -21,10 +21,10 @@ codec = { package = "parity-scale-codec", version = "3.2.1", default-features = domain-pallet-executive = { version = "0.1.0", path = "../../../pallets/executive", default-features = false } domain-test-primitives = { version = "0.1.0", path = "../../primitives", default-features = false } domain-runtime-primitives = { version = "0.1.0", path = "../../../primitives/runtime", default-features = false } -fp-account = { version = "1.0.0-dev", default-features = false, features = ["serde"], git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } -fp-evm = { version = "3.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } -fp-rpc = { version = "3.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } -fp-self-contained = { version = "1.0.0-dev", default-features = false, features = ["serde"], git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } +fp-account = { version = "1.0.0-dev", default-features = false, features = ["serde"], git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } +fp-evm = { version = "3.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } +fp-rpc = { version = "3.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } +fp-self-contained = { version = "1.0.0-dev", default-features = false, features = ["serde"], git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true, git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } @@ -33,15 +33,15 @@ frame-system-rpc-runtime-api = { version = "4.0.0-dev", default-features = false hex-literal = { version = '0.4.0', optional = true } log = { version = "0.4.20", default-features = false } pallet-balances = { version = "4.0.0-dev", default-features = false, git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } -pallet-base-fee = { version = "1.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } +pallet-base-fee = { version = "1.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } pallet-domain-id = { version = "0.1.0", path = "../../../pallets/domain-id", default-features = false } pallet-operator-rewards = { version = "0.1.0", path = "../../../pallets/operator-rewards", default-features = false } -pallet-ethereum = { version = "4.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } -pallet-evm = { version = "6.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } -pallet-evm-chain-id = { version = "1.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } -pallet-evm-precompile-modexp = { version = "2.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } -pallet-evm-precompile-sha3fips = { version = "2.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } -pallet-evm-precompile-simple = { version = "2.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } +pallet-ethereum = { version = "4.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } +pallet-evm = { version = "6.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } +pallet-evm-chain-id = { version = "1.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } +pallet-evm-precompile-modexp = { version = "2.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } +pallet-evm-precompile-sha3fips = { version = "2.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } +pallet-evm-precompile-simple = { version = "2.0.0-dev", default-features = false, git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } pallet-messenger = { version = "0.1.0", path = "../../../pallets/messenger", default-features = false } pallet-sudo = { version = "4.0.0-dev", default-features = false, git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } pallet-timestamp = { version = "4.0.0-dev", default-features = false, git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } diff --git a/domains/test/service/Cargo.toml b/domains/test/service/Cargo.toml index 0f3a05e247..880eba7b09 100644 --- a/domains/test/service/Cargo.toml +++ b/domains/test/service/Cargo.toml @@ -20,9 +20,9 @@ domain-service = { version = "0.1.0", path = "../../service" } domain-test-primitives = { version = "0.1.0", path = "../primitives" } domain-runtime-primitives = { version = "0.1.0", path = "../../primitives/runtime", default-features = false } evm-domain-test-runtime = { version = "0.1.0", path = "../runtime/evm" } -fp-account = { version = "1.0.0-dev", default-features = false, features = ["serde"], git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } -fp-evm = { version = "3.0.0-dev", git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } -fp-rpc = { version = "3.0.0-dev", git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69", features = ['default'] } +fp-account = { version = "1.0.0-dev", default-features = false, features = ["serde"], git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } +fp-evm = { version = "3.0.0-dev", git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } +fp-rpc = { version = "3.0.0-dev", git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393", features = ['default'] } futures = "0.3.28" frame-system = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } frame-system-rpc-runtime-api = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" } diff --git a/test/subspace-test-client/Cargo.toml b/test/subspace-test-client/Cargo.toml index 871f8e037c..e3b2340bf4 100644 --- a/test/subspace-test-client/Cargo.toml +++ b/test/subspace-test-client/Cargo.toml @@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] evm-domain-test-runtime = { version = "0.1.0", path = "../../domains/test/runtime/evm" } -fp-evm = { version = "3.0.0-dev", git = "https://github.com/subspace/frontier", rev = "068cb2eaae8b732a2a7d2c28e07a920684e19b69" } +fp-evm = { version = "3.0.0-dev", git = "https://github.com/subspace/frontier", rev = "01b56190c0ed019b187c34d23422b9fea7ca4393" } futures = "0.3.28" schnorrkel = "0.9.1" sc-chain-spec = { git = "https://github.com/subspace/substrate", rev = "48c5ebae44b90d45863195b91e0e489eca670898" }