From c8685fbef158c2e7be06776264a7963cefeb29da Mon Sep 17 00:00:00 2001 From: 1xstj <106580853+1xstj@users.noreply.github.com> Date: Wed, 3 Jan 2024 21:42:21 +0000 Subject: [PATCH] feat : add jobs pallet rpc calls --- Cargo.lock | 511 ++++++++++++++---------- Cargo.toml | 2 + node/Cargo.toml | 85 ++-- node/src/rpc/mod.rs | 86 ++++ pallets/dkg/Cargo.toml | 4 +- pallets/jobs/Cargo.toml | 2 +- pallets/jobs/rpc/Cargo.toml | 2 +- pallets/jobs/rpc/runtime-api/Cargo.toml | 10 +- pallets/jobs/rpc/runtime-api/src/lib.rs | 7 +- pallets/jobs/rpc/src/lib.rs | 73 +++- pallets/jobs/src/rpc.rs | 103 ++++- pallets/roles/Cargo.toml | 2 +- primitives/Cargo.toml | 13 +- primitives/src/jobs/mod.rs | 2 - relayer-gadget/Cargo.toml | 11 +- relayer-gadget/cli/Cargo.toml | 4 +- runtime/mainnet/Cargo.toml | 6 +- runtime/testnet/Cargo.toml | 12 +- runtime/testnet/src/lib.rs | 25 ++ 19 files changed, 656 insertions(+), 304 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3c5ba49a..4eb248ac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -200,7 +200,7 @@ name = "amcl" version = "0.3.0" source = "git+https://github.com/Snowfork/milagro_bls?rev=a6d66e4eb89015e352fb1c9f7b661ecdbb5b2176#a6d66e4eb89015e352fb1c9f7b661ecdbb5b2176" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", ] @@ -639,6 +639,7 @@ dependencies = [ "ark-ff 0.4.2", "ark-std 0.4.0", "tracing", + "tracing-subscriber 0.2.25", ] [[package]] @@ -651,7 +652,7 @@ dependencies = [ "ark-ff 0.4.2", "ark-serialize 0.4.2", "ark-std 0.4.0", - "parity-scale-codec", + "parity-scale-codec 3.6.9", ] [[package]] @@ -664,7 +665,7 @@ dependencies = [ "ark-ff 0.4.2", "ark-serialize 0.4.2", "ark-std 0.4.0", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", ] @@ -841,7 +842,7 @@ dependencies = [ "arkworks-r1cs-circuits", "arkworks-r1cs-gadgets", "arkworks-utils", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "tiny-keccak", ] @@ -1471,16 +1472,28 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +[[package]] +name = "bitvec" +version = "0.20.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" +dependencies = [ + "funty 1.1.0", + "radium 0.6.2", + "tap", + "wyz 0.2.0", +] + [[package]] name = "bitvec" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ - "funty", - "radium", + "funty 2.0.0", + "radium 0.7.0", "tap", - "wyz", + "wyz 0.5.1", ] [[package]] @@ -1658,7 +1671,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca548b6163b872067dc5eb82fd130c56881435e30367d2073594a3d9744120dd" dependencies = [ "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", ] @@ -2082,7 +2095,7 @@ dependencies = [ "ethereum-types 0.14.1", "evm-tracing-events", "hex", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "rpc-primitives-debug", "serde", "serde_json", @@ -2121,7 +2134,7 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3db8fba409ce3dc04f7d804074039eb68b960b0829161f8e06c95fea3f122528" dependencies = [ - "bitvec", + "bitvec 1.0.1", "coins-bip32", "hmac 0.12.1", "once_cell", @@ -3584,7 +3597,7 @@ dependencies = [ "derive_more", "ethereum-types 0.14.1", "hex", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "rlp", "rlp-derive", "scale-info", @@ -3617,9 +3630,12 @@ version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f76ef192b63e8a44b3d08832acebbb984c3fba154b5c26f70037c860202a0d4b" dependencies = [ + "anyhow", "ethereum-types 0.12.1", "hex", "sha3 0.9.1", + "thiserror", + "uint", ] [[package]] @@ -3658,7 +3674,7 @@ checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60" dependencies = [ "crunchy", "fixed-hash 0.8.0", - "impl-codec", + "impl-codec 0.6.0", "impl-rlp", "impl-serde", "scale-info", @@ -3675,7 +3691,7 @@ dependencies = [ "ethereum-types 0.14.1", "hash-db 0.15.2", "hash256-std-hasher", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "rlp", "scale-info", "serde", @@ -3703,7 +3719,7 @@ checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee" dependencies = [ "ethbloom 0.13.0", "fixed-hash 0.8.0", - "impl-codec", + "impl-codec 0.6.0", "impl-rlp", "impl-serde", "primitive-types 0.12.2", @@ -4057,7 +4073,7 @@ dependencies = [ "evm-gasometer", "evm-runtime", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "primitive-types 0.12.2", "rlp", "scale-info", @@ -4070,7 +4086,7 @@ name = "evm-core" version = "0.39.0" source = "git+https://github.com/rust-blockchain/evm?rev=b7b82c7e1fc57b7449d6dfa6826600de37cc1e65#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.6.9", "primitive-types 0.12.2", "scale-info", "serde", @@ -4110,7 +4126,7 @@ dependencies = [ "evm-tracing-events", "fp-evm", "pallet-evm", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "primitives-ext", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-io 23.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -4128,7 +4144,7 @@ dependencies = [ "evm", "evm-gasometer", "evm-runtime", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sp-runtime-interface 17.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", ] @@ -4210,7 +4226,7 @@ source = "git+https://github.com/paritytech/frontier.git?branch=polkadot-v1.1.0# dependencies = [ "async-trait", "fp-storage", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-runtime 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", ] @@ -4265,7 +4281,7 @@ dependencies = [ "kvdb-rocksdb", "log", "parity-db", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "parking_lot 0.12.1", "sc-client-api", "sc-client-db", @@ -4324,7 +4340,7 @@ dependencies = [ "libsecp256k1", "log", "pallet-evm", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "prometheus", "rand 0.8.5", "rlp", @@ -4379,7 +4395,7 @@ dependencies = [ "ethereum-types 0.14.1", "fp-rpc", "fp-storage", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sc-client-api", "sp-api", "sp-blockchain", @@ -4469,7 +4485,7 @@ dependencies = [ "futures-timer", "log", "num-traits", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "parking_lot 0.12.1", "scale-info", ] @@ -4481,6 +4497,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" dependencies = [ "byteorder", + "rand 0.8.5", "rustc-hex", "static_assertions", ] @@ -4561,7 +4578,7 @@ name = "fork-tree" version = "3.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.6.9", ] [[package]] @@ -4592,7 +4609,7 @@ dependencies = [ "impl-serde", "libsecp256k1", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -4608,7 +4625,7 @@ version = "2.0.0-dev" source = "git+https://github.com/paritytech/frontier.git?branch=polkadot-v1.1.0#de5a3df59d3ada67c8cacdb79e607ad0b229ec5b" dependencies = [ "ethereum", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-runtime 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -4633,7 +4650,7 @@ dependencies = [ "ethereum-types 0.14.1", "fp-evm", "frame-support", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", ] @@ -4645,7 +4662,7 @@ dependencies = [ "evm", "frame-support", "num_enum 0.7.1", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -4661,7 +4678,7 @@ dependencies = [ "ethereum", "ethereum-types 0.14.1", "fp-evm", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-api", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -4676,7 +4693,7 @@ version = "1.0.0-dev" source = "git+https://github.com/paritytech/frontier.git?branch=polkadot-v1.1.0#de5a3df59d3ada67c8cacdb79e607ad0b229ec5b" dependencies = [ "frame-support", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "sp-runtime 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -4687,7 +4704,7 @@ name = "fp-storage" version = "2.0.0" source = "git+https://github.com/paritytech/frontier.git?branch=polkadot-v1.1.0#de5a3df59d3ada67c8cacdb79e607ad0b229ec5b" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.6.9", "serde", ] @@ -4707,7 +4724,7 @@ dependencies = [ "frame-system", "linregress", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "paste", "scale-info", "serde", @@ -4741,7 +4758,7 @@ dependencies = [ "lazy_static", "linked-hash-map", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "rand 0.8.5", "rand_pcg", "sc-block-builder", @@ -4789,7 +4806,7 @@ dependencies = [ "frame-election-provider-solution-type", "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-arithmetic 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -4807,7 +4824,7 @@ dependencies = [ "frame-system", "frame-try-runtime", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-io 23.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -4823,7 +4840,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "878babb0b136e731cc77ec2fd883ff02745ff21e6fb662729953d44923df009c" dependencies = [ "cfg-if", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", ] @@ -4835,7 +4852,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87cf1549fba25a6fcac22785b61698317d958e96cac72a59102ea45b9ae64692" dependencies = [ "cfg-if", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", ] @@ -4855,7 +4872,7 @@ dependencies = [ "k256", "log", "macro_magic", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "paste", "scale-info", "serde", @@ -4928,7 +4945,7 @@ dependencies = [ "cfg-if", "frame-support", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -4947,7 +4964,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-runtime 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -4959,7 +4976,7 @@ name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sp-api", ] @@ -4969,7 +4986,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "frame-support", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sp-api", "sp-runtime 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -5004,6 +5021,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "funty" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" + [[package]] name = "funty" version = "2.0.0" @@ -5748,13 +5771,22 @@ dependencies = [ "windows", ] +[[package]] +name = "impl-codec" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443" +dependencies = [ + "parity-scale-codec 2.3.1", +] + [[package]] name = "impl-codec" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.6.9", ] [[package]] @@ -7182,7 +7214,7 @@ dependencies = [ "amcl", "hex", "lazy_static", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "rand 0.8.5", "scale-info", "zeroize", @@ -7227,7 +7259,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "anyhow", "jsonrpsee", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "serde", "sp-api", "sp-blockchain", @@ -7659,6 +7691,7 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn 1.0.109", @@ -7870,7 +7903,7 @@ dependencies = [ "pallet-balances", "pallet-evm", "pallet-vesting", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "rustc-hex", "scale-info", "schnorrkel 0.9.1", @@ -7890,7 +7923,7 @@ dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-runtime 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -7908,7 +7941,7 @@ dependencies = [ "pallet-authorship", "pallet-session", "pallet-timestamp", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-application-crypto 23.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-consensus-babe", @@ -7933,7 +7966,7 @@ dependencies = [ "frame-system", "log", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-io 23.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -7951,7 +7984,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-runtime 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -7965,7 +7998,7 @@ dependencies = [ "fp-evm", "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-runtime 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -7981,7 +8014,7 @@ dependencies = [ "frame-system", "log", "pallet-treasury", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-io 23.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -8000,7 +8033,7 @@ dependencies = [ "log", "pallet-bounties", "pallet-treasury", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-io 23.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -8017,7 +8050,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-io 23.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -8034,7 +8067,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -8050,7 +8083,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "smallvec", @@ -8072,7 +8105,7 @@ dependencies = [ "fp-evm", "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-inherents", @@ -8091,7 +8124,7 @@ dependencies = [ "frame-system", "log", "pallet-election-provider-support-benchmarking", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "rand 0.8.5", "scale-info", "sp-arithmetic 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -8111,7 +8144,7 @@ dependencies = [ "frame-benchmarking", "frame-election-provider-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sp-npos-elections", "sp-runtime 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -8126,7 +8159,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-io 23.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -8143,7 +8176,7 @@ source = "git+https://github.com/webb-tools/pallet-eth2-light-client?tag=v0.5.0# dependencies = [ "anyhow", "async-trait", - "bitvec", + "bitvec 1.0.1", "derive_more", "eth-types", "ethereum-types 0.14.1", @@ -8153,7 +8186,7 @@ dependencies = [ "lazy_static", "log", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "rlp", "rlp-derive", "scale-info", @@ -8191,7 +8224,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-evm", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-io 23.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-runtime 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -8215,7 +8248,7 @@ dependencies = [ "hex-literal", "impl-trait-for-tuples", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "rlp", "scale-info", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -8231,7 +8264,7 @@ source = "git+https://github.com/paritytech/frontier.git?branch=polkadot-v1.1.0# dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-runtime 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", ] @@ -8252,7 +8285,7 @@ dependencies = [ "pallet-balances", "pallet-evm", "pallet-timestamp", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "paste", "precompile-utils", "scale-info", @@ -8299,7 +8332,7 @@ dependencies = [ "pallet-balances", "pallet-evm", "pallet-timestamp", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "paste", "precompile-utils", "scale-info", @@ -8338,7 +8371,7 @@ dependencies = [ "pallet-preimage", "pallet-scheduler", "pallet-timestamp", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "precompile-utils", "scale-info", "serde", @@ -8356,7 +8389,7 @@ dependencies = [ "fp-evm", "frame-support", "pallet-evm", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sp-runtime 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", ] @@ -8399,7 +8432,7 @@ dependencies = [ "pallet-evm-chain-id", "pallet-jobs", "pallet-timestamp", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "precompile-utils", "rustc-hex", "scale-info", @@ -8439,7 +8472,7 @@ dependencies = [ "pallet-evm", "pallet-preimage", "pallet-timestamp", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "precompile-utils", "rustc-hex", "scale-info", @@ -8467,7 +8500,7 @@ dependencies = [ "pallet-evm", "pallet-proxy", "pallet-timestamp", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "precompile-utils", "rustc-hex", "scale-info", @@ -8493,7 +8526,7 @@ dependencies = [ "pallet-evm", "pallet-scheduler", "pallet-timestamp", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "precompile-utils", "scale-info", "serde", @@ -8539,7 +8572,7 @@ dependencies = [ "pallet-staking", "pallet-staking-reward-curve", "pallet-timestamp", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "precompile-utils", "rustc-hex", "scale-info", @@ -8566,7 +8599,7 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-application-crypto 23.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-consensus-grandpa", @@ -8587,7 +8620,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-evm", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-runtime 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -8603,7 +8636,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-io 23.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-runtime 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -8620,7 +8653,7 @@ dependencies = [ "frame-system", "log", "pallet-authorship", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-application-crypto 23.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -8638,7 +8671,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-io 23.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -8654,7 +8687,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "safe-mix", "scale-info", "sp-runtime 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -8688,7 +8721,7 @@ dependencies = [ "pallet-evm", "pallet-evm-chain-id", "pallet-timestamp", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "serde_json", @@ -8708,7 +8741,7 @@ version = "0.5.0" dependencies = [ "jsonrpsee", "pallet-jobs-rpc-runtime-api", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sp-api", "sp-blockchain", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -8722,11 +8755,10 @@ dependencies = [ name = "pallet-jobs-rpc-runtime-api" version = "0.5.0" dependencies = [ - "pallet-jobs", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sp-api", "sp-runtime 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-weights 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "tangle-primitives", ] @@ -8739,7 +8771,7 @@ dependencies = [ "frame-system", "log", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-io 23.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -8758,7 +8790,7 @@ dependencies = [ "frame-system", "log", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "sp-runtime 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -8775,7 +8807,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-io 23.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -8791,7 +8823,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-io 23.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-runtime 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -8812,7 +8844,7 @@ dependencies = [ "pallet-session", "pallet-staking", "pallet-timestamp", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "serde_json", @@ -8835,7 +8867,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-io 23.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-runtime 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -8853,7 +8885,7 @@ dependencies = [ "impl-trait-for-tuples", "log", "pallet-timestamp", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-io 23.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -8877,7 +8909,7 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "rand_chacha 0.2.2", "scale-info", "serde", @@ -8907,7 +8939,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-io 23.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-runtime 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -8923,7 +8955,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-inherents", "sp-io 23.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -8940,7 +8972,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "smallvec", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -8956,7 +8988,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -8972,7 +9004,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sp-api", "sp-blockchain", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -8987,7 +9019,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "pallet-transaction-payment", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sp-api", "sp-runtime 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-weights 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -9003,7 +9035,7 @@ dependencies = [ "frame-system", "impl-trait-for-tuples", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "sp-runtime 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -9018,7 +9050,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-io 23.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -9035,7 +9067,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-runtime 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -9060,7 +9092,7 @@ dependencies = [ "hex", "log", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "smallvec", @@ -9092,6 +9124,20 @@ dependencies = [ "snap", ] +[[package]] +name = "parity-scale-codec" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" +dependencies = [ + "arrayvec 0.7.4", + "bitvec 0.20.4", + "byte-slice-cast", + "impl-trait-for-tuples", + "parity-scale-codec-derive 2.3.1", + "serde", +] + [[package]] name = "parity-scale-codec" version = "3.6.9" @@ -9099,14 +9145,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe" dependencies = [ "arrayvec 0.7.4", - "bitvec", + "bitvec 1.0.1", "byte-slice-cast", "bytes", "impl-trait-for-tuples", - "parity-scale-codec-derive", + "parity-scale-codec-derive 3.6.9", "serde", ] +[[package]] +name = "parity-scale-codec-derive" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27" +dependencies = [ + "proc-macro-crate 1.1.3", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "parity-scale-codec-derive" version = "3.6.9" @@ -9605,7 +9663,7 @@ dependencies = [ "log", "num_enum 0.5.11", "pallet-evm", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "paste", "precompile-utils-macro", "scale-info", @@ -9651,7 +9709,7 @@ dependencies = [ "pallet-balances", "pallet-evm", "pallet-timestamp", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "precompile-utils", "scale-info", "serde", @@ -9725,6 +9783,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" dependencies = [ "fixed-hash 0.7.0", + "impl-codec 0.5.1", "uint", ] @@ -9735,7 +9794,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" dependencies = [ "fixed-hash 0.8.0", - "impl-codec", + "impl-codec 0.6.0", "impl-rlp", "impl-serde", "scale-info", @@ -9748,7 +9807,7 @@ version = "0.1.0" dependencies = [ "ethereum-types 0.14.1", "evm-tracing-events", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sp-externalities 0.19.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-runtime-interface 17.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -10019,6 +10078,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "radium" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" + [[package]] name = "radium" version = "0.7.0" @@ -10450,7 +10515,7 @@ version = "0.7.42" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" dependencies = [ - "bitvec", + "bitvec 1.0.1", "bytecheck", "hashbrown 0.12.3", "ptr_meta", @@ -10600,7 +10665,7 @@ dependencies = [ "ethereum", "ethereum-types 0.14.1", "hex", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "serde", "sp-api", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -10614,7 +10679,7 @@ name = "rpc-primitives-txpool" version = "0.6.0" dependencies = [ "ethereum", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-api", "sp-io 23.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -11057,7 +11122,7 @@ dependencies = [ "libp2p", "log", "multihash", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "prost", "prost-build", "rand 0.8.5", @@ -11081,7 +11146,7 @@ dependencies = [ "futures 0.3.29", "futures-timer", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sc-block-builder", "sc-client-api", "sc-proposer-metrics", @@ -11101,7 +11166,7 @@ name = "sc-block-builder" version = "0.10.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sc-client-api", "sp-api", "sp-block-builder", @@ -11154,7 +11219,7 @@ dependencies = [ "libp2p-identity", "log", "names", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "rand 0.8.5", "regex", "rpassword", @@ -11188,7 +11253,7 @@ dependencies = [ "fnv", "futures 0.3.29", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "parking_lot 0.12.1", "sc-executor", "sc-transaction-pool-api", @@ -11218,7 +11283,7 @@ dependencies = [ "linked-hash-map", "log", "parity-db", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "parking_lot 0.12.1", "sc-client-api", "sc-state-db", @@ -11265,7 +11330,7 @@ dependencies = [ "async-trait", "futures 0.3.29", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sc-block-builder", "sc-client-api", "sc-consensus", @@ -11298,7 +11363,7 @@ dependencies = [ "num-bigint", "num-rational", "num-traits", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "parking_lot 0.12.1", "sc-client-api", "sc-consensus", @@ -11350,7 +11415,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "fork-tree", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sc-client-api", "sc-consensus", "sp-blockchain", @@ -11371,7 +11436,7 @@ dependencies = [ "futures 0.3.29", "futures-timer", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "parking_lot 0.12.1", "rand 0.8.5", "sc-block-builder", @@ -11407,7 +11472,7 @@ dependencies = [ "futures 0.3.29", "jsonrpsee", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sc-client-api", "sc-consensus-grandpa", "sc-rpc", @@ -11427,7 +11492,7 @@ dependencies = [ "futures 0.3.29", "futures-timer", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sc-client-api", "sc-consensus", "sc-telemetry", @@ -11446,7 +11511,7 @@ name = "sc-executor" version = "0.10.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.6.9", "parking_lot 0.12.1", "sc-executor-common", "sc-executor-wasmtime", @@ -11541,7 +11606,7 @@ dependencies = [ "linked_hash_set", "log", "mockall", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "parking_lot 0.12.1", "partial_sort", "pin-project", @@ -11592,7 +11657,7 @@ dependencies = [ "bitflags 1.3.2", "futures 0.3.29", "libp2p-identity", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "prost-build", "sc-consensus", "sp-consensus", @@ -11628,7 +11693,7 @@ dependencies = [ "futures 0.3.29", "libp2p-identity", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "prost", "prost-build", "sc-client-api", @@ -11649,7 +11714,7 @@ dependencies = [ "futures 0.3.29", "libp2p", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sc-network", "sc-network-common", "sp-consensus", @@ -11671,7 +11736,7 @@ dependencies = [ "libp2p", "log", "mockall", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "prost", "prost-build", "sc-client-api", @@ -11700,7 +11765,7 @@ dependencies = [ "futures 0.3.29", "libp2p", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sc-network", "sc-network-common", "sc-utils", @@ -11725,7 +11790,7 @@ dependencies = [ "log", "num_cpus", "once_cell", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "parking_lot 0.12.1", "rand 0.8.5", "sc-client-api", @@ -11760,7 +11825,7 @@ dependencies = [ "futures 0.3.29", "jsonrpsee", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "parking_lot 0.12.1", "sc-block-builder", "sc-chain-spec", @@ -11789,7 +11854,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "jsonrpsee", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sc-chain-spec", "sc-transaction-pool-api", "scale-info", @@ -11828,7 +11893,7 @@ dependencies = [ "hex", "jsonrpsee", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "parking_lot 0.12.1", "sc-chain-spec", "sc-client-api", @@ -11857,7 +11922,7 @@ dependencies = [ "futures-timer", "jsonrpsee", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "parking_lot 0.12.1", "pin-project", "rand 0.8.5", @@ -11915,7 +11980,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "parking_lot 0.12.1", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", ] @@ -11959,7 +12024,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "jsonrpsee", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sc-chain-spec", "sc-client-api", "sc-consensus-babe", @@ -12060,7 +12125,7 @@ dependencies = [ "futures-timer", "linked-hash-map", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "parking_lot 0.12.1", "sc-client-api", "sc-transaction-pool-api", @@ -12084,7 +12149,7 @@ dependencies = [ "async-trait", "futures 0.3.29", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "serde", "sp-blockchain", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -12113,7 +12178,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8dd7aca73785181cc41f0bbe017263e682b585ca660540ba569133901d013ecf" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", ] @@ -12124,7 +12189,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "036575c29af9b6e4866ffb7fa055dbf623fe7a9cc159b33786de6013a6969d89" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", ] @@ -12135,7 +12200,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0459d00b0dbd2e765009924a78ef36b2ff7ba116292d732f00eb0ed8e465d15" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.6.9", "primitive-types 0.12.2", "scale-bits 0.3.0", "scale-decode-derive 0.7.0", @@ -12151,7 +12216,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7789f5728e4e954aaa20cadcc370b99096fb8645fca3c9333ace44bb18f30095" dependencies = [ "derive_more", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "primitive-types 0.12.2", "scale-bits 0.4.0", "scale-decode-derive 0.9.0", @@ -12191,7 +12256,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b0401b7cdae8b8aa33725f3611a051358d5b32887ecaa0fda5953a775b2d4d76" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.6.9", "primitive-types 0.12.2", "scale-bits 0.3.0", "scale-encode-derive 0.3.0", @@ -12207,7 +12272,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d70cb4b29360105483fac1ed567ff95d65224a14dd275b6303ed0a654c78de5" dependencies = [ "derive_more", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "primitive-types 0.12.2", "scale-bits 0.4.0", "scale-encode-derive 0.5.0", @@ -12247,10 +12312,10 @@ version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60" dependencies = [ - "bitvec", + "bitvec 1.0.1", "cfg-if", "derive_more", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info-derive", "serde", ] @@ -12277,7 +12342,7 @@ dependencies = [ "blake2 0.10.6", "either", "frame-metadata 15.1.0", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-bits 0.3.0", "scale-decode 0.7.0", "scale-encode 0.3.0", @@ -12298,7 +12363,7 @@ dependencies = [ "derive_more", "either", "frame-metadata 15.1.0", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-bits 0.4.0", "scale-decode 0.9.0", "scale-encode 0.5.0", @@ -13105,7 +13170,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "hash-db 0.16.0", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-api-proc-macro", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -13139,7 +13204,7 @@ version = "23.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "899492ea547816d5dfe9a5a2ecc32f65a7110805af6da3380aa4902371b31dc2" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "sp-core 21.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -13152,7 +13217,7 @@ name = "sp-application-crypto" version = "23.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -13168,7 +13233,7 @@ checksum = "bb6020576e544c6824a51d651bc8df8e6ab67cd59f1c9ac09868bb81a5199ded" dependencies = [ "integer-sqrt", "num-traits", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "sp-std 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -13182,7 +13247,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "integer-sqrt", "num-traits", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -13194,7 +13259,7 @@ name = "sp-authority-discovery" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-api", "sp-application-crypto 23.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -13220,7 +13285,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "futures 0.3.29", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "parking_lot 0.12.1", "schnellru", "sp-api", @@ -13252,7 +13317,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-api", "sp-application-crypto 23.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -13269,7 +13334,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "sp-api", @@ -13289,7 +13354,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "finality-grandpa", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "sp-api", @@ -13305,7 +13370,7 @@ name = "sp-consensus-slots" version = "0.10.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -13333,7 +13398,7 @@ dependencies = [ "libsecp256k1", "log", "merlin 2.0.1", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "parking_lot 0.12.1", "paste", "primitive-types 0.12.2", @@ -13379,7 +13444,7 @@ dependencies = [ "libsecp256k1", "log", "merlin 2.0.1", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "parking_lot 0.12.1", "paste", "primitive-types 0.12.2", @@ -13479,7 +13544,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0f71c671e01a8ca60da925d43a1b351b69626e268b8837f8371e320cf1dd100" dependencies = [ "environmental", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sp-std 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "sp-storage 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -13490,7 +13555,7 @@ version = "0.19.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "environmental", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-storage 13.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", ] @@ -13513,7 +13578,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "async-trait", "impl-trait-for-tuples", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-runtime 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -13532,7 +13597,7 @@ dependencies = [ "futures 0.3.29", "libsecp256k1", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "rustversion", "secp256k1 0.24.3", "sp-core 21.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -13556,7 +13621,7 @@ dependencies = [ "ed25519-dalek 2.1.0", "libsecp256k1", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "rustversion", "secp256k1 0.24.3", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -13601,7 +13666,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9be3cdd67cc1d9c1db17c5cbc4ec4924054a8437009d167f21f6590797e4aa45" dependencies = [ "futures 0.3.29", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "parking_lot 0.12.1", "sp-core 21.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "sp-externalities 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -13613,7 +13678,7 @@ name = "sp-keystore" version = "0.27.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.6.9", "parking_lot 0.12.1", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-externalities 0.19.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -13635,7 +13700,7 @@ version = "0.1.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "frame-metadata 16.0.0", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", ] @@ -13647,7 +13712,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "ckb-merkle-mountain-range", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "sp-api", @@ -13663,7 +13728,7 @@ name = "sp-npos-elections" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "sp-arithmetic 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -13723,7 +13788,7 @@ dependencies = [ "hash256-std-hasher", "impl-trait-for-tuples", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "paste", "rand 0.8.5", "scale-info", @@ -13745,7 +13810,7 @@ dependencies = [ "hash256-std-hasher", "impl-trait-for-tuples", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "paste", "rand 0.8.5", "scale-info", @@ -13766,7 +13831,7 @@ checksum = "6e676128182f90015e916f806cba635c8141e341e7abbc45d25525472e1bbce8" dependencies = [ "bytes", "impl-trait-for-tuples", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "primitive-types 0.12.2", "sp-externalities 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", "sp-runtime-interface-proc-macro 11.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -13784,7 +13849,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "bytes", "impl-trait-for-tuples", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "primitive-types 0.12.2", "sp-externalities 0.19.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-runtime-interface-proc-macro 11.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -13825,7 +13890,7 @@ name = "sp-session" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-api", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -13841,7 +13906,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "impl-trait-for-tuples", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -13857,7 +13922,7 @@ checksum = "9ef45d31f9e7ac648f8899a0cd038a3608f8499028bff55b6c799702592325b6" dependencies = [ "hash-db 0.16.0", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "parking_lot 0.12.1", "rand 0.8.5", "smallvec", @@ -13877,7 +13942,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "hash-db 0.16.0", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "parking_lot 0.12.1", "rand 0.8.5", "smallvec", @@ -13900,7 +13965,7 @@ dependencies = [ "curve25519-dalek 4.1.1", "ed25519-dalek 2.1.0", "hkdf", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "rand 0.8.5", "scale-info", "sha2 0.10.8", @@ -13933,7 +13998,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94294be83f11d4958cfea89ed5798f0b6605f5defc3a996948848458abbcc18e" dependencies = [ "impl-serde", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "ref-cast", "serde", "sp-debug-derive 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -13946,7 +14011,7 @@ version = "13.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "impl-serde", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "ref-cast", "serde", "sp-debug-derive 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -13959,7 +14024,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sp-inherents", "sp-runtime 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", @@ -13972,7 +14037,7 @@ version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "357f7591980dd58305956d32f8f6646d0a8ea9ea0e7e868e46f53b68ddf00cec" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sp-std 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "tracing", "tracing-core", @@ -13984,7 +14049,7 @@ name = "sp-tracing" version = "10.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "tracing", "tracing-core", @@ -14006,7 +14071,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-core 21.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-inherents", @@ -14027,7 +14092,7 @@ dependencies = [ "lazy_static", "memory-db", "nohash-hasher", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "parking_lot 0.12.1", "scale-info", "schnellru", @@ -14050,7 +14115,7 @@ dependencies = [ "lazy_static", "memory-db", "nohash-hasher", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "parking_lot 0.12.1", "scale-info", "schnellru", @@ -14068,7 +14133,7 @@ version = "22.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "impl-serde", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "parity-wasm", "scale-info", "serde", @@ -14084,7 +14149,7 @@ name = "sp-version-proc-macro" version = "8.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.6.9", "proc-macro2", "quote", "syn 2.0.39", @@ -14099,7 +14164,7 @@ dependencies = [ "anyhow", "impl-trait-for-tuples", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sp-std 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "wasmtime", ] @@ -14112,7 +14177,7 @@ dependencies = [ "anyhow", "impl-trait-for-tuples", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "wasmtime", ] @@ -14123,7 +14188,7 @@ version = "20.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45d084c735544f70625b821c3acdbc7a2fc1893ca98b85f1942631284692c75b" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "smallvec", @@ -14138,7 +14203,7 @@ name = "sp-weights" version = "20.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "smallvec", @@ -14534,7 +14599,7 @@ dependencies = [ "futures 0.3.29", "jsonrpsee", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sc-rpc-api", "sc-transaction-pool-api", "sp-api", @@ -14562,7 +14627,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "jsonrpsee", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "sc-client-api", "sc-rpc-api", "serde", @@ -14628,7 +14693,7 @@ dependencies = [ "hex", "impl-serde", "jsonrpsee", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "primitive-types 0.12.2", "scale-bits 0.3.0", "scale-decode 0.7.0", @@ -14661,7 +14726,7 @@ dependencies = [ "hex", "impl-serde", "jsonrpsee", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "primitive-types 0.12.2", "scale-bits 0.4.0", "scale-decode 0.9.0", @@ -14688,7 +14753,7 @@ dependencies = [ "heck 0.4.1", "hex", "jsonrpsee", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "proc-macro2", "quote", "scale-info", @@ -14708,7 +14773,7 @@ dependencies = [ "heck 0.4.1", "hex", "jsonrpsee", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "proc-macro2", "quote", "scale-info", @@ -14766,7 +14831,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a01ce5044c81db3404d38c56f1e69d72eff72c54e5913c9bba4c0b58d376031f" dependencies = [ "frame-metadata 15.1.0", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-core-hashing 9.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", @@ -14779,7 +14844,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "880017c466f66af10e1c9b28cfa4cb2e4f59ab1bfe0b0f7250f7aca6e9d593b0" dependencies = [ "frame-metadata 16.0.0", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-core-hashing 9.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", @@ -14794,7 +14859,7 @@ dependencies = [ "bip39", "hex", "hmac 0.12.1", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "pbkdf2 0.12.2", "regex", "schnorrkel 0.10.2", @@ -14939,9 +15004,10 @@ dependencies = [ "mmr-rpc", "pallet-airdrop-claims", "pallet-im-online", + "pallet-jobs-rpc", "pallet-transaction-payment", "pallet-transaction-payment-rpc", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "primitives-ext", "rand 0.7.3", "rpc-debug", @@ -15011,7 +15077,7 @@ dependencies = [ name = "tangle-crypto-primitives" version = "0.5.0" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-application-crypto 23.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", ] @@ -15031,7 +15097,7 @@ dependencies = [ "frame-support", "hex", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "smallvec", @@ -15138,7 +15204,7 @@ dependencies = [ "pallet-treasury", "pallet-utility", "pallet-vesting", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "precompile-utils", "rpc-primitives-debug", "rpc-primitives-txpool", @@ -15223,6 +15289,7 @@ dependencies = [ "pallet-indices", "pallet-insecure-randomness-collective-flip", "pallet-jobs", + "pallet-jobs-rpc-runtime-api", "pallet-nomination-pools", "pallet-offences", "pallet-preimage", @@ -15241,7 +15308,7 @@ dependencies = [ "pallet-utility", "pallet-vesting", "pallet-zksaas", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "precompile-utils", "rpc-primitives-debug", "rpc-primitives-txpool", @@ -17020,7 +17087,7 @@ dependencies = [ "async-trait", "ethers", "hex", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "prettyplease 0.2.15", "rand 0.8.5", "scale-info", @@ -17039,7 +17106,7 @@ dependencies = [ "async-trait", "ethers", "hex", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "prettyplease 0.2.15", "rand 0.8.5", "scale-info", @@ -17107,12 +17174,12 @@ name = "webb-consensus-types" version = "0.2.0-dev" source = "git+https://github.com/webb-tools/pallet-eth2-light-client?tag=v0.5.0#0ac997902435ed0bebfd03fbb0dccc0473b8d621" dependencies = [ - "bitvec", + "bitvec 1.0.1", "derive_more", "eth-types", "ethereum-types 0.14.1", "hex", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "rlp", "rlp-derive", "scale-info", @@ -17131,13 +17198,13 @@ version = "0.2.0-dev" source = "git+https://github.com/webb-tools/pallet-eth2-light-client?tag=v0.5.0#0ac997902435ed0bebfd03fbb0dccc0473b8d621" dependencies = [ "anyhow", - "bitvec", + "bitvec 1.0.1", "dotenv", "eth-types", "ethereum-types 0.14.1", "ethereum_hashing", "ethereum_ssz", - "funty", + "funty 2.0.0", "hex", "lazy_static", "log", @@ -17307,7 +17374,7 @@ dependencies = [ "ethereum-types 0.14.1", "frame-support", "log", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "webb-proposals 0.8.0", @@ -17382,7 +17449,7 @@ dependencies = [ "frame-support", "hex", "num-traits", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "tiny-keccak", @@ -17397,7 +17464,7 @@ dependencies = [ "frame-support", "hex", "num-traits", - "parity-scale-codec", + "parity-scale-codec 3.6.9", "scale-info", "serde", "thiserror", @@ -18269,6 +18336,12 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wyz" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" + [[package]] name = "wyz" version = "0.5.1" diff --git a/Cargo.toml b/Cargo.toml index e6eb2383..807763c1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -102,6 +102,8 @@ pallet-jobs = { path = "pallets/jobs", default-features = false } pallet-roles = { path = "pallets/roles", default-features = false } pallet-dkg = { path = "pallets/dkg", default-features = false } pallet-zksaas = { path = "pallets/zksaas", default-features = false } +pallet-jobs-rpc-runtime-api = { path = "pallets/jobs/rpc/runtime-api", default-features = false } +pallet-jobs-rpc = { path = "pallets/jobs/rpc" } # Substrate dependencies sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } diff --git a/node/Cargo.toml b/node/Cargo.toml index fc7bb4a7..da62b0e4 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "tangle" -build = "build.rs" -description = "Tangle Standalone chain node" version = { workspace = true } authors = { workspace = true } +build = "build.rs" edition = { workspace = true } -license = { workspace = true } homepage = { workspace = true } +license = { workspace = true } repository = { workspace = true } +description = "Tangle Standalone chain node" [package.metadata.wasm-pack.profile.release] # `wasm-opt` has some problems on linux, see @@ -24,42 +24,44 @@ targets = ["x86_64-unknown-linux-gnu"] substrate-build-script-utils = { workspace = true } [dependencies] -serde_json = { workspace = true } -tokio = { workspace = true } clap = { workspace = true } -parity-scale-codec = { workspace = true } futures = { workspace = true } hex-literal = { workspace = true } log = { workspace = true } +parity-scale-codec = { workspace = true } rand = { workspace = true } +serde_json = { workspace = true } +tokio = { workspace = true } # Substrate dependencies -sc-cli = { workspace = true } -sc-executor = { workspace = true } -sc-offchain = { workspace = true } -sc-keystore = { workspace = true } -sc-service = { workspace = true } -sp-core = { workspace = true } frame-benchmarking = { workspace = true } frame-benchmarking-cli = { workspace = true } frame-system = { workspace = true } sc-basic-authorship = { workspace = true } +sc-cli = { workspace = true } sc-client-api = { workspace = true } sc-consensus = { workspace = true } sc-consensus-babe = { workspace = true } +sc-consensus-grandpa = { workspace = true } +sc-executor = { workspace = true } +sc-keystore = { workspace = true } sc-network = { workspace = true } +sc-network-sync = { workspace = true } +sc-offchain = { workspace = true } +sc-service = { workspace = true } sc-telemetry = { workspace = true } sc-transaction-pool = { workspace = true } sp-consensus-babe = { workspace = true } +sp-core = { workspace = true } sp-inherents = { workspace = true } sp-keyring = { workspace = true } sp-runtime = { workspace = true } sp-trie = { workspace = true } -sc-consensus-grandpa = { workspace = true } -sc-network-sync = { workspace = true } webb-consensus-types = { workspace = true } webb-proposals = { workspace = true } +pallet-airdrop-claims = { workspace = true } +pallet-jobs-rpc = { workspace = true } sc-chain-spec = { workspace = true } sc-rpc = { workspace = true } sc-rpc-api = { workspace = true } @@ -67,9 +69,8 @@ sp-api = { workspace = true } sp-block-builder = { workspace = true } sp-blockchain = { workspace = true } sp-timestamp = { workspace = true } -substrate-prometheus-endpoint = { workspace = true } substrate-frame-rpc-system = { workspace = true } -pallet-airdrop-claims = { workspace = true } +substrate-prometheus-endpoint = { workspace = true } # RPC related dependencies jsonrpsee = { workspace = true } @@ -80,6 +81,7 @@ sc-transaction-pool-api = { workspace = true } wasmer = { version = "2.3" } # Frontier +fc-api = { workspace = true } fc-cli = { workspace = true } fc-consensus = { workspace = true } fc-db = { workspace = true } @@ -88,39 +90,38 @@ fc-rpc = { workspace = true, features = ["rpc-binary-search-estimate"] } fc-rpc-core = { workspace = true } fc-storage = { workspace = true } fp-account = { workspace = true } -fc-api = { workspace = true } fp-dynamic-fee = { workspace = true, features = ["default"] } fp-evm = { workspace = true, features = ["default"] } fp-rpc = { workspace = true, features = ["default"] } -rpc-trace = { workspace = true } +frame-system-rpc-runtime-api = { workspace = true } +mmr-rpc = { workspace = true } +primitives-ext = { workspace = true } rpc-debug = { workspace = true } -rpc-txpool = { workspace = true } rpc-primitives-debug = { workspace = true } rpc-primitives-txpool = { workspace = true } -primitives-ext = { workspace = true } -sp-transaction-storage-proof = { workspace = true } -sc-statement-store = { workspace = true } -sp-statement-store = { workspace = true } -sc-consensus-slots = { workspace = true } -sp-consensus = { workspace = true } -sp-keystore = { workspace = true } +rpc-trace = { workspace = true } +rpc-txpool = { workspace = true } +sc-authority-discovery = { workspace = true } sc-consensus-babe-rpc = { workspace = true } sc-consensus-grandpa-rpc = { workspace = true } -mmr-rpc = { workspace = true } +sc-consensus-slots = { workspace = true } +sc-network-common = { workspace = true } +sc-network-statement = { workspace = true } sc-rpc-spec-v2 = { workspace = true } -substrate-state-trie-migration-rpc = { workspace = true } +sc-statement-store = { workspace = true } +sc-storage-monitor = { workspace = true } sc-sync-state-rpc = { workspace = true } sc-sysinfo = { workspace = true } -sc-authority-discovery = { workspace = true } -sc-storage-monitor = { workspace = true } -sc-network-statement = { workspace = true } -sc-network-common = { workspace = true } -frame-system-rpc-runtime-api = { workspace = true } -tangle-testnet-runtime = { workspace = true, optional = true } -tangle-runtime = { workspace = true } -tangle-primitives = { workspace = true } +sp-consensus = { workspace = true } +sp-keystore = { workspace = true } +sp-statement-store = { workspace = true } +sp-transaction-storage-proof = { workspace = true } +substrate-state-trie-migration-rpc = { workspace = true } tangle-crypto-primitives = { workspace = true } +tangle-primitives = { workspace = true } +tangle-runtime = { workspace = true } +tangle-testnet-runtime = { workspace = true, optional = true } [features] default = ["with-rocksdb-weights", "rocksdb", "sql"] @@ -128,12 +129,12 @@ runtime-benchmarks = ["tangle-testnet-runtime/runtime-benchmarks"] with-rocksdb-weights = ["tangle-testnet-runtime/with-rocksdb-weights"] with-paritydb-weights = ["tangle-testnet-runtime/with-paritydb-weights"] rocksdb = [ - "sc-cli/rocksdb", - "sc-service/rocksdb", - "fc-cli/rocksdb", - "fc-db/rocksdb", - "fc-mapping-sync/rocksdb", - "fc-rpc/rocksdb", + "sc-cli/rocksdb", + "sc-service/rocksdb", + "fc-cli/rocksdb", + "fc-db/rocksdb", + "fc-mapping-sync/rocksdb", + "fc-rpc/rocksdb", ] sql = ["fc-db/sql", "fc-mapping-sync/sql"] testnet = ["tangle-testnet-runtime"] diff --git a/node/src/rpc/mod.rs b/node/src/rpc/mod.rs index 3ed570aa..9a65470a 100644 --- a/node/src/rpc/mod.rs +++ b/node/src/rpc/mod.rs @@ -98,6 +98,92 @@ where } /// Instantiate all Full RPC extensions. +#[cfg(feature = "testnet")] +pub fn create_full( + deps: FullDeps, + subscription_task_executor: SubscriptionTaskExecutor, + pubsub_notification_sinks: Arc< + fc_mapping_sync::EthereumBlockNotificationSinks< + fc_mapping_sync::EthereumBlockNotification, + >, + >, +) -> Result, Box> +where + C: CallApiAt + ProvideRuntimeApi, + C::Api: substrate_frame_rpc_system::AccountNonceApi, + C::Api: sp_block_builder::BlockBuilder, + C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi, + C::Api: pallet_jobs_rpc::JobsRuntimeApi, + C::Api: fp_rpc::ConvertTransactionRuntimeApi, + C::Api: fp_rpc::EthereumRuntimeRPCApi, + C::Api: rpc_primitives_debug::DebugRuntimeApi, + C::Api: rpc_primitives_txpool::TxPoolRuntimeApi, + C::Api: BabeApi, + C: BlockchainEvents + 'static, + C: HeaderBackend + + HeaderMetadata + + StorageProvider, + BE: Backend + 'static, + P: TransactionPool + 'static, + A: ChainApi + 'static, + CT: fp_rpc::ConvertTransaction<::Extrinsic> + Send + Sync + 'static, + SC: SelectChain + 'static, + B: sc_client_api::Backend + Send + Sync + 'static, + B::State: sc_client_api::backend::StateBackend, + CIDP: sp_inherents::CreateInherentDataProviders + Send + Sync + 'static, +{ + use pallet_jobs_rpc::{JobsApiServer, JobsClient}; + use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer}; + use sc_consensus_babe_rpc::{Babe, BabeApiServer}; + use sc_consensus_grandpa_rpc::{Grandpa, GrandpaApiServer}; + use substrate_frame_rpc_system::{System, SystemApiServer}; + + let mut io = RpcModule::new(()); + let FullDeps { client, pool, deny_unsafe, eth, babe, select_chain, grandpa } = deps; + + let BabeDeps { keystore, babe_worker_handle } = babe; + + let GrandpaDeps { + shared_voter_state, + shared_authority_set, + justification_stream, + subscription_executor, + finality_provider, + } = grandpa; + + io.merge(System::new(client.clone(), pool, deny_unsafe).into_rpc())?; + io.merge(TransactionPayment::new(client.clone()).into_rpc())?; + io.merge(JobsClient::new(client.clone()).into_rpc())?; + + io.merge( + Babe::new(client.clone(), babe_worker_handle.clone(), keystore, select_chain, deny_unsafe) + .into_rpc(), + )?; + + io.merge( + Grandpa::new( + subscription_executor, + shared_authority_set.clone(), + shared_voter_state, + justification_stream, + finality_provider, + ) + .into_rpc(), + )?; + + // Ethereum compatibility RPCs + let io = create_eth::<_, _, _, _, _, _, _, DefaultEthConfig>( + io, + eth, + subscription_task_executor, + pubsub_notification_sinks, + )?; + + Ok(io) +} + +/// Instantiate all Full RPC extensions. +#[cfg(not(feature = "testnet"))] pub fn create_full( deps: FullDeps, subscription_task_executor: SubscriptionTaskExecutor, diff --git a/pallets/dkg/Cargo.toml b/pallets/dkg/Cargo.toml index 13446694..53dfd7a7 100644 --- a/pallets/dkg/Cargo.toml +++ b/pallets/dkg/Cargo.toml @@ -17,8 +17,8 @@ sp-core = { workspace = true } sp-io = { workspace = true } sp-runtime = { workspace = true } sp-std = { workspace = true } -tangle-primitives = { workspace = true, default-features = false } tangle-crypto-primitives = { workspace = true, default-features = false } +tangle-primitives = { workspace = true, default-features = false } [dev-dependencies] pallet-balances = { workspace = true } @@ -38,6 +38,6 @@ std = [ "tangle-crypto-primitives/std", "pallet-balances/std", "sp-io/std", - "sp-keystore/std" + "sp-keystore/std", ] try-runtime = ["frame-support/try-runtime"] diff --git a/pallets/jobs/Cargo.toml b/pallets/jobs/Cargo.toml index e7653b17..ae3e61fa 100644 --- a/pallets/jobs/Cargo.toml +++ b/pallets/jobs/Cargo.toml @@ -16,8 +16,8 @@ scale-info = { workspace = true } sp-core = { workspace = true } sp-runtime = { workspace = true } sp-std = { workspace = true } -tangle-primitives = { workspace = true, default-features = false } tangle-crypto-primitives = { workspace = true, default-features = false } +tangle-primitives = { workspace = true, default-features = false } [dev-dependencies] ethereum = { workspace = true, features = ["with-codec"] } diff --git a/pallets/jobs/rpc/Cargo.toml b/pallets/jobs/rpc/Cargo.toml index 722242eb..3582da63 100644 --- a/pallets/jobs/rpc/Cargo.toml +++ b/pallets/jobs/rpc/Cargo.toml @@ -12,7 +12,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] jsonrpsee = { version = "0.16.2", features = ["client-core", "server", "macros"] } -pallet-jobs-rpc-runtime-api = { path = "./runtime-api" } +pallet-jobs-rpc-runtime-api = { path = "./runtime-api", default-features = false } parity-scale-codec = { workspace = true } sp-api = { workspace = true } sp-blockchain = { workspace = true } diff --git a/pallets/jobs/rpc/runtime-api/Cargo.toml b/pallets/jobs/rpc/runtime-api/Cargo.toml index e522b875..a0820f54 100644 --- a/pallets/jobs/rpc/runtime-api/Cargo.toml +++ b/pallets/jobs/rpc/runtime-api/Cargo.toml @@ -11,20 +11,18 @@ repository = { workspace = true } targets = ["x86_64-unknown-linux-gnu"] [dependencies] -pallet-jobs = { default-features = false, path = "../../../jobs" } -parity-scale-codec = { workspace = true } +parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] } sp-api = { workspace = true } sp-runtime = { workspace = true } -sp-weights = { workspace = true } -tangle-primitives = { workspace = true } +sp-std = { workspace = true } +tangle-primitives = { workspace = true, default-features = false } [features] default = ["std"] std = [ "parity-scale-codec/std", - "pallet-jobs/std", "sp-api/std", "sp-runtime/std", - "sp-weights/std", "tangle-primitives/std", + "sp-std/std", ] diff --git a/pallets/jobs/rpc/runtime-api/src/lib.rs b/pallets/jobs/rpc/runtime-api/src/lib.rs index d2082fc5..6959ee81 100644 --- a/pallets/jobs/rpc/runtime-api/src/lib.rs +++ b/pallets/jobs/rpc/runtime-api/src/lib.rs @@ -19,7 +19,7 @@ use parity_scale_codec::Codec; use sp_runtime::{traits::MaybeDisplay, Serialize}; - +use sp_std::vec::Vec; use tangle_primitives::{ jobs::{JobId, RpcResponseJobsData, RpcResponsePhaseOneResult}, roles::RoleType, @@ -42,9 +42,8 @@ sp_api::decl_runtime_apis! { /// /// # Returns /// - /// Returns a `Result` containing a vector of `RpcResponseJobsData` if the - /// operation is successful - fn query_jobs_by_validator(validator: AccountId) -> Result>, String>; + /// An optional vec of `RpcResponseJobsData` of jobs assigned to validator + fn query_jobs_by_validator(validator: AccountId) -> Option>>; /// Queries a job by its key and ID. /// /// # Arguments diff --git a/pallets/jobs/rpc/src/lib.rs b/pallets/jobs/rpc/src/lib.rs index d355653d..e4f32b7f 100644 --- a/pallets/jobs/rpc/src/lib.rs +++ b/pallets/jobs/rpc/src/lib.rs @@ -29,7 +29,10 @@ use sp_runtime::{ Serialize, }; use std::sync::Arc; -use tangle_primitives::jobs::RpcResponseJobsData; +use tangle_primitives::{ + jobs::{JobId, RpcResponseJobsData, RpcResponsePhaseOneResult}, + roles::RoleType, +}; /// JobsClient RPC methods. #[rpc(client, server)] @@ -39,7 +42,26 @@ pub trait JobsApi { &self, at: Option, validator: AccountId, - ) -> RpcResult>>; + ) -> RpcResult>>>; + + #[method(name = "jobs_queryJobById")] + fn query_job_by_id( + &self, + at: Option, + role_type: RoleType, + job_id: JobId, + ) -> RpcResult>>; + + #[method(name = "jobs_queryPhaseOneById")] + fn query_phase_one_by_id( + &self, + at: Option, + role_type: RoleType, + job_id: JobId, + ) -> RpcResult>>; + + #[method(name = "jobs_queryNextJobId")] + fn query_next_job_id(&self, at: Option) -> RpcResult; } /// A struct that implements the `JobsApi`. @@ -67,15 +89,52 @@ where &self, at: Option<::Hash>, validator: AccountId, - ) -> RpcResult>> { + ) -> RpcResult>>> { let api = self.client.runtime_api(); let at = at.unwrap_or_else(|| self.client.info().best_hash); match api.query_jobs_by_validator(at, validator) { - Ok(res) => match res { - Ok(res) => Ok(res), - Err(e) => Err(runtime_error_into_rpc_err(e)), - }, + Ok(res) => Ok(res), + Err(e) => Err(runtime_error_into_rpc_err(e)), + } + } + + fn query_job_by_id( + &self, + at: Option<::Hash>, + role_type: RoleType, + job_id: JobId, + ) -> RpcResult>> { + let api = self.client.runtime_api(); + let at = at.unwrap_or_else(|| self.client.info().best_hash); + + match api.query_job_by_id(at, role_type, job_id) { + Ok(res) => Ok(res), + Err(e) => Err(runtime_error_into_rpc_err(e)), + } + } + + fn query_phase_one_by_id( + &self, + at: Option<::Hash>, + role_type: RoleType, + job_id: JobId, + ) -> RpcResult>> { + let api = self.client.runtime_api(); + let at = at.unwrap_or_else(|| self.client.info().best_hash); + + match api.query_phase_one_by_id(at, role_type, job_id) { + Ok(res) => Ok(res), + Err(e) => Err(runtime_error_into_rpc_err(e)), + } + } + + fn query_next_job_id(&self, at: Option<::Hash>) -> RpcResult { + let api = self.client.runtime_api(); + let at = at.unwrap_or_else(|| self.client.info().best_hash); + + match api.query_next_job_id(at) { + Ok(res) => Ok(res), Err(e) => Err(runtime_error_into_rpc_err(e)), } } diff --git a/pallets/jobs/src/rpc.rs b/pallets/jobs/src/rpc.rs index 510bb54c..453ddc62 100644 --- a/pallets/jobs/src/rpc.rs +++ b/pallets/jobs/src/rpc.rs @@ -1,6 +1,6 @@ use super::*; -use scale_info::prelude::string::String; pub use tangle_primitives::jobs::RpcResponseJobsData; +use tangle_primitives::{jobs::RpcResponsePhaseOneResult, roles::RoleType}; impl Pallet { /// Queries jobs associated with a specific validator. @@ -20,10 +20,9 @@ impl Pallet { /// operation is successful, or an error message as a `String` if there is an issue. pub fn query_jobs_by_validator( validator: T::AccountId, - ) -> Result>, String> { + ) -> Option>> { + let mut jobs: Vec> = vec![]; if let Some(jobs_list) = ValidatorJobIdLookup::::get(validator) { - let mut jobs: Vec> = vec![]; - for (role_type, job_id) in jobs_list.iter() { if let Some(job_info) = SubmittedJobs::::get(role_type, job_id) { if !job_info.job_type.is_phase_one() { @@ -53,9 +52,103 @@ impl Pallet { jobs.push(info); } + } else { + continue } } } - Ok(vec![]) + + Some(jobs) + } + + /// Queries a job by its key and ID. + /// + /// # Arguments + /// + /// * `role_type` - The role of the job. + /// * `job_id` - The ID of the job. + /// + /// # Returns + /// + /// An optional `RpcResponseJobsData` containing the account ID of the job. + pub fn query_job_by_id( + role_type: RoleType, + job_id: JobId, + ) -> Option> { + if let Some(job_info) = SubmittedJobs::::get(role_type, job_id) { + if !job_info.job_type.is_phase_one() { + let result = KnownResults::::get( + job_info.job_type.get_role_type(), + job_info.job_type.clone().get_phase_one_id().unwrap(), + ) + .unwrap(); + + let info = RpcResponseJobsData:: { + job_id, + job_type: job_info.job_type, + participants: result.participants(), + threshold: result.threshold(), + key: Some(result.result), + }; + + return Some(info) + } else { + let info = RpcResponseJobsData:: { + job_id, + job_type: job_info.job_type, + participants: None, + threshold: None, + key: None, + }; + + return Some(info) + } + } + + None + } + + /// Queries the phase one result of a job by its key and ID. + /// + /// # Arguments + /// + /// * `role_type` - The role of the job. + /// * `job_id` - The ID of the job. + /// + /// # Returns + /// + /// An `Option` containing the phase one result of the job, wrapped in an + /// `RpcResponsePhaseOneResult`. + pub fn query_phase_one_by_id( + role_type: RoleType, + job_id: JobId, + ) -> Option> { + if let Some(job_info) = SubmittedJobs::::get(role_type, job_id) { + if !job_info.job_type.is_phase_one() { + let result = KnownResults::::get( + job_info.job_type.get_role_type(), + job_info.job_type.clone().get_phase_one_id().unwrap(), + ) + .unwrap(); + + let info = RpcResponsePhaseOneResult:: { + owner: job_info.owner, + result: result.result, + job_type: job_info.job_type, + }; + + return Some(info) + } + } + + None + } + + /// Queries next job ID. + /// + /// # Returns + /// Next job ID. + pub fn query_next_job_id() -> JobId { + NextJobId::::get() } } diff --git a/pallets/roles/Cargo.toml b/pallets/roles/Cargo.toml index 866c5d0b..37aec644 100644 --- a/pallets/roles/Cargo.toml +++ b/pallets/roles/Cargo.toml @@ -28,8 +28,8 @@ sp-io = { workspace = true } sp-runtime = { workspace = true } sp-staking = { workspace = true } sp-std = { workspace = true } -tangle-primitives = { workspace = true, default-features = false } tangle-crypto-primitives = { workspace = true, default-features = false } +tangle-primitives = { workspace = true, default-features = false } [dev-dependencies] hex-literal = { workspace = true } diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index 840163ca..0387fdca 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -28,15 +28,17 @@ ark-ff = { workspace = true, default-features = false, optional = true } ark-groth16 = { workspace = true, default-features = false, optional = true } ark-serialize = { workspace = true, default-features = false, optional = true } ark-std = { workspace = true, default-features = false, optional = true } - ethabi = { workspace = true, optional = true } [dev-dependencies] hex = { workspace = true } [features] -default = ["std", "verifying"] +default = ["std"] std = [ + "serde/std", + "sp-arithmetic/std", + "log/std", "frame-support/std", "sp-runtime/std", "sp-core/std", @@ -45,6 +47,13 @@ std = [ "sp-consensus-babe/std", "sp-std/std", "ark-std?/std", + "ark-bn254?/std", + "ark-crypto-primitives?/std", + "ark-ec?/std", + "ark-ff?/std", + "ark-groth16?/std", + "ark-serialize?/std", + "ethabi?/std", ] verifying = [ "ark-crypto-primitives", diff --git a/primitives/src/jobs/mod.rs b/primitives/src/jobs/mod.rs index 05c891aa..5ebbe231 100644 --- a/primitives/src/jobs/mod.rs +++ b/primitives/src/jobs/mod.rs @@ -253,8 +253,6 @@ pub struct RpcResponsePhaseOneResult { pub owner: AccountId, /// The type of the job result. pub result: Vec, - /// permitted caller to use this result - pub permitted_caller: Option, /// The type of the job submission. pub job_type: JobType, } diff --git a/relayer-gadget/Cargo.toml b/relayer-gadget/Cargo.toml index f957284f..83908545 100644 --- a/relayer-gadget/Cargo.toml +++ b/relayer-gadget/Cargo.toml @@ -2,24 +2,23 @@ name = "tangle-relayer-gadget" version = "0.0.1" authors = ["Webb Developers ", "Shady Khalifa "] -license = "GPL-3.0-or-later WITH Classpath-exception-2.0" +edition = { workspace = true } homepage = { workspace = true } +license = "GPL-3.0-or-later WITH Classpath-exception-2.0" repository = { workspace = true } -edition = { workspace = true } [dependencies] -tracing = { workspace = true } ethereum-types = { workspace = true } +tracing = { workspace = true } # Substrate +sc-keystore = { workspace = true } sp-application-crypto = { workspace = true } sp-keystore = { workspace = true } -sc-keystore = { workspace = true } # Relayer webb-relayer = { git = "https://github.com/webb-tools/relayer", branch = "develop" } -webb-relayer-context = { git = "https://github.com/webb-tools/relayer", branch = "develop" } webb-relayer-config = { git = "https://github.com/webb-tools/relayer", branch = "develop" } +webb-relayer-context = { git = "https://github.com/webb-tools/relayer", branch = "develop" } webb-relayer-store = { git = "https://github.com/webb-tools/relayer", branch = "develop" } webb-relayer-types = { git = "https://github.com/webb-tools/relayer", branch = "develop" } - diff --git a/relayer-gadget/cli/Cargo.toml b/relayer-gadget/cli/Cargo.toml index ea98b258..844e7c7a 100644 --- a/relayer-gadget/cli/Cargo.toml +++ b/relayer-gadget/cli/Cargo.toml @@ -2,10 +2,10 @@ name = "tangle-relayer-gadget-cli" version = "0.0.1" authors = ["Webb Developers ", "Shady Khalifa "] -license = "GPL-3.0-or-later WITH Classpath-exception-2.0" +edition = { workspace = true } homepage = { workspace = true } +license = "GPL-3.0-or-later WITH Classpath-exception-2.0" repository = { workspace = true } -edition = { workspace = true } [dependencies] clap = { workspace = true } diff --git a/runtime/mainnet/Cargo.toml b/runtime/mainnet/Cargo.toml index 99dfda28..36c21729 100644 --- a/runtime/mainnet/Cargo.toml +++ b/runtime/mainnet/Cargo.toml @@ -86,8 +86,8 @@ pallet-utility = { workspace = true } pallet-vesting = { workspace = true } # Webb dependencies -tangle-primitives = { workspace = true } tangle-crypto-primitives = { workspace = true } +tangle-primitives = { workspace = true } # Frontier dependencies fp-account = { workspace = true } @@ -199,6 +199,10 @@ std = [ "pallet-treasury/std", "pallet-airdrop-claims/std", "pallet-identity/std", + "frame-benchmarking/std", + "frame-system-benchmarking/std", + "num_enum/std", + "pallet-proxy/std", # Tangle dependencies "tangle-primitives/std", diff --git a/runtime/testnet/Cargo.toml b/runtime/testnet/Cargo.toml index a3db23bb..e1c5b1e8 100644 --- a/runtime/testnet/Cargo.toml +++ b/runtime/testnet/Cargo.toml @@ -85,11 +85,12 @@ pallet-vesting = { workspace = true } # Webb dependencies pallet-airdrop-claims = { workspace = true } pallet-dkg = { workspace = true } -pallet-zksaas = { workspace = true } pallet-jobs = { workspace = true } +pallet-jobs-rpc-runtime-api = { workspace = true } pallet-roles = { workspace = true } -tangle-primitives = { workspace = true, features = ["verifying"] } +pallet-zksaas = { workspace = true } tangle-crypto-primitives = { workspace = true } +tangle-primitives = { workspace = true, features = ["verifying"] } # Frontier dependencies fp-account = { workspace = true } @@ -118,12 +119,12 @@ pallet-hotfix-sufficients = { workspace = true } pallet-evm-precompile-batch = { workspace = true } pallet-evm-precompile-call-permit = { workspace = true } pallet-evm-precompile-democracy = { workspace = true } +pallet-evm-precompile-jobs = { workspace = true } pallet-evm-precompile-preimage = { workspace = true } pallet-evm-precompile-proxy = { workspace = true } pallet-evm-precompile-registry = { workspace = true } pallet-evm-precompile-staking = { workspace = true } precompile-utils = { workspace = true } -pallet-evm-precompile-jobs = { workspace = true } evm-tracer = { workspace = true } rpc-primitives-debug = { workspace = true } @@ -202,6 +203,10 @@ std = [ "pallet-treasury/std", "pallet-airdrop-claims/std", "pallet-identity/std", + "frame-benchmarking/std", + "frame-system-benchmarking/std", + "num_enum/std", + "pallet-proxy/std", # Tangle dependencies "tangle-primitives/std", @@ -210,6 +215,7 @@ std = [ "pallet-roles/std", "pallet-dkg/std", "pallet-zksaas/std", + "pallet-jobs-rpc-runtime-api/std", # ETH2 light-client "pallet-eth2-light-client/std", diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs index 7609d5ff..56e6f975 100644 --- a/runtime/testnet/src/lib.rs +++ b/runtime/testnet/src/lib.rs @@ -69,6 +69,10 @@ use sp_version::NativeVersion; use sp_version::RuntimeVersion; use static_assertions::const_assert; pub use tangle_crypto_primitives::crypto::AuthorityId as RoleKeyId; +use tangle_primitives::{ + jobs::{JobId, RpcResponseJobsData, RpcResponsePhaseOneResult}, + roles::RoleType, +}; #[cfg(any(feature = "std", test))] pub use frame_system::Call as SystemCall; @@ -1377,6 +1381,27 @@ impl_runtime_apis! { } } + impl pallet_jobs_rpc_runtime_api::JobsApi for Runtime { + fn query_jobs_by_validator( + validator: AccountId, + ) -> Option>> { + Jobs::query_jobs_by_validator(validator) + } + + fn query_job_by_id(role_type: RoleType, job_id: JobId) -> Option> { + Jobs::query_job_by_id(role_type, job_id) + } + + fn query_phase_one_by_id(role_type: RoleType, job_id: JobId) -> Option> { + Jobs::query_phase_one_by_id(role_type, job_id) + } + + fn query_next_job_id() -> JobId { + Jobs::query_next_job_id() + } + + } + impl fp_rpc::EthereumRuntimeRPCApi for Runtime { fn chain_id() -> u64 { ::ChainId::get()