From 8ec97d73c7d85e07988ed8ef54363803e8956658 Mon Sep 17 00:00:00 2001 From: jasl Date: Wed, 18 Jan 2023 07:23:58 +0800 Subject: [PATCH 1/6] Upgrade to polkadot-v0.9.36 --- Cargo.lock | 666 ++++++++---------- Cargo.toml | 8 +- crates/phactory/Cargo.toml | 20 +- crates/phactory/api/Cargo.toml | 10 +- crates/phactory/src/contracts/pink.rs | 4 +- crates/phala-crypto/Cargo.toml | 4 +- crates/phala-mq/Cargo.toml | 2 +- crates/phala-node-rpc-ext/Cargo.toml | 14 +- crates/phala-serde-more/Cargo.toml | 2 +- crates/phala-trie-storage/Cargo.toml | 11 +- crates/phala-trie-storage/src/lib.rs | 4 - crates/phala-trie-storage/src/memdb.rs | 499 +++++-------- crates/phala-trie-storage/src/ser.rs | 1 - crates/phala-types/Cargo.toml | 2 +- crates/phaxt/Cargo.toml | 4 +- crates/phaxt/src/lib.rs | 2 +- crates/pink-libs/subrpc/Cargo.toml | 2 +- crates/pink/Cargo.toml | 31 +- crates/pink/src/runtime.rs | 6 +- pallets/offchain-rollup/Cargo.toml | 22 +- pallets/offchain-rollup/src/anchor.rs | 2 + pallets/offchain-rollup/src/oracle.rs | 1 + pallets/phala/Cargo.toml | 40 +- pallets/phala/mq-runtime-api/Cargo.toml | 2 +- pallets/phala/src/compute/base_pool.rs | 6 + pallets/phala/src/compute/computation.rs | 7 + pallets/phala/src/compute/stake_pool_v2.rs | 18 + pallets/phala/src/compute/vault.rs | 7 + pallets/phala/src/compute/wrapped_balances.rs | 5 + pallets/phala/src/fat.rs | 7 + pallets/phala/src/fat_tokenomic.rs | 1 + pallets/phala/src/mq.rs | 3 + pallets/phala/src/ott.rs | 1 + pallets/phala/src/registry.rs | 15 + scripts/debug-cli/Cargo.toml | 8 +- standalone/executor/Cargo.toml | 46 +- standalone/node/Cargo.toml | 128 ++-- standalone/node/src/command.rs | 10 +- standalone/pherry/Cargo.toml | 14 +- standalone/prouter/Cargo.lock | 400 +++++------ standalone/pruntime/Cargo.lock | 320 +++------ standalone/pruntime/Cargo.toml | 4 +- standalone/replay/Cargo.toml | 2 +- standalone/rpc/Cargo.toml | 44 +- standalone/runtime/Cargo.toml | 151 ++-- standalone/runtime/src/lib.rs | 21 +- subxt | 2 +- 47 files changed, 1140 insertions(+), 1439 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 555e979a45..da1f2a0e5d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -761,7 +761,7 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "sp-api", "sp-beefy", @@ -2751,33 +2751,6 @@ dependencies = [ "libc", ] -[[package]] -name = "ethbloom" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60" -dependencies = [ - "crunchy", - "fixed-hash", - "impl-rlp", - "impl-serde 0.4.0", - "tiny-keccak", -] - -[[package]] -name = "ethereum-types" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81224dc661606574f5a0f28c9947d0ee1d93ff11c5f1c4e7272f52e8c0b5483c" -dependencies = [ - "ethbloom", - "fixed-hash", - "impl-rlp", - "impl-serde 0.4.0", - "primitive-types", - "uint", -] - [[package]] name = "event-listener" version = "2.5.2" @@ -3011,7 +2984,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", ] @@ -3035,7 +3008,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -3058,7 +3031,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "Inflector", "array-bytes", @@ -3110,7 +3083,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.47", @@ -3121,7 +3094,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -3129,6 +3102,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-arithmetic", + "sp-core", "sp-npos-elections", "sp-runtime", "sp-std", @@ -3137,7 +3111,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -3166,9 +3140,10 @@ dependencies = [ [[package]] name = "frame-remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "env_logger", + "futures", "log", "parity-scale-codec", "serde", @@ -3178,12 +3153,13 @@ dependencies = [ "sp-runtime", "sp-version", "substrate-rpc-client", + "tokio", ] [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "bitflags", "frame-metadata", @@ -3215,7 +3191,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "Inflector", "cfg-expr", @@ -3229,7 +3205,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -3241,7 +3217,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.20", @@ -3251,7 +3227,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-support-test-pallet", @@ -3274,7 +3250,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -3285,7 +3261,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "log", @@ -3303,7 +3279,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -3318,7 +3294,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "sp-api", @@ -3327,7 +3303,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "parity-scale-codec", @@ -3568,8 +3544,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] @@ -3923,6 +3901,12 @@ dependencies = [ "rustls 0.18.1", ] +[[package]] +name = "http-range-header" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" + [[package]] name = "http-types" version = "2.12.0" @@ -4006,6 +3990,7 @@ dependencies = [ "rustls-native-certs", "tokio", "tokio-rustls 0.23.4", + "webpki-roots 0.22.4", ] [[package]] @@ -4127,15 +4112,6 @@ dependencies = [ "parity-scale-codec", ] -[[package]] -name = "impl-rlp" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" -dependencies = [ - "rlp", -] - [[package]] name = "impl-serde" version = "0.3.2" @@ -4510,25 +4486,25 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd0d559d5e679b1ab2f869b486a11182923863b1b3ee8b421763cdd707b783a" +checksum = "7d291e3a5818a2384645fd9756362e6d89cf0541b0b916fa7702ea4a9833608e" dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core", - "jsonrpsee-http-server", + "jsonrpsee-http-client", "jsonrpsee-proc-macros", + "jsonrpsee-server", "jsonrpsee-types", "jsonrpsee-ws-client", - "jsonrpsee-ws-server", "tracing", ] [[package]] name = "jsonrpsee-client-transport" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8752740ecd374bcbf8b69f3e80b0327942df76f793f8d4e60d3355650c31fb74" +checksum = "965de52763f2004bc91ac5bcec504192440f0b568a5d621c59d9dbd6f886c3fb" dependencies = [ "futures-util", "http", @@ -4547,9 +4523,9 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3dc3e9cf2ba50b7b1d7d76a667619f82846caa39e8e8daa8a4962d74acaddca" +checksum = "a4e70b4439a751a5de7dd5ed55eacff78ebf4ffe0fc009cb1ebb11417f5b536b" dependencies = [ "anyhow", "arrayvec 0.7.2", @@ -4560,10 +4536,8 @@ dependencies = [ "futures-timer", "futures-util", "globset", - "http", "hyper", "jsonrpsee-types", - "lazy_static", "parking_lot 0.12.1", "rand 0.8.5", "rustc-hash", @@ -4573,45 +4547,67 @@ dependencies = [ "thiserror", "tokio", "tracing", - "tracing-futures", - "unicase", ] [[package]] -name = "jsonrpsee-http-server" -version = "0.15.1" +name = "jsonrpsee-http-client" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03802f0373a38c2420c70b5144742d800b509e2937edc4afb116434f07120117" +checksum = "cc345b0a43c6bc49b947ebeb936e886a419ee3d894421790c969cc56040542ad" dependencies = [ - "futures-channel", - "futures-util", + "async-trait", "hyper", + "hyper-rustls", "jsonrpsee-core", "jsonrpsee-types", + "rustc-hash", "serde", "serde_json", + "thiserror", "tokio", "tracing", - "tracing-futures", ] [[package]] name = "jsonrpsee-proc-macros" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd67957d4280217247588ac86614ead007b301ca2fa9f19c19f880a536f029e3" +checksum = "baa6da1e4199c10d7b1d0a6e5e8bd8e55f351163b6f4b3cbb044672a69bd4c1c" dependencies = [ + "heck 0.4.0", "proc-macro-crate", "proc-macro2 1.0.47", "quote 1.0.20", "syn 1.0.98", ] +[[package]] +name = "jsonrpsee-server" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fb69dad85df79527c019659a992498d03f8495390496da2f07e6c24c2b356fc" +dependencies = [ + "futures-channel", + "futures-util", + "http", + "hyper", + "jsonrpsee-core", + "jsonrpsee-types", + "serde", + "serde_json", + "soketto 0.7.1", + "tokio", + "tokio-stream", + "tokio-util 0.7.4", + "tower", + "tracing", +] + [[package]] name = "jsonrpsee-types" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e290bba767401b646812f608c099b922d8142603c9e73a50fb192d3ac86f4a0d" +checksum = "5bd522fe1ce3702fd94812965d7bb7a3364b1c9aba743944c5a00529aae80f8c" dependencies = [ "anyhow", "beef", @@ -4623,9 +4619,9 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ee5feddd5188e62ac08fcf0e56478138e581509d4730f3f7be9b57dd402a4ff" +checksum = "0b83daeecfc6517cfe210df24e570fb06213533dfb990318fae781f4c7119dd9" dependencies = [ "http", "jsonrpsee-client-transport", @@ -4633,26 +4629,6 @@ dependencies = [ "jsonrpsee-types", ] -[[package]] -name = "jsonrpsee-ws-server" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d488ba74fb369e5ab68926feb75a483458b88e768d44319f37e4ecad283c7325" -dependencies = [ - "futures-channel", - "futures-util", - "http", - "jsonrpsee-core", - "jsonrpsee-types", - "serde_json", - "soketto 0.7.1", - "tokio", - "tokio-stream", - "tokio-util 0.7.4", - "tracing", - "tracing-futures", -] - [[package]] name = "justification-validate" version = "0.1.0" @@ -4709,35 +4685,31 @@ dependencies = [ [[package]] name = "kvdb" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585089ceadba0197ffe9af6740ab350b325e3c1f5fccfbc3522e0250c750409b" +checksum = "e7d770dcb02bf6835887c3a979b5107a04ff4bbde97a5f0928d27404a155add9" dependencies = [ - "parity-util-mem", "smallvec", ] [[package]] name = "kvdb-memorydb" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40d109c87bfb7759edd2a49b2649c1afe25af785d930ad6a38479b4dc70dd873" +checksum = "bf7a85fe66f9ff9cd74e169fdd2c94c6e1e74c412c99a73b4df3200b5d3760b2" dependencies = [ "kvdb", - "parity-util-mem", "parking_lot 0.12.1", ] [[package]] name = "kvdb-rocksdb" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c076cc2cdbac89b9910c853a36c957d3862a779f31c2661174222cefb49ee597" +checksum = "2182b8219fee6bd83aacaab7344e840179ae079d5216aa4e249b4d704646a844" dependencies = [ "kvdb", - "log", "num_cpus", - "parity-util-mem", "parking_lot 0.12.1", "regex", "rocksdb", @@ -5471,13 +5443,12 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ac11bb793c28fa095b7554466f53b3a60a2cd002afdac01bcf135cbd73a269" +checksum = "5e0c7cba9ce19ac7ffd2053ac9f49843bbd3f4318feedfd74e85c19d5fb0ba66" dependencies = [ "hash-db", "hashbrown 0.12.3", - "parity-util-mem", ] [[package]] @@ -5860,7 +5831,7 @@ dependencies = [ [[package]] name = "node-inspect" version = "0.9.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "clap 4.0.22", "parity-scale-codec", @@ -5877,7 +5848,7 @@ dependencies = [ [[package]] name = "node-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-system", "parity-scale-codec", @@ -6179,13 +6150,14 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", "scale-info", + "sp-core", "sp-runtime", "sp-std", ] @@ -6193,7 +6165,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -6209,7 +6181,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -6224,7 +6196,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -6248,7 +6220,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6268,7 +6240,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -6283,7 +6255,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -6301,7 +6273,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -6320,7 +6292,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -6337,7 +6309,7 @@ dependencies = [ [[package]] name = "pallet-contracts" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "bitflags", "frame-benchmarking", @@ -6365,7 +6337,7 @@ dependencies = [ [[package]] name = "pallet-contracts-primitives" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "bitflags", "parity-scale-codec", @@ -6377,7 +6349,7 @@ dependencies = [ [[package]] name = "pallet-contracts-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.20", @@ -6387,7 +6359,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -6405,7 +6377,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6429,7 +6401,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6442,7 +6414,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -6460,7 +6432,7 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6478,7 +6450,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -6501,7 +6473,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "enumflags2", "frame-benchmarking", @@ -6517,7 +6489,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -6537,7 +6509,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -6554,7 +6526,7 @@ dependencies = [ [[package]] name = "pallet-lottery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -6568,7 +6540,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -6593,7 +6565,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -6609,7 +6581,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -6626,7 +6598,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6646,7 +6618,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "sp-api", @@ -6656,7 +6628,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -6673,7 +6645,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6696,7 +6668,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -6713,7 +6685,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -6728,7 +6700,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -6742,7 +6714,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -6757,7 +6729,7 @@ dependencies = [ [[package]] name = "pallet-rmrk-core" version = "0.0.1" -source = "git+https://github.com/Phala-Network/rmrk-substrate?branch=polkadot-v0.9.34#0a9216d4314c78e822854d558835bbce6ffd781f" +source = "git+https://github.com/Phala-Network/rmrk-substrate?branch=polkadot-v0.9.36#b1badc2422193b239b42a328e72c03c7eb6a097d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6775,7 +6747,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -6786,12 +6758,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", + "sp-weights", ] [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -6812,7 +6785,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -6828,7 +6801,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -6842,7 +6815,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6865,7 +6838,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.47", @@ -6876,7 +6849,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -6890,7 +6863,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -6908,7 +6881,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -6927,7 +6900,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -6943,7 +6916,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -6959,7 +6932,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -6971,7 +6944,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -6988,7 +6961,7 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -7003,7 +6976,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -7019,7 +6992,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -7083,35 +7056,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" -[[package]] -name = "parity-util-mem" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d32c34f4f5ca7f9196001c0aba5a1f9a5a12382c8944b8b0f90233282d1e8f8" -dependencies = [ - "cfg-if", - "ethereum-types", - "hashbrown 0.12.3", - "impl-trait-for-tuples", - "lru", - "parity-util-mem-derive", - "parking_lot 0.12.1", - "primitive-types", - "smallvec", - "winapi", -] - -[[package]] -name = "parity-util-mem-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" -dependencies = [ - "proc-macro2 1.0.47", - "syn 1.0.98", - "synstructure", -] - [[package]] name = "parity-wasm" version = "0.45.0" @@ -7521,6 +7465,7 @@ dependencies = [ "sp-core", "sp-finality-grandpa", "sp-inherents", + "sp-io", "sp-keyring", "sp-keystore", "sp-runtime", @@ -7529,7 +7474,6 @@ dependencies = [ "sp-tracing", "sp-transaction-pool", "sp-transaction-storage-proof", - "sp-trie", "substrate-build-script-utils", "substrate-frame-cli", "substrate-rpc-client", @@ -7651,7 +7595,6 @@ dependencies = [ "sp-io", "sp-offchain", "sp-runtime", - "sp-sandbox", "sp-session", "sp-staking", "sp-std", @@ -7744,7 +7687,6 @@ dependencies = [ "impl-serde 0.4.0", "keccak-hasher", "parity-scale-codec", - "parity-util-mem", "scale-info", "serde", "serde_json", @@ -7962,7 +7904,6 @@ dependencies = [ "sp-externalities", "sp-io", "sp-runtime", - "sp-sandbox", "sp-state-machine", "sp-std", "sp-trie", @@ -8249,7 +8190,6 @@ checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66" dependencies = [ "fixed-hash", "impl-codec", - "impl-rlp", "impl-serde 0.4.0", "scale-info", "uint", @@ -9043,16 +8983,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc874b127765f014d792f16763a81245ab80500e2ad921ed4ee9e82481ee08fe" -[[package]] -name = "rlp" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "999508abb0ae792aabed2460c45b89106d97fe4adac593bdaef433c2605847b5" -dependencies = [ - "bytes 1.1.0", - "rustc-hex", -] - [[package]] name = "rmp" version = "0.8.11" @@ -9078,7 +9008,7 @@ dependencies = [ [[package]] name = "rmrk-traits" version = "0.0.1" -source = "git+https://github.com/Phala-Network/rmrk-substrate?branch=polkadot-v0.9.34#0a9216d4314c78e822854d558835bbce6ffd781f" +source = "git+https://github.com/Phala-Network/rmrk-substrate?branch=polkadot-v0.9.36#b1badc2422193b239b42a328e72c03c7eb6a097d" dependencies = [ "frame-benchmarking", "frame-support", @@ -9395,7 +9325,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "log", "sp-core", @@ -9406,7 +9336,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "futures", @@ -9433,7 +9363,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "futures", "futures-timer", @@ -9456,7 +9386,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -9472,7 +9402,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "impl-trait-for-tuples", "memmap2", @@ -9489,7 +9419,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.47", @@ -9500,7 +9430,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "array-bytes", "chrono", @@ -9540,7 +9470,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "fnv", "futures", @@ -9568,7 +9498,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "hash-db", "kvdb", @@ -9593,13 +9523,14 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "futures", "futures-timer", "libp2p", "log", + "mockall", "parking_lot 0.12.1", "sc-client-api", "sc-utils", @@ -9617,7 +9548,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "fork-tree", @@ -9658,7 +9589,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "futures", "jsonrpsee", @@ -9680,7 +9611,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "fork-tree", "parity-scale-codec", @@ -9693,7 +9624,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "futures", @@ -9717,7 +9648,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "sc-client-api", "sp-authorship", @@ -9728,9 +9659,8 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "lazy_static", "lru", "parity-scale-codec", "parking_lot 0.12.1", @@ -9739,7 +9669,6 @@ dependencies = [ "sc-executor-wasmtime", "sp-api", "sp-core", - "sp-core-hashing-proc-macro", "sp-externalities", "sp-io", "sp-panic-handler", @@ -9754,13 +9683,10 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "environmental", - "parity-scale-codec", "sc-allocator", "sp-maybe-compressed-blob", - "sp-sandbox", "sp-wasm-interface", "thiserror", "wasm-instrument 0.3.0", @@ -9770,14 +9696,12 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "log", - "parity-scale-codec", "sc-allocator", "sc-executor-common", "sp-runtime-interface", - "sp-sandbox", "sp-wasm-interface", "wasmi 0.13.2", ] @@ -9785,19 +9709,16 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "cfg-if", "libc", "log", "once_cell", - "parity-scale-codec", - "parity-wasm", "rustix", "sc-allocator", "sc-executor-common", "sp-runtime-interface", - "sp-sandbox", "sp-wasm-interface", "wasmtime", ] @@ -9805,7 +9726,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "ahash", "array-bytes", @@ -9846,7 +9767,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "finality-grandpa", "futures", @@ -9867,13 +9788,12 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "ansi_term", "futures", "futures-timer", "log", - "parity-util-mem", "sc-client-api", "sc-network-common", "sc-transaction-pool-api", @@ -9884,7 +9804,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "array-bytes", "async-trait", @@ -9899,7 +9819,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "array-bytes", "async-trait", @@ -9946,7 +9866,7 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "cid", "futures", @@ -9966,7 +9886,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "bitflags", @@ -9992,7 +9912,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "ahash", "futures", @@ -10010,7 +9930,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "array-bytes", "futures", @@ -10031,7 +9951,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "array-bytes", "async-trait", @@ -10056,13 +9976,14 @@ dependencies = [ "sp-core", "sp-finality-grandpa", "sp-runtime", + "substrate-prometheus-endpoint", "thiserror", ] [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "array-bytes", "futures", @@ -10081,7 +10002,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "array-bytes", "bytes 1.1.0", @@ -10111,7 +10032,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "futures", "libp2p", @@ -10124,7 +10045,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -10133,7 +10054,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "futures", "hash-db", @@ -10163,7 +10084,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "futures", "jsonrpsee", @@ -10186,20 +10107,23 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "futures", + "http", "jsonrpsee", "log", "serde_json", "substrate-prometheus-endpoint", "tokio", + "tower", + "tower-http", ] [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "futures", "hex", @@ -10218,7 +10142,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "directories", @@ -10229,7 +10153,6 @@ dependencies = [ "jsonrpsee", "log", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.12.1", "pin-project", "rand 0.7.3", @@ -10289,7 +10212,7 @@ dependencies = [ [[package]] name = "sc-service-test" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "array-bytes", "fdlimit", @@ -10327,12 +10250,10 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "log", "parity-scale-codec", - "parity-util-mem", - "parity-util-mem-derive", "parking_lot 0.12.1", "sc-client-api", "sp-core", @@ -10341,7 +10262,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -10360,7 +10281,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "futures", "libc", @@ -10379,7 +10300,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "chrono", "futures", @@ -10397,7 +10318,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "ansi_term", "atty", @@ -10428,7 +10349,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.47", @@ -10439,7 +10360,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "futures", @@ -10447,7 +10368,6 @@ dependencies = [ "linked-hash-map", "log", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.12.1", "sc-client-api", "sc-transaction-pool-api", @@ -10466,7 +10386,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "futures", @@ -10480,7 +10400,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "futures", "futures-timer", @@ -11225,6 +11145,7 @@ dependencies = [ "bytes 1.1.0", "flate2", "futures", + "http", "httparse", "log", "rand 0.8.5", @@ -11234,7 +11155,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "hash-db", "log", @@ -11252,7 +11173,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "blake2", "proc-macro-crate", @@ -11264,7 +11185,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", @@ -11277,7 +11198,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "integer-sqrt", "num-traits", @@ -11292,7 +11213,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", @@ -11305,7 +11226,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "parity-scale-codec", @@ -11317,7 +11238,7 @@ dependencies = [ [[package]] name = "sp-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", @@ -11334,7 +11255,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "sp-api", @@ -11346,7 +11267,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "futures", "log", @@ -11364,7 +11285,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "futures", @@ -11383,7 +11304,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "parity-scale-codec", @@ -11401,7 +11322,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "merlin", @@ -11424,7 +11345,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", @@ -11438,7 +11359,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", @@ -11451,7 +11372,7 @@ dependencies = [ [[package]] name = "sp-core" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "array-bytes", "base58", @@ -11496,7 +11417,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "blake2", "byteorder", @@ -11510,7 +11431,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.20", @@ -11521,7 +11442,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -11530,7 +11451,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.20", @@ -11540,7 +11461,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "environmental", "parity-scale-codec", @@ -11551,7 +11472,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "finality-grandpa", "log", @@ -11569,7 +11490,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -11583,7 +11504,7 @@ dependencies = [ [[package]] name = "sp-io" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "bytes 1.1.0", "ed25519-dalek", @@ -11610,7 +11531,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "lazy_static", "sp-core", @@ -11621,7 +11542,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "futures", @@ -11638,7 +11559,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "thiserror", "zstd", @@ -11647,7 +11568,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "ckb-merkle-mountain-range", "log", @@ -11665,7 +11586,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", @@ -11679,7 +11600,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "sp-api", "sp-core", @@ -11689,7 +11610,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "backtrace", "lazy_static", @@ -11699,7 +11620,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "rustc-hash", "serde", @@ -11709,14 +11630,13 @@ dependencies = [ [[package]] name = "sp-runtime" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "either", "hash256-std-hasher", "impl-trait-for-tuples", "log", "parity-scale-codec", - "parity-util-mem", "paste", "rand 0.7.3", "scale-info", @@ -11732,7 +11652,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "bytes 1.1.0", "impl-trait-for-tuples", @@ -11750,7 +11670,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "Inflector", "proc-macro-crate", @@ -11759,24 +11679,10 @@ dependencies = [ "syn 1.0.98", ] -[[package]] -name = "sp-sandbox" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "log", - "parity-scale-codec", - "sp-core", - "sp-io", - "sp-std", - "sp-wasm-interface", - "wasmi 0.13.2", -] - [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", @@ -11790,10 +11696,11 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", + "sp-core", "sp-runtime", "sp-std", ] @@ -11801,7 +11708,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "hash-db", "log", @@ -11823,12 +11730,12 @@ dependencies = [ [[package]] name = "sp-std" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" [[package]] name = "sp-storage" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "impl-serde 0.4.0", "parity-scale-codec", @@ -11841,7 +11748,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "futures-timer", @@ -11857,7 +11764,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "sp-std", @@ -11869,7 +11776,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "sp-api", "sp-runtime", @@ -11878,7 +11785,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "log", @@ -11894,7 +11801,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "ahash", "hash-db", @@ -11917,7 +11824,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "impl-serde 0.4.0", "parity-scale-codec", @@ -11934,7 +11841,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "proc-macro2 1.0.47", @@ -11945,7 +11852,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "impl-trait-for-tuples", "log", @@ -11958,7 +11865,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -12297,7 +12204,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "platforms", ] @@ -12305,7 +12212,7 @@ dependencies = [ [[package]] name = "substrate-frame-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "clap 4.0.22", "frame-support", @@ -12318,7 +12225,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -12339,7 +12246,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "futures-util", "hyper", @@ -12352,7 +12259,7 @@ dependencies = [ [[package]] name = "substrate-rpc-client" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "jsonrpsee", @@ -12365,7 +12272,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "array-bytes", "async-trait", @@ -12391,7 +12298,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "beefy-merkle-tree", "cfg-if", @@ -12403,7 +12310,6 @@ dependencies = [ "pallet-babe", "pallet-timestamp", "parity-scale-codec", - "parity-util-mem", "sc-service", "scale-info", "serde", @@ -12435,7 +12341,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime-client" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "futures", "parity-scale-codec", @@ -12454,7 +12360,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "ansi_term", "build-helper", @@ -12476,22 +12382,28 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "subxt" -version = "0.24.0" +version = "0.25.0" dependencies = [ - "bitvec", + "base58", + "blake2", "derivative", "frame-metadata", "futures", + "getrandom 0.2.7", "hex", + "impl-serde 0.4.0", "jsonrpsee", "parity-scale-codec", "parking_lot 0.12.1", + "primitive-types", + "scale-bits", "scale-decode", "scale-info", "scale-value", "serde", "serde_json", "sp-core", + "sp-core-hashing", "sp-runtime", "subxt-macro", "subxt-metadata", @@ -12501,11 +12413,13 @@ dependencies = [ [[package]] name = "subxt-codegen" -version = "0.24.0" +version = "0.25.0" dependencies = [ "darling 0.14.1", "frame-metadata", "heck 0.4.0", + "hex", + "jsonrpsee", "parity-scale-codec", "proc-macro-error", "proc-macro2 1.0.47", @@ -12513,11 +12427,12 @@ dependencies = [ "scale-info", "subxt-metadata", "syn 1.0.98", + "tokio", ] [[package]] name = "subxt-macro" -version = "0.24.0" +version = "0.25.0" dependencies = [ "darling 0.14.1", "proc-macro-error", @@ -12527,12 +12442,12 @@ dependencies = [ [[package]] name = "subxt-metadata" -version = "0.24.0" +version = "0.25.0" dependencies = [ "frame-metadata", "parity-scale-codec", "scale-info", - "sp-core", + "sp-core-hashing", ] [[package]] @@ -13020,6 +12935,41 @@ dependencies = [ "serde", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" +dependencies = [ + "bitflags", + "bytes 1.1.0", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite 0.2.9", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -13208,11 +13158,12 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "clap 4.0.22", "frame-remote-externalities", "frame-try-runtime", + "hex", "log", "parity-scale-codec", "sc-chain-spec", @@ -13220,10 +13171,13 @@ dependencies = [ "sc-executor", "sc-service", "serde", + "sp-api", "sp-core", + "sp-debug-derive", "sp-externalities", "sp-io", "sp-keystore", + "sp-rpc", "sp-runtime", "sp-state-machine", "sp-version", @@ -13262,7 +13216,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.3", - "rand 0.8.5", + "rand 0.4.6", "static_assertions", ] @@ -14624,8 +14578,8 @@ dependencies = [ [[package]] name = "xcm" -version = "0.9.34" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.34#6b7a7bd1e306064de663076ddb25d02e371a4970" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "derivative", "impl-trait-for-tuples", @@ -14638,8 +14592,8 @@ dependencies = [ [[package]] name = "xcm-procedural" -version = "0.9.34" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.34#6b7a7bd1e306064de663076ddb25d02e371a4970" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "Inflector", "proc-macro2 1.0.47", diff --git a/Cargo.toml b/Cargo.toml index 71d9900c48..22b7be645c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -93,10 +93,10 @@ rocket = { version = "0.5.0-rc.2", git = "https://github.com/SergioBenitez/Rocke # TODO.kevin: Move back to crates.io once it released 1.0 derive_more = { version = "0.99.17", git = "https://github.com/JelteF/derive_more" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-core-hashing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core-hashing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } # For pink-extension-runtime, it will introduce Substrate from crates-io which usually different with polkadot-branch pink-extension = { path = "crates/pink/pink-extension" } diff --git a/crates/phactory/Cargo.toml b/crates/phactory/Cargo.toml index 8046306d39..88bc8a3778 100644 --- a/crates/phactory/Cargo.toml +++ b/crates/phactory/Cargo.toml @@ -34,11 +34,11 @@ phala-crypto = { path = "../phala-crypto", features = ["getrandom", "stream"] } prpc = { path = "../prpc" } pink = { path = "../pink" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", features = ["disable_panic_handler", "disable_oom", "disable_allocator"] } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", features = ["disable_target_static_assertions"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", features = ["disable_panic_handler", "disable_oom", "disable_allocator"] } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", features = ["disable_target_static_assertions"] } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } parity-scale-codec = { package = "parity-scale-codec", version = "3.1", default-features = false, features = ["derive", "full", "chain-error"] } scopeguard = { version = "1.1", default-features = false } @@ -54,11 +54,11 @@ derive_more = "0.99.0" hash-db = { version = "0.15.2", default-features = false } num = { package = "num-traits", version = "0.2", default-features = false } finality-grandpa = { version = "0.16.1", default-features = false, features = ["derive-codec"] } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } fixed = "1.9.0" fixed-sqrt = "0.2.4" diff --git a/crates/phactory/api/Cargo.toml b/crates/phactory/api/Cargo.toml index 7d2012cd4c..b4168bbf47 100644 --- a/crates/phactory/api/Cargo.toml +++ b/crates/phactory/api/Cargo.toml @@ -19,11 +19,11 @@ phala-crypto = { path = "../../../crates/phala-crypto" } phala-mq = { path = "../../../crates/phala-mq" } chain = { path = "../../../standalone/runtime", default-features = false, package = "phala-node-runtime" } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false, features = ["full_crypto"] } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false, features = ["full_crypto"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false, features = ["full_crypto"] } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false, features = ["full_crypto"] } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } # for pruntime_client async-trait = "0.1.57" diff --git a/crates/phactory/src/contracts/pink.rs b/crates/phactory/src/contracts/pink.rs index 0772dddd7a..f1eb590db9 100644 --- a/crates/phactory/src/contracts/pink.rs +++ b/crates/phactory/src/contracts/pink.rs @@ -8,7 +8,7 @@ use phala_mq::{ContractClusterId, ContractId, MessageOrigin}; use phala_types::contract::ConvertTo; use pink::runtime::{BoxedEventCallbacks, ExecSideEffects}; use pink::types::Weight; -use pink::weights::constants::WEIGHT_PER_SECOND; +use pink::weights::constants::WEIGHT_REF_TIME_PER_SECOND; use runtime::{AccountId, BlockNumber, Hash}; use sidevm::service::{Command as SidevmCommand, CommandSender, SystemMessage}; @@ -131,7 +131,7 @@ impl Pink { block_number: context.block_number, storage, transfer, - gas_limit: WEIGHT_PER_SECOND * 10, + gas_limit: WEIGHT_REF_TIME_PER_SECOND * 10, gas_free: true, storage_deposit_limit: None, callbacks: ContractEventCallback::from_log_sender( diff --git a/crates/phala-crypto/Cargo.toml b/crates/phala-crypto/Cargo.toml index e8aaf55055..e99023ccb6 100644 --- a/crates/phala-crypto/Cargo.toml +++ b/crates/phala-crypto/Cargo.toml @@ -5,8 +5,8 @@ edition = "2018" resolver = "2" [dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } ring = { version = "0.16.20", default-features = false, features = ["alloc"] } curve25519-dalek = { version = "2.0", default-features = false } diff --git a/crates/phala-mq/Cargo.toml b/crates/phala-mq/Cargo.toml index 2dfdc686b2..ace6fa0e5a 100644 --- a/crates/phala-mq/Cargo.toml +++ b/crates/phala-mq/Cargo.toml @@ -11,7 +11,7 @@ hex = { version = "0.4.3", default-features = false, features = ['alloc'] } derive_more = { version = "0.99", default-features = false, features = ["display"] } parity-scale-codec = { version = "3.0", default-features = false, features = ["derive"] } scale-info = { version = "2.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } serde = { version = "1.0", default-features = false, features = ["derive"] } spin = { version = "0.9", default-features = false, features = ["mutex", "use_ticket_mutex"], optional = true } diff --git a/crates/phala-node-rpc-ext/Cargo.toml b/crates/phala-node-rpc-ext/Cargo.toml index bead3ffd34..b0afd1969b 100644 --- a/crates/phala-node-rpc-ext/Cargo.toml +++ b/crates/phala-node-rpc-ext/Cargo.toml @@ -11,7 +11,7 @@ repository = "https://github.com/Phala-Network/phala-blockchain" # third-party dependencies serde = { version = "1.0.102", features = ["derive"] } thiserror = "1.0" -jsonrpsee = { version = "0.15.1", features = ["server"] } +jsonrpsee = { version = "0.16.2", features = ["server"] } impl-serde = "0.4.0" log = { version = "0.4.14", default-features = false } hex = { version = "0.4.3", default-features = false } @@ -19,14 +19,14 @@ codec = { package = "parity-scale-codec", version = "3.1" } scale-info = { version = "2.1", default-features = false } # primitives -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } # client dependencies -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } phala-mq = { path = "../../crates/phala-mq" } phala-pallets = { path = "../../pallets/phala" } diff --git a/crates/phala-serde-more/Cargo.toml b/crates/phala-serde-more/Cargo.toml index 3b9a0814e4..2e5f03f29a 100644 --- a/crates/phala-serde-more/Cargo.toml +++ b/crates/phala-serde-more/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] serde = { version = "1.0.130", default-features = false, features = ["derive", "alloc"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } scale = { package = "parity-scale-codec", version = "3.1", default-features = false } hex = { version = "0.4.3", default-features = false, features = ["alloc"] } diff --git a/crates/phala-trie-storage/Cargo.toml b/crates/phala-trie-storage/Cargo.toml index 04ae3e4f06..989ce5d379 100644 --- a/crates/phala-trie-storage/Cargo.toml +++ b/crates/phala-trie-storage/Cargo.toml @@ -10,19 +10,18 @@ repository = "https://github.com/Phala-Network/phala-blockchain" [dependencies] parity-scale-codec = { version = "3.0", default-features = false } scale-info = { version = "2.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", features = ["full_crypto"] } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", features = ["full_crypto"] } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } serde = { version = "1.0", default-features = false, features = ["derive", "alloc"], optional = true } hash-db = "0.15.2" trie-db = "0.24.0" im = { version = "15", features = ["serde"] } -parity-util-mem = "0.12.0" [dev-dependencies] -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", features = ["full_crypto"] } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", features = ["full_crypto"] } hash256-std-hasher = { version = "0.15", default-features = false } hex = "0.4" serde_json = "1.0" diff --git a/crates/phala-trie-storage/src/lib.rs b/crates/phala-trie-storage/src/lib.rs index 856ca7271d..42b3f0af3d 100644 --- a/crates/phala-trie-storage/src/lib.rs +++ b/crates/phala-trie-storage/src/lib.rs @@ -1,5 +1,3 @@ -extern crate alloc; - #[cfg(feature = "serde")] pub mod ser; @@ -10,8 +8,6 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer}; use core::iter::FromIterator; -use alloc::vec::Vec; - use parity_scale_codec::Codec; use sp_core::storage::ChildInfo; use sp_core::Hasher; diff --git a/crates/phala-trie-storage/src/memdb.rs b/crates/phala-trie-storage/src/memdb.rs index 8068865383..d9fad75f7b 100644 --- a/crates/phala-trie-storage/src/memdb.rs +++ b/crates/phala-trie-storage/src/memdb.rs @@ -1,10 +1,27 @@ +// Copyright 2017-2020 Parity Technologies +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + //! Reference-counted memory-based `HashDB` implementation. + use hash_db::{ AsHashDB, AsPlainDB, HashDB, HashDBRef, Hasher as KeyHasher, PlainDB, PlainDBRef, Prefix, }; use im::{hashmap::Entry, HashMap}; -use parity_util_mem::{malloc_size, MallocSizeOf, MallocSizeOfOps}; -use std::{borrow::Borrow, cmp::Eq, hash, marker::PhantomData, mem}; +use std::{ + borrow::Borrow, cmp::Eq, hash, + marker::PhantomData, mem, +}; use sp_state_machine::{backend::Consolidate, DefaultError, TrieBackendStorage}; use trie_db::DBValue; @@ -12,39 +29,88 @@ use trie_db::DBValue; pub trait MaybeDebug: std::fmt::Debug {} impl MaybeDebug for T {} -pub type DefaultMemTracker = MemCounter; +pub type GenericMemoryDB = MemoryDB, trie_db::DBValue>; + +impl Consolidate for GenericMemoryDB { + fn consolidate(&mut self, other: Self) { + MemoryDB::consolidate(self, other) + } +} + +impl TrieBackendStorage for GenericMemoryDB { + type Overlay = Self; + + fn get( + &self, + key: &::Out, + prefix: Prefix, + ) -> Result, DefaultError> { + Ok(hash_db::HashDB::get(self, key, prefix)) + } +} -pub struct MemoryDB> -where - H: KeyHasher, - KF: KeyFunction, - M: MemTracker, +/// Reference-counted memory-based `HashDB` implementation. +/// +/// Use `new()` to create a new database. Insert items with `insert()`, remove items +/// with `remove()`, check for existence with `contains()` and lookup a hash to derive +/// the data with `get()`. Clear with `clear()` and purge the portions of the data +/// that have no references with `purge()`. +/// +pub struct MemoryDB + where + H: KeyHasher, + KF: KeyFunction, { data: HashMap, - malloc_tracker: M, hashed_null_node: H::Out, null_node_data: T, _kf: PhantomData, } -impl Clone for MemoryDB -where - H: KeyHasher, - KF: KeyFunction, - T: Clone, - M: MemTracker + Copy, +impl Clone for MemoryDB + where + H: KeyHasher, + KF: KeyFunction, + T: Clone, { fn clone(&self) -> Self { Self { data: self.data.clone(), hashed_null_node: self.hashed_null_node, null_node_data: self.null_node_data.clone(), - malloc_tracker: self.malloc_tracker, _kf: Default::default(), } } } +impl PartialEq> for MemoryDB + where + H: KeyHasher, + KF: KeyFunction, + >::Key: Eq + MaybeDebug, + T: Eq + MaybeDebug, +{ + fn eq(&self, other: &MemoryDB) -> bool { + for a in self.data.iter() { + match other.data.get(&a.0) { + Some(v) if v != a.1 => return false, + None => return false, + _ => (), + } + } + true + } +} + +impl Eq for MemoryDB + where + H: KeyHasher, + KF: KeyFunction, + >::Key: Eq + MaybeDebug, + T: Eq + MaybeDebug, +{ +} + pub trait KeyFunction { type Key: Send + Sync + Clone + hash::Hash + Eq; @@ -113,12 +179,11 @@ pub fn prefixed_key(key: &H::Out, prefix: Prefix) -> Vec { prefixed_key } -impl Default for MemoryDB -where - H: KeyHasher, - T: for<'a> From<&'a [u8]> + Clone, - KF: KeyFunction, - M: MemTracker + Default, +impl Default for MemoryDB + where + H: KeyHasher, + T: for<'a> From<&'a [u8]> + Clone, + KF: KeyFunction, { fn default() -> Self { Self::from_null_node(&[0u8][..], [0u8][..].into()) @@ -126,53 +191,50 @@ where } /// Create a new `MemoryDB` from a given null key/data -impl MemoryDB -where - H: KeyHasher, - T: Default + Clone, - KF: KeyFunction, - M: MemTracker, +impl MemoryDB + where + H: KeyHasher, + T: Default + Clone, + KF: KeyFunction, { /// Remove an element and delete it from storage if reference count reaches zero. /// If the value was purged, return the old value. pub fn remove_and_purge(&mut self, key: &::Out, prefix: Prefix) -> Option { if key == &self.hashed_null_node { - return None; + return None } let key = KF::key(key, prefix); match self.data.entry(key) { - Entry::Occupied(mut entry) => { + Entry::Occupied(mut entry) => if entry.get().1 == 1 { let (value, _) = entry.remove(); - self.malloc_tracker.on_remove(&value); Some(value) } else { entry.get_mut().1 -= 1; None - } - } + }, Entry::Vacant(entry) => { let value = T::default(); - self.malloc_tracker.on_insert(&value); entry.insert((value, -1)); None - } + }, } } - /// Shrinks the capacity of the map as much as possible. It will drop - /// down as much as possible while maintaining the internal rules - /// and possibly leaving some space in accordance with the resize policy. - #[inline] - pub fn shrink_to_fit(&mut self) {} + // /// Shrinks the capacity of the map as much as possible. It will drop + // /// down as much as possible while maintaining the internal rules + // /// and possibly leaving some space in accordance with the resize policy. + // #[inline] + // pub fn shrink_to_fit(&mut self) { + // self.data.shrink_to_fit(); + // } } -impl MemoryDB -where - H: KeyHasher, - T: for<'a> From<&'a [u8]> + Clone, - KF: KeyFunction, - M: MemTracker + Default, +impl MemoryDB + where + H: KeyHasher, + T: for<'a> From<&'a [u8]> + Clone, + KF: KeyFunction, { /// Create a new `MemoryDB` from a given null key/data pub fn from_null_node(null_key: &[u8], null_node_data: T) -> Self { @@ -180,7 +242,6 @@ where data: HashMap::default(), hashed_null_node: H::hash(null_key), null_node_data, - malloc_tracker: M::default(), _kf: Default::default(), } } @@ -207,26 +268,21 @@ where } /// Clear all data from the database. + /// pub fn clear(&mut self) { - self.malloc_tracker.on_clear(); self.data.clear(); } /// Purge all zero-referenced data from the database. pub fn purge(&mut self) { - let malloc_tracker = &mut self.malloc_tracker; - self.data.retain(|_, (v, rc)| { + self.data.retain(|_, (_, rc)| { let keep = *rc != 0; - if !keep { - malloc_tracker.on_remove(v); - } keep }); } /// Return the internal key-value HashMap, clearing the current state. pub fn drain(&mut self) -> HashMap { - self.malloc_tracker.on_clear(); mem::take(&mut self.data) } @@ -237,38 +293,25 @@ where /// when the refs > 0. pub fn raw(&self, key: &::Out, prefix: Prefix) -> Option<(&T, i32)> { if key == &self.hashed_null_node { - return Some((&self.null_node_data, 1)); + return Some((&self.null_node_data, 1)) } - self.data - .get(&KF::key(key, prefix)) - .map(|(value, count)| (value, *count)) + self.data.get(&KF::key(key, prefix)).map(|(value, count)| (value, *count)) } /// Consolidate all the entries of `other` into `self`. pub fn consolidate(&mut self, mut other: Self) { for (key, (value, rc)) in other.drain() { - if rc == 0 { - continue; - } match self.data.entry(key) { Entry::Occupied(mut entry) => { if entry.get().1 < 0 { - self.malloc_tracker.on_insert(&value); - self.malloc_tracker.on_remove(&entry.get().0); entry.get_mut().0 = value; } entry.get_mut().1 += rc; - - if entry.get().1 == 0 { - let (value, _) = entry.remove(); - self.malloc_tracker.on_remove(&value); - } - } + }, Entry::Vacant(entry) => { - self.malloc_tracker.on_insert(&value); entry.insert((value, rc)); - } + }, } } } @@ -277,41 +320,17 @@ where pub fn keys(&self) -> HashMap { self.data .iter() - .filter_map(|(k, v)| { - if v.1 != 0 { - Some((k.clone(), v.1)) - } else { - None - } - }) + .filter_map(|(k, v)| if v.1 != 0 { Some((k.clone(), v.1)) } else { None }) .collect() } } -impl MallocSizeOf for MemoryDB -where - H: KeyHasher, - H::Out: MallocSizeOf, - T: MallocSizeOf, - KF: KeyFunction, - KF::Key: MallocSizeOf, - M: MemTracker, -{ - fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize { - shallow_size_of_hashmap(&self.data, ops) - + self.malloc_tracker.get_size() - + self.null_node_data.size_of(ops) - + self.hashed_null_node.size_of(ops) - } -} - -impl PlainDB for MemoryDB -where - H: KeyHasher, - T: Default + PartialEq + for<'a> From<&'a [u8]> + Clone + Send + Sync, - KF: Send + Sync + KeyFunction, - KF::Key: Borrow<[u8]> + for<'a> From<&'a [u8]>, - M: MemTracker + Send + Sync, +impl PlainDB for MemoryDB + where + H: KeyHasher, + T: Default + PartialEq + for<'a> From<&'a [u8]> + Clone + Send + Sync, + KF: Send + Sync + KeyFunction, + KF::Key: Borrow<[u8]> + for<'a> From<&'a [u8]>, { fn get(&self, key: &H::Out) -> Option { match self.data.get(key.as_ref()) { @@ -321,7 +340,10 @@ where } fn contains(&self, key: &H::Out) -> bool { - matches!(self.data.get(key.as_ref()), Some(&(_, x)) if x > 0) + match self.data.get(key.as_ref()) { + Some(&(_, x)) if x > 0 => true, + _ => false, + } } fn emplace(&mut self, key: H::Out, value: T) { @@ -329,16 +351,13 @@ where Entry::Occupied(mut entry) => { let &mut (ref mut old_value, ref mut rc) = entry.get_mut(); if *rc <= 0 { - self.malloc_tracker.on_insert(&value); - self.malloc_tracker.on_remove(old_value); *old_value = value; } *rc += 1; - } + }, Entry::Vacant(entry) => { - self.malloc_tracker.on_insert(&value); entry.insert((value, 1)); - } + }, } } @@ -347,27 +366,21 @@ where Entry::Occupied(mut entry) => { let &mut (_, ref mut rc) = entry.get_mut(); *rc -= 1; - if *rc == 0 { - let (value, _) = entry.remove(); - self.malloc_tracker.on_remove(&value); - } - } + }, Entry::Vacant(entry) => { let value = T::default(); - self.malloc_tracker.on_insert(&value); entry.insert((value, -1)); - } + }, } } } -impl PlainDBRef for MemoryDB -where - H: KeyHasher, - T: Default + PartialEq + for<'a> From<&'a [u8]> + Clone + Send + Sync, - KF: Send + Sync + KeyFunction, - KF::Key: Borrow<[u8]> + for<'a> From<&'a [u8]>, - M: MemTracker + Send + Sync, +impl PlainDBRef for MemoryDB + where + H: KeyHasher, + T: Default + PartialEq + for<'a> From<&'a [u8]> + Clone + Send + Sync, + KF: Send + Sync + KeyFunction, + KF::Key: Borrow<[u8]> + for<'a> From<&'a [u8]>, { fn get(&self, key: &H::Out) -> Option { PlainDB::get(self, key) @@ -377,16 +390,15 @@ where } } -impl HashDB for MemoryDB -where - H: KeyHasher, - T: Default + PartialEq + AsRef<[u8]> + for<'a> From<&'a [u8]> + Clone + Send + Sync, - KF: KeyFunction + Send + Sync, - M: MemTracker + Send + Sync, +impl HashDB for MemoryDB + where + H: KeyHasher, + T: Default + PartialEq + AsRef<[u8]> + for<'a> From<&'a [u8]> + Clone + Send + Sync, + KF: KeyFunction + Send + Sync, { fn get(&self, key: &H::Out, prefix: Prefix) -> Option { if key == &self.hashed_null_node { - return Some(self.null_node_data.clone()); + return Some(self.null_node_data.clone()) } let key = KF::key(key, prefix); @@ -398,16 +410,19 @@ where fn contains(&self, key: &H::Out, prefix: Prefix) -> bool { if key == &self.hashed_null_node { - return true; + return true } let key = KF::key(key, prefix); - matches!(self.data.get(&key), Some(&(_, x)) if x > 0) + match self.data.get(&key) { + Some(&(_, x)) if x > 0 => true, + _ => false, + } } fn emplace(&mut self, key: H::Out, prefix: Prefix, value: T) { if value == self.null_node_data { - return; + return } let key = KF::key(&key, prefix); @@ -415,22 +430,19 @@ where Entry::Occupied(mut entry) => { let &mut (ref mut old_value, ref mut rc) = entry.get_mut(); if *rc <= 0 { - self.malloc_tracker.on_insert(&value); - self.malloc_tracker.on_remove(old_value); *old_value = value; } *rc += 1; - } + }, Entry::Vacant(entry) => { - self.malloc_tracker.on_insert(&value); entry.insert((value, 1)); - } + }, } } fn insert(&mut self, prefix: Prefix, value: &[u8]) -> H::Out { if T::from(value) == self.null_node_data { - return self.hashed_null_node; + return self.hashed_null_node } let key = H::hash(value); @@ -440,7 +452,7 @@ where fn remove(&mut self, key: &H::Out, prefix: Prefix) { if key == &self.hashed_null_node { - return; + return } let key = KF::key(key, prefix); @@ -448,26 +460,20 @@ where Entry::Occupied(mut entry) => { let &mut (_, ref mut rc) = entry.get_mut(); *rc -= 1; - if *rc == 0 { - let (value, _) = entry.remove(); - self.malloc_tracker.on_remove(&value); - } - } + }, Entry::Vacant(entry) => { let value = T::default(); - self.malloc_tracker.on_insert(&value); entry.insert((value, -1)); - } + }, } } } -impl HashDBRef for MemoryDB -where - H: KeyHasher, - T: Default + PartialEq + AsRef<[u8]> + for<'a> From<&'a [u8]> + Clone + Send + Sync, - KF: KeyFunction + Send + Sync, - M: MemTracker + Send + Sync, +impl HashDBRef for MemoryDB + where + H: KeyHasher, + T: Default + PartialEq + AsRef<[u8]> + for<'a> From<&'a [u8]> + Clone + Send + Sync, + KF: KeyFunction + Send + Sync, { fn get(&self, key: &H::Out, prefix: Prefix) -> Option { HashDB::get(self, key, prefix) @@ -477,13 +483,12 @@ where } } -impl AsPlainDB for MemoryDB -where - H: KeyHasher, - T: Default + PartialEq + for<'a> From<&'a [u8]> + Clone + Send + Sync, - KF: KeyFunction + Send + Sync, - KF::Key: Borrow<[u8]> + for<'a> From<&'a [u8]>, - M: MemTracker + Send + Sync, +impl AsPlainDB for MemoryDB + where + H: KeyHasher, + T: Default + PartialEq + for<'a> From<&'a [u8]> + Clone + Send + Sync, + KF: KeyFunction + Send + Sync, + KF::Key: Borrow<[u8]> + for<'a> From<&'a [u8]>, { fn as_plain_db(&self) -> &dyn PlainDB { self @@ -493,12 +498,11 @@ where } } -impl AsHashDB for MemoryDB -where - H: KeyHasher, - T: Default + PartialEq + AsRef<[u8]> + for<'a> From<&'a [u8]> + Clone + Send + Sync, - KF: KeyFunction + Send + Sync, - M: MemTracker + Send + Sync, +impl AsHashDB for MemoryDB + where + H: KeyHasher, + T: Default + PartialEq + AsRef<[u8]> + for<'a> From<&'a [u8]> + Clone + Send + Sync, + KF: KeyFunction + Send + Sync, { fn as_hash_db(&self) -> &dyn HashDB { self @@ -508,146 +512,11 @@ where } } -/// Used to implement incremental evaluation of `MallocSizeOf` for a collection. -pub trait MemTracker { - /// Update `malloc_size_of` when a value is removed. - fn on_remove(&mut self, _value: &T) {} - /// Update `malloc_size_of` when a value is inserted. - fn on_insert(&mut self, _value: &T) {} - /// Reset `malloc_size_of` to zero. - fn on_clear(&mut self) {} - /// Get the allocated size of the values. - fn get_size(&self) -> usize { - 0 - } -} - -/// `MemTracker` implementation for types -/// which implement `MallocSizeOf`. -#[derive(Eq, PartialEq)] -pub struct MemCounter { - malloc_size_of_values: usize, - _phantom: PhantomData, -} - -impl MemCounter { - // Create a new instance of MemCounter. - pub fn new() -> Self { - Self { - malloc_size_of_values: 0, - _phantom: PhantomData, - } - } -} - -impl Default for MemCounter { - fn default() -> Self { - Self::new() - } -} - -impl Clone for MemCounter { - fn clone(&self) -> Self { - Self { - malloc_size_of_values: self.malloc_size_of_values, - _phantom: PhantomData, - } - } -} - -impl Copy for MemCounter {} - -impl MemTracker for MemCounter { - fn on_remove(&mut self, value: &T) { - self.malloc_size_of_values -= malloc_size(value); - } - fn on_insert(&mut self, value: &T) { - self.malloc_size_of_values += malloc_size(value); - } - fn on_clear(&mut self) { - self.malloc_size_of_values = 0; - } - fn get_size(&self) -> usize { - self.malloc_size_of_values - } -} - -/// No-op `MemTracker` implementation for when we want to -/// construct a `MemoryDB` instance that does not track memory usage. -#[derive(PartialEq, Eq)] -pub struct NoopTracker(PhantomData); - -impl Default for NoopTracker { - fn default() -> Self { - Self(PhantomData) - } -} - -impl Clone for NoopTracker { - fn clone(&self) -> Self { - Self::default() - } -} - -impl Copy for NoopTracker {} - -impl MemTracker for NoopTracker {} - -fn shallow_size_of_hashmap(map: &HashMap, ops: &mut MallocSizeOfOps) -> usize { - // See the implementation for std::collections::HashSet for details. - if ops.has_malloc_enclosing_size_of() { - map.values() - .next() - .map_or(0, |v| unsafe { ops.malloc_enclosing_size_of(v) }) - } else { - map.len() * (mem::size_of::() + mem::size_of::() + mem::size_of::()) - } -} - -#[cfg(test)] -fn size_of_hash_map(map: &HashMap) -> usize -where - K: MallocSizeOf, - V: MallocSizeOf, -{ - let ops = &mut parity_util_mem::allocators::new_malloc_size_ops(); - let mut n = shallow_size_of_hashmap(map, ops); - if let (Some(k), Some(v)) = (K::constant_size(), V::constant_size()) { - n += map.len() * (k + v) - } else { - n = map - .iter() - .fold(n, |acc, (k, v)| acc + k.size_of(ops) + v.size_of(ops)) - } - n -} - -pub type GenericMemoryDB = MemoryDB, DBValue, NoopTracker>; - -impl Consolidate for GenericMemoryDB { - fn consolidate(&mut self, other: Self) { - MemoryDB::consolidate(self, other) - } -} - -impl TrieBackendStorage for GenericMemoryDB { - type Overlay = Self; - - fn get( - &self, - key: &::Out, - prefix: Prefix, - ) -> Result, DefaultError> { - Ok(hash_db::HashDB::get(self, key, prefix)) - } -} - #[cfg(test)] mod tests { use super::{HashDB, HashKey, KeyHasher, MemoryDB}; use hash_db::EMPTY_PREFIX; use keccak_hasher::KeccakHasher; - use parity_util_mem::malloc_size; #[test] fn memorydb_remove_and_purge() { @@ -670,10 +539,7 @@ mod tests { m.insert(EMPTY_PREFIX, hello_bytes); m.insert(EMPTY_PREFIX, hello_bytes); assert_eq!(m.raw(&hello_key, EMPTY_PREFIX).unwrap().1, 1); - assert_eq!( - &*m.remove_and_purge(&hello_key, EMPTY_PREFIX).unwrap(), - hello_bytes - ); + assert_eq!(&*m.remove_and_purge(&hello_key, EMPTY_PREFIX).unwrap(), hello_bytes); assert_eq!(m.raw(&hello_key, EMPTY_PREFIX), None); assert!(m.remove_and_purge(&hello_key, EMPTY_PREFIX).is_none()); } @@ -695,14 +561,11 @@ mod tests { main.consolidate(other); - assert_eq!(main.raw(&remove_key, EMPTY_PREFIX), None); - assert_eq!( - main.raw(&insert_key, EMPTY_PREFIX).unwrap(), - (&"arf".as_bytes().to_vec(), 2) - ); + assert_eq!(main.raw(&remove_key, EMPTY_PREFIX).unwrap(), (&"doggo".as_bytes().to_vec(), 0)); + assert_eq!(main.raw(&insert_key, EMPTY_PREFIX).unwrap(), (&"arf".as_bytes().to_vec(), 2)); assert_eq!( main.raw(&negative_remove_key, EMPTY_PREFIX).unwrap(), - (&"".as_bytes().to_vec(), -2), + (&"negative".as_bytes().to_vec(), -2), ); } @@ -716,20 +579,4 @@ mod tests { assert!(db2.contains(&root, EMPTY_PREFIX)); assert!(db.contains(&root, EMPTY_PREFIX)); } - - #[test] - fn malloc_size_of() { - let mut db = MemoryDB::, Vec>::default(); - for i in 0u32..1024 { - let bytes = i.to_be_bytes(); - let prefix = (bytes.as_ref(), None); - db.insert(prefix, &bytes); - } - assert_eq!( - malloc_size(&db), - super::size_of_hash_map(&db.data) - + malloc_size(&db.null_node_data) - + malloc_size(&db.hashed_null_node) - ); - } } diff --git a/crates/phala-trie-storage/src/ser.rs b/crates/phala-trie-storage/src/ser.rs index 29d0c4d739..3ece47ae60 100644 --- a/crates/phala-trie-storage/src/ser.rs +++ b/crates/phala-trie-storage/src/ser.rs @@ -1,4 +1,3 @@ -use alloc::vec::Vec; use serde::{Deserialize, Serialize}; use parity_scale_codec::{Encode, Decode}; use scale_info::TypeInfo; diff --git a/crates/phala-types/Cargo.toml b/crates/phala-types/Cargo.toml index 1e29ba5d7c..f405224b8e 100644 --- a/crates/phala-types/Cargo.toml +++ b/crates/phala-types/Cargo.toml @@ -9,7 +9,7 @@ hex = { version = "0.4", default-features = false, features = ["alloc"] } serde = { version = "1.0.101", default-features = false, optional = true } codec = { package = "parity-scale-codec", version = "3.1", default-features = false, features = ["full"] } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } phala-mq = { path = "../../crates/phala-mq", default-features = false } prpc = { path = "../../crates/prpc", default-features = false } diff --git a/crates/phaxt/Cargo.toml b/crates/phaxt/Cargo.toml index 522574eb52..2dc873e9a5 100644 --- a/crates/phaxt/Cargo.toml +++ b/crates/phaxt/Cargo.toml @@ -11,8 +11,8 @@ scale-info = '2.0' anyhow = "1" tokio = "1" -subxt = { path = "../../subxt/subxt" } +subxt = { path = "../../subxt/subxt", features = ["jsonrpsee-ws"] } phala-types = { path = "../phala-types" } phala-node-rpc-ext-types = { path = "../phala-node-rpc-ext/types" } phala-pallets = { path = "../../pallets/phala" } -jsonrpsee = "0.15" +jsonrpsee = "0.16.2" diff --git a/crates/phaxt/src/lib.rs b/crates/phaxt/src/lib.rs index 7e8992b0da..2ff2eb6281 100644 --- a/crates/phaxt/src/lib.rs +++ b/crates/phaxt/src/lib.rs @@ -46,7 +46,7 @@ pub type AccountId = ::AccountId; pub type Address = ::Address; pub type Header = ::Header; pub type Signature = ::Signature; -pub type Extrinsic = ::Extrinsic; +pub type Extrinsic = ::ExtrinsicParams; use jsonrpsee::{ async_client::ClientBuilder, diff --git a/crates/pink-libs/subrpc/Cargo.toml b/crates/pink-libs/subrpc/Cargo.toml index 99bc88d560..76b1f86607 100644 --- a/crates/pink-libs/subrpc/Cargo.toml +++ b/crates/pink-libs/subrpc/Cargo.toml @@ -32,7 +32,7 @@ base58 = { version = "0.2.0", default-features = false } [dev-dependencies] pink-extension-runtime = { version = "0.2", path = "../../pink/pink-extension-runtime" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.34", default-features = false, features = ["std"] } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36", default-features = false, features = ["std"] } [features] default = ["std"] diff --git a/crates/pink/Cargo.toml b/crates/pink/Cargo.toml index fcf95c0ee7..e3322b6a37 100644 --- a/crates/pink/Cargo.toml +++ b/crates/pink/Cargo.toml @@ -6,24 +6,23 @@ edition = "2021" [dependencies] sha2 = "0.10.2" log = "0.4.14" -pallet-contracts = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -pallet-contracts-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -pallet-contracts-proc-macro = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +pallet-contracts = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-contracts-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-contracts-proc-macro = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-sandbox = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } scale = { package = "parity-scale-codec", version = "3.1", default-features = false, features = ["derive"] } scale-info = { version = "2.1", default-features = false, features = ["derive", "serde", "decode"] } diff --git a/crates/pink/src/runtime.rs b/crates/pink/src/runtime.rs index cea9eff96d..5eedc917d3 100644 --- a/crates/pink/src/runtime.rs +++ b/crates/pink/src/runtime.rs @@ -11,7 +11,7 @@ use crate::types::{AccountId, Balance, BlockNumber, Hash, Hashing, Index}; use frame_support::{ parameter_types, traits::ConstBool, - weights::{constants::WEIGHT_PER_SECOND, Weight}, + weights::{constants::WEIGHT_REF_TIME_PER_SECOND, Weight}, }; use pallet_contracts::{Config, Frame, Schedule}; use sp_runtime::{generic::Header, traits::IdentityLookup, Perbill}; @@ -43,7 +43,7 @@ parameter_types! { pub const BlockHashCount: u32 = 250; pub RuntimeBlockWeights: frame_system::limits::BlockWeights = frame_system::limits::BlockWeights::with_sensible_defaults( - (2u64 * WEIGHT_PER_SECOND).set_proof_size(u64::MAX), + Weight::from_parts(2u64 * WEIGHT_REF_TIME_PER_SECOND, u64::MAX), NORMAL_DISPATCH_RATIO, ); pub const ExistentialDeposit: Balance = 1; @@ -114,6 +114,7 @@ parameter_types! { pub const DeletionWeightLimit: Weight = Weight::from_ref_time(500_000_000_000); pub const MaxCodeLen: u32 = 2 * 1024 * 1024; pub const MaxStorageKeyLen: u32 = 128; + pub const MaxDebugBufferLen: u32 = 128 * 1024; pub DefaultSchedule: Schedule = { let mut schedule = Schedule::::default(); @@ -146,6 +147,7 @@ impl Config for PinkRuntime { type MaxCodeLen = MaxCodeLen; type MaxStorageKeyLen = MaxStorageKeyLen; type UnsafeUnstableInterface = ConstBool; + type MaxDebugBufferLen = MaxDebugBufferLen; } #[test] diff --git a/pallets/offchain-rollup/Cargo.toml b/pallets/offchain-rollup/Cargo.toml index 548d50ea5e..e4c8bd34eb 100644 --- a/pallets/offchain-rollup/Cargo.toml +++ b/pallets/offchain-rollup/Cargo.toml @@ -15,23 +15,23 @@ codec = { package = "parity-scale-codec", version = "3.1", default-features = fa scale-info = { version = "2.1", default-features = false, features = ["derive"] } primitive-types = { version = "0.12.1", default-features = false, features = ["codec", "byteorder"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false, optional = true } log = { version = "0.4.14", default-features = false } hex = { version = "0.4", default-features = false } hex-literal = "0.3.4" [dev-dependencies] -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -frame-support-test = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-support-test = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } kv-session = { path = "../../crates/pink-libs/kv-session", package = "pink-kv-session" } assert_matches = "1.4.0" diff --git a/pallets/offchain-rollup/src/anchor.rs b/pallets/offchain-rollup/src/anchor.rs index ecfa38f43a..00c4e7d7c1 100644 --- a/pallets/offchain-rollup/src/anchor.rs +++ b/pallets/offchain-rollup/src/anchor.rs @@ -143,6 +143,7 @@ pub mod pallet { /// Claims a name and assign the caller as the owner of the name /// /// Once the name is claimed, we don't allow to change the owner or deregister any more. + #[pallet::call_index(0)] #[pallet::weight(0)] #[transactional] pub fn claim_name(origin: OriginFor, name: H256) -> DispatchResult { @@ -160,6 +161,7 @@ pub mod pallet { } /// Triggers a rollup with an optional nonce + #[pallet::call_index(1)] #[pallet::weight(0)] #[transactional] pub fn rollup( diff --git a/pallets/offchain-rollup/src/oracle.rs b/pallets/offchain-rollup/src/oracle.rs index 5fd4440e09..15f51d12b8 100644 --- a/pallets/offchain-rollup/src/oracle.rs +++ b/pallets/offchain-rollup/src/oracle.rs @@ -60,6 +60,7 @@ pub mod pallet { #[pallet::call] impl Pallet { /// Sends a request to the oracle + #[pallet::call_index(0)] #[pallet::weight(0)] #[transactional] pub fn request( diff --git a/pallets/phala/Cargo.toml b/pallets/phala/Cargo.toml index 0297c8d005..bfb11383e5 100644 --- a/pallets/phala/Cargo.toml +++ b/pallets/phala/Cargo.toml @@ -15,27 +15,27 @@ codec = { package = "parity-scale-codec", version = "3.1", default-features = fa scale-info = { version = "2.1", default-features = false, features = ["derive"] } primitive-types = { version = "0.12.1", default-features = false, features = ["codec", "byteorder"] } -pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-uniques = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-uniques = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } # RMRK dependencies -pallet-rmrk-core = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.34", default-features = false } -rmrk-traits = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.34", default-features = false } +pallet-rmrk-core = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.36", default-features = false } +rmrk-traits = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.36", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false, optional = true } log = { version = "0.4.14", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } phala-types = { path = "../../crates/phala-types", default-features = false } chrono = { version = "0.4.22", default-features = false } @@ -55,13 +55,13 @@ webpki = { version = "0.22", default-features = false, features = ["alloc"] } webpki_wasm = { package = "webpki", path = "../../vendor/webpki", default-features = false, features = ["alloc"] } [dev-dependencies] -frame-support-test = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +frame-support-test = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } assert_matches = "1.4.0" -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } rand = "0.8.5" insta = "1" -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } [features] default = ["std"] diff --git a/pallets/phala/mq-runtime-api/Cargo.toml b/pallets/phala/mq-runtime-api/Cargo.toml index 552dbbd6f8..549cee17ac 100644 --- a/pallets/phala/mq-runtime-api/Cargo.toml +++ b/pallets/phala/mq-runtime-api/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } phala-mq = { path = "../../../crates/phala-mq", default-features = false } [features] diff --git a/pallets/phala/src/compute/base_pool.rs b/pallets/phala/src/compute/base_pool.rs index 28786f94cd..78cdc467ff 100644 --- a/pallets/phala/src/compute/base_pool.rs +++ b/pallets/phala/src/compute/base_pool.rs @@ -439,6 +439,7 @@ pub mod pallet { /// The caller must be the owner of the pool. /// If a pool hasn't registed in the wihtelist map, any staker could contribute as what they use to do. /// The whitelist has a lmit len of 100 stakers. + #[pallet::call_index(0)] #[pallet::weight(0)] pub fn add_staker_to_whitelist( origin: OriginFor, @@ -477,6 +478,7 @@ pub mod pallet { /// Adds a description to the pool /// /// The caller must be the owner of the pool. + #[pallet::call_index(1)] #[pallet::weight(0)] pub fn set_pool_description( origin: OriginFor, @@ -496,6 +498,7 @@ pub mod pallet { Ok(()) } + #[pallet::call_index(2)] #[pallet::weight(0)] #[frame_support::transactional] pub fn reset_lock_iter_pos(origin: OriginFor) -> DispatchResult { @@ -505,6 +508,7 @@ pub mod pallet { Ok(()) } + #[pallet::call_index(3)] #[pallet::weight(0)] pub fn remove_unused_lock(origin: OriginFor, max_iterations: u32) -> DispatchResult { let who = ensure_signed(origin)?; @@ -546,6 +550,7 @@ pub mod pallet { /// /// The caller must be the owner of the pool. /// If the last staker in the whitelist is removed, the pool will return back to a normal pool that allow anyone to contribute. + #[pallet::call_index(4)] #[pallet::weight(0)] pub fn remove_staker_from_whitelist( origin: OriginFor, @@ -585,6 +590,7 @@ pub mod pallet { Ok(()) } + #[pallet::call_index(5)] #[pallet::weight(0)] #[frame_support::transactional] pub fn backfill_transfer_shares( diff --git a/pallets/phala/src/compute/computation.rs b/pallets/phala/src/compute/computation.rs index fbc357002e..dd8c164b4a 100644 --- a/pallets/phala/src/compute/computation.rs +++ b/pallets/phala/src/compute/computation.rs @@ -430,6 +430,7 @@ pub mod pallet { /// Sets the cool down expiration time in seconds. /// /// Can only be called by root. + #[pallet::call_index(0)] #[pallet::weight(0)] pub fn set_cool_down_expiration(origin: OriginFor, period: u64) -> DispatchResult { ensure_root(origin)?; @@ -443,6 +444,7 @@ pub mod pallet { /// /// It will trigger a force stop of computing if the worker is still in computing state. Anyone /// can call it. + #[pallet::call_index(1)] #[pallet::weight(0)] pub fn unbind(origin: OriginFor, session: T::AccountId) -> DispatchResult { let who = ensure_signed(origin)?; @@ -458,6 +460,7 @@ pub mod pallet { /// Triggers a force heartbeat request to all workers by sending a MAX pow target /// /// Only for integration test. + #[pallet::call_index(2)] #[pallet::weight(1)] pub fn force_heartbeat(origin: OriginFor) -> DispatchResult { ensure_root(origin)?; @@ -471,6 +474,7 @@ pub mod pallet { /// Start computing /// /// Only for integration test. + #[pallet::call_index(3)] #[pallet::weight(1)] pub fn force_start_computing( origin: OriginFor, @@ -485,6 +489,7 @@ pub mod pallet { /// Stop computing /// /// Only for integration test. + #[pallet::call_index(4)] #[pallet::weight(1)] pub fn force_stop_computing(origin: OriginFor, session: T::AccountId) -> DispatchResult { ensure_root(origin)?; @@ -495,6 +500,7 @@ pub mod pallet { /// Updates the tokenomic parameters at the end of this block. /// /// Can only be called by the tokenomic admin. + #[pallet::call_index(5)] #[pallet::weight(1)] pub fn update_tokenomic( origin: OriginFor, @@ -512,6 +518,7 @@ pub mod pallet { /// but never be paid out until the heartbeat is resumed. /// /// Can only be called by root. + #[pallet::call_index(6)] #[pallet::weight(1)] pub fn set_heartbeat_paused(origin: OriginFor, paused: bool) -> DispatchResult { T::GovernanceOrigin::ensure_origin(origin)?; diff --git a/pallets/phala/src/compute/stake_pool_v2.rs b/pallets/phala/src/compute/stake_pool_v2.rs index 8f1f3d1469..02a0d76f6a 100644 --- a/pallets/phala/src/compute/stake_pool_v2.rs +++ b/pallets/phala/src/compute/stake_pool_v2.rs @@ -325,6 +325,7 @@ pub mod pallet { T: Config + vault::Config, { /// Creates a new stake pool + #[pallet::call_index(0)] #[pallet::weight(0)] #[frame_support::transactional] pub fn create(origin: OriginFor) -> DispatchResult { @@ -389,6 +390,7 @@ pub mod pallet { /// Requires: /// 1. The worker is registered and benchmarked /// 2. The worker is not bound a pool + #[pallet::call_index(1)] #[pallet::weight(0)] pub fn add_worker( origin: OriginFor, @@ -457,6 +459,7 @@ pub mod pallet { /// 1. The worker is registered /// 2. The worker is associated with a pool /// 3. The worker is removable (not in computing) + #[pallet::call_index(2)] #[pallet::weight(0)] pub fn remove_worker( origin: OriginFor, @@ -496,6 +499,7 @@ pub mod pallet { /// Note: a smaller cap than current total_value if not allowed. /// Requires: /// 1. The sender is the owner + #[pallet::call_index(3)] #[pallet::weight(0)] pub fn set_cap(origin: OriginFor, pid: u64, cap: BalanceOf) -> DispatchResult { let owner = ensure_signed(origin)?; @@ -523,6 +527,7 @@ pub mod pallet { /// /// Requires: /// 1. The sender is the owner + #[pallet::call_index(4)] #[pallet::weight(0)] pub fn set_payout_pref( origin: OriginFor, @@ -548,6 +553,7 @@ pub mod pallet { Ok(()) } + #[pallet::call_index(5)] #[pallet::weight(0)] #[frame_support::transactional] pub fn claim_legacy_rewards( @@ -562,6 +568,7 @@ pub mod pallet { Ok(()) } + #[pallet::call_index(6)] #[pallet::weight(0)] pub fn backfill_add_missing_reward( origin: OriginFor, @@ -582,6 +589,7 @@ pub mod pallet { /// /// Requires: /// 1. The sender is a pool owner + #[pallet::call_index(7)] #[pallet::weight(0)] pub fn claim_owner_rewards( origin: OriginFor, @@ -618,6 +626,7 @@ pub mod pallet { /// If the shutdown condition is met, all workers in the pool will be forced shutdown. /// Note: This function doesn't guarantee no-op when there's error. /// TODO(mingxuan): add more detail comment later. + #[pallet::call_index(8)] #[pallet::weight(0)] #[frame_support::transactional] pub fn check_and_maybe_force_withdraw(origin: OriginFor, pid: u64) -> DispatchResult { @@ -666,6 +675,7 @@ pub mod pallet { /// Requires: /// 1. The pool exists /// 2. After the deposit, the pool doesn't reach the cap + #[pallet::call_index(9)] #[pallet::weight(0)] #[frame_support::transactional] pub fn contribute( @@ -763,6 +773,7 @@ pub mod pallet { /// Once a withdraw request is proceeded successfully, The withdrawal would be queued and waiting to be dealed. /// Afer the withdrawal is queued, The withdraw queue will be automaticly consumed util there are not enough free stakes to fullfill withdrawals. /// Everytime the free stakes in the pools increases (except for rewards distributing), the withdraw queue will be consumed as it describes above. + #[pallet::call_index(10)] #[pallet::weight(0)] #[frame_support::transactional] pub fn withdraw( @@ -838,6 +849,7 @@ pub mod pallet { Ok(()) } + #[pallet::call_index(11)] #[pallet::weight(0)] #[frame_support::transactional] pub fn reset_iter_pos(origin: OriginFor) -> DispatchResult { @@ -847,6 +859,7 @@ pub mod pallet { Ok(()) } + #[pallet::call_index(12)] #[pallet::weight(0)] #[frame_support::transactional] pub fn fix_missing_worker_lock( @@ -910,6 +923,7 @@ pub mod pallet { /// Requires: /// 1. The worker is bound to the pool and is in Ready state /// 2. The remaining stake in the pool can cover the minimal stake required + #[pallet::call_index(13)] #[pallet::weight(0)] pub fn start_computing( origin: OriginFor, @@ -926,6 +940,7 @@ pub mod pallet { /// /// Requires: /// 1. There worker is bound to the pool and is in a stoppable state + #[pallet::call_index(14)] #[pallet::weight(0)] pub fn stop_computing( origin: OriginFor, @@ -937,6 +952,7 @@ pub mod pallet { } /// Reclaims the releasing stake of a worker in a pool. + #[pallet::call_index(15)] #[pallet::weight(0)] pub fn reclaim_pool_worker( origin: OriginFor, @@ -950,6 +966,7 @@ pub mod pallet { } /// Enables or disables computing. Must be called with the council or root permission. + #[pallet::call_index(16)] #[pallet::weight(0)] pub fn set_working_enabled(origin: OriginFor, enable: bool) -> DispatchResult { T::ComputingSwitchOrigin::ensure_origin(origin)?; @@ -958,6 +975,7 @@ pub mod pallet { } /// Restarts the worker with a higher stake + #[pallet::call_index(17)] #[pallet::weight(195_000_000)] #[frame_support::transactional] pub fn restart_computing( diff --git a/pallets/phala/src/compute/vault.rs b/pallets/phala/src/compute/vault.rs index fe39722651..1e916418aa 100644 --- a/pallets/phala/src/compute/vault.rs +++ b/pallets/phala/src/compute/vault.rs @@ -146,6 +146,7 @@ pub mod pallet { T: pallet_assets::Config>, { /// Creates a new vault + #[pallet::call_index(0)] #[pallet::weight(0)] #[frame_support::transactional] pub fn create(origin: OriginFor) -> DispatchResult { @@ -202,6 +203,7 @@ pub mod pallet { /// /// Requires: /// 1. The sender is the owner + #[pallet::call_index(1)] #[pallet::weight(0)] pub fn set_payout_pref( origin: OriginFor, @@ -232,6 +234,7 @@ pub mod pallet { /// /// Requires: /// 1. The sender is the owner + #[pallet::call_index(2)] #[pallet::weight(0)] pub fn claim_owner_shares( origin: OriginFor, @@ -280,6 +283,7 @@ pub mod pallet { /// /// Requires: /// 1. The sender is the owner + #[pallet::call_index(3)] #[pallet::weight(0)] pub fn maybe_gain_owner_shares(origin: OriginFor, vault_pid: u64) -> DispatchResult { let who = ensure_signed(origin)?; @@ -325,6 +329,7 @@ pub mod pallet { /// If the shutdown condition is met, all shares owned by the vault will be forced withdraw. /// Note: This function doesn't guarantee no-op when there's error. /// TODO(mingxuan): add more detail comment later. + #[pallet::call_index(4)] #[pallet::weight(0)] #[frame_support::transactional] pub fn check_and_maybe_force_withdraw( @@ -418,6 +423,7 @@ pub mod pallet { /// Requires: /// 1. The pool exists /// 2. After the deposit, the pool doesn't reach the cap + #[pallet::call_index(5)] #[pallet::weight(0)] #[frame_support::transactional] pub fn contribute(origin: OriginFor, pid: u64, amount: BalanceOf) -> DispatchResult { @@ -476,6 +482,7 @@ pub mod pallet { /// Once a withdraw request is proceeded successfully, The withdrawal would be queued and waiting to be dealed. /// Afer the withdrawal is queued, The withdraw queue will be automaticly consumed util there are not enough free stakes to fullfill withdrawals. /// Everytime the free stakes in the pools increases, the withdraw queue will be consumed as it describes above. + #[pallet::call_index(6)] #[pallet::weight(0)] #[frame_support::transactional] pub fn withdraw(origin: OriginFor, pid: u64, shares: BalanceOf) -> DispatchResult { diff --git a/pallets/phala/src/compute/wrapped_balances.rs b/pallets/phala/src/compute/wrapped_balances.rs index ade90b57f5..f9c5b4b62f 100644 --- a/pallets/phala/src/compute/wrapped_balances.rs +++ b/pallets/phala/src/compute/wrapped_balances.rs @@ -208,6 +208,7 @@ pub mod pallet { /// Wraps some pha and gain equal amount of W-PHA /// /// The wrapped pha is stored in `WrappedBalancesAccountId`'s wallet and can not be taken away + #[pallet::call_index(0)] #[pallet::weight(0)] #[frame_support::transactional] pub fn wrap(origin: OriginFor, amount: BalanceOf) -> DispatchResult { @@ -233,6 +234,7 @@ pub mod pallet { /// Burns the amount of all free W-PHA and unwraps equal amount of pha /// /// The unwrapped pha is transfered from `WrappedBalancesAccountId` to the user's wallet + #[pallet::call_index(1)] #[pallet::weight(0)] #[frame_support::transactional] pub fn unwrap_all(origin: OriginFor) -> DispatchResult { @@ -257,6 +259,7 @@ pub mod pallet { /// Unwraps some pha by burning equal amount of W-PHA /// /// The unwrapped pha is transfered from `WrappedBalancesAccountId` to the user's wallet + #[pallet::call_index(2)] #[pallet::weight(0)] #[frame_support::transactional] pub fn unwrap(origin: OriginFor, amount: BalanceOf) -> DispatchResult { @@ -290,6 +293,7 @@ pub mod pallet { /// /// Can both approve and oppose a vote at the same time /// The W-PHA used in vote will be locked until the vote is finished or canceled + #[pallet::call_index(3)] #[pallet::weight(0)] #[frame_support::transactional] pub fn vote( @@ -325,6 +329,7 @@ pub mod pallet { /// Tries to unlock W-PHAs used in vote after the vote finished or canceled /// /// Must assign the max iterations to avoid computing complexity overwhelm + #[pallet::call_index(4)] #[pallet::weight(0)] #[frame_support::transactional] pub fn unlock( diff --git a/pallets/phala/src/fat.rs b/pallets/phala/src/fat.rs index 0efe596fdc..3dcc5f1ff0 100644 --- a/pallets/phala/src/fat.rs +++ b/pallets/phala/src/fat.rs @@ -201,6 +201,7 @@ pub mod pallet { /// - `deposit_per_item` - Price for contract storage per item. /// - `deposit_per_byte` - Price for contract storage per byte. /// - `treasury_account` - The treasury account used to collect the gas and storage fee. + #[pallet::call_index(0)] #[pallet::weight(0)] pub fn add_cluster( origin: OriginFor, @@ -282,6 +283,7 @@ pub mod pallet { Ok(()) } + #[pallet::call_index(1)] #[pallet::weight(0)] pub fn cluster_upload_resource( origin: OriginFor, @@ -316,6 +318,7 @@ pub mod pallet { } /// Transfer `amount` of on-chain token to the `dest_account` in the cluster of id `cluster_id`. + #[pallet::call_index(2)] #[pallet::weight(0)] pub fn transfer_to_cluster( origin: OriginFor, @@ -344,6 +347,7 @@ pub mod pallet { } // Push message to contract with some deposit into the cluster to pay the gas fee + #[pallet::call_index(3)] #[pallet::weight(Weight::from_ref_time(10_000u64))] pub fn push_contract_message( origin: OriginFor, @@ -360,6 +364,7 @@ pub mod pallet { PalletMq::::push_message(origin, command_topic(contract_id), payload) } + #[pallet::call_index(4)] #[pallet::weight(0)] pub fn instantiate_contract( origin: OriginFor, @@ -418,6 +423,7 @@ pub mod pallet { Ok(()) } + #[pallet::call_index(5)] #[pallet::weight(0)] pub fn cluster_destroy(origin: OriginFor, cluster: ContractClusterId) -> DispatchResult { ensure_root(origin)?; @@ -428,6 +434,7 @@ pub mod pallet { Ok(()) } + #[pallet::call_index(6)] #[pallet::weight(0)] pub fn set_pink_system_code( origin: OriginFor, diff --git a/pallets/phala/src/fat_tokenomic.rs b/pallets/phala/src/fat_tokenomic.rs index 8f6782ee23..47500d6e15 100644 --- a/pallets/phala/src/fat_tokenomic.rs +++ b/pallets/phala/src/fat_tokenomic.rs @@ -94,6 +94,7 @@ pub mod pallet { /// If users stake on a contract doesn't deployed yet. The deposit would send to the cluster /// even if the contract is deployed later. User can re-stake with or without changing the amount /// to sync the depoit the the cluster after the contract is actually deployed. + #[pallet::call_index(0)] #[pallet::weight(0)] pub fn adjust_stake( origin: OriginFor, diff --git a/pallets/phala/src/mq.rs b/pallets/phala/src/mq.rs index 85e12d1235..51f41021cb 100644 --- a/pallets/phala/src/mq.rs +++ b/pallets/phala/src/mq.rs @@ -62,6 +62,7 @@ pub mod pallet { T::AccountId: IntoH256, { /// Syncs an unverified offchain message to the message queue + #[pallet::call_index(0)] #[pallet::weight(Weight::from_ref_time(10_000u64) + T::DbWeight::get().writes(1u64))] pub fn sync_offchain_message( origin: OriginFor, @@ -96,6 +97,7 @@ pub mod pallet { // Messaging API for end user. // TODO.kevin: confirm the weight + #[pallet::call_index(1)] #[pallet::weight(Weight::from_ref_time(10_000u64) + T::DbWeight::get().writes(1u64))] pub fn push_message( origin: OriginFor, @@ -110,6 +112,7 @@ pub mod pallet { } // Force push a from-pallet message. + #[pallet::call_index(2)] #[pallet::weight(Weight::from_ref_time(10_000u64) + T::DbWeight::get().writes(1u64))] pub fn force_push_pallet_message( origin: OriginFor, diff --git a/pallets/phala/src/ott.rs b/pallets/phala/src/ott.rs index 4222344895..bfc8923f2c 100644 --- a/pallets/phala/src/ott.rs +++ b/pallets/phala/src/ott.rs @@ -62,6 +62,7 @@ pub mod pallet { impl Pallet { /// Distributes some amounts to each specified accounts and mark the sender and destination /// accounts as blacklisted. + #[pallet::call_index(0)] #[pallet::weight(0)] #[transactional] pub fn distribute( diff --git a/pallets/phala/src/registry.rs b/pallets/phala/src/registry.rs index 0dc8c14ba2..7168b6302b 100644 --- a/pallets/phala/src/registry.rs +++ b/pallets/phala/src/registry.rs @@ -290,6 +290,7 @@ pub mod pallet { /// Sets [`BenchmarkDuration`] /// /// Can only be called by `GovernanceOrigin`. + #[pallet::call_index(0)] #[pallet::weight(Weight::from_ref_time(10_000u64) + T::DbWeight::get().writes(1u64))] pub fn force_set_benchmark_duration(origin: OriginFor, value: u32) -> DispatchResult { T::GovernanceOrigin::ensure_origin(origin)?; @@ -300,6 +301,7 @@ pub mod pallet { /// Force register a worker with the given pubkey with sudo permission /// /// For test only. + #[pallet::call_index(1)] #[pallet::weight(Weight::from_ref_time(10_000u64) + T::DbWeight::get().writes(1u64))] pub fn force_register_worker( origin: OriginFor, @@ -339,6 +341,7 @@ pub mod pallet { /// Force register a topic pubkey /// /// For test only. + #[pallet::call_index(2)] #[pallet::weight(Weight::from_ref_time(10_000u64) + T::DbWeight::get().writes(1u64))] pub fn force_register_topic_pubkey( origin: OriginFor, @@ -353,6 +356,7 @@ pub mod pallet { /// Register a gatekeeper. /// /// Can only be called by `GovernanceOrigin`. + #[pallet::call_index(3)] #[pallet::weight(Weight::from_ref_time(10_000u64) + T::DbWeight::get().writes(1u64))] pub fn register_gatekeeper( origin: OriginFor, @@ -398,6 +402,7 @@ pub mod pallet { /// Unregister a gatekeeper /// /// At least one gatekeeper should be available + #[pallet::call_index(4)] #[pallet::weight(Weight::from_ref_time(10_000u64) + T::DbWeight::get().writes(1u64))] pub fn unregister_gatekeeper( origin: OriginFor, @@ -426,6 +431,7 @@ pub mod pallet { } /// Rotate the master key + #[pallet::call_index(5)] #[pallet::weight(Weight::from_ref_time(10_000u64) + T::DbWeight::get().writes(1u64))] pub fn rotate_master_key(origin: OriginFor) -> DispatchResult { T::GovernanceOrigin::ensure_origin(origin)?; @@ -463,6 +469,7 @@ pub mod pallet { /// /// Usually called by a bridging relayer program (`pherry` and `prb`). Can be called by /// anyone on behalf of a worker. + #[pallet::call_index(6)] #[pallet::weight(0)] pub fn register_worker( origin: OriginFor, @@ -560,6 +567,7 @@ pub mod pallet { /// /// Usually called by a bridging relayer program (`pherry` and `prb`). Can be called by /// anyone on behalf of a worker. + #[pallet::call_index(7)] #[pallet::weight(0)] pub fn register_worker_v2( origin: OriginFor, @@ -671,6 +679,7 @@ pub mod pallet { Ok(()) } + #[pallet::call_index(8)] #[pallet::weight(0)] pub fn update_worker_endpoint( origin: OriginFor, @@ -717,6 +726,7 @@ pub mod pallet { /// Registers a pruntime binary to [`PRuntimeAllowList`] /// /// Can only be called by `GovernanceOrigin`. + #[pallet::call_index(9)] #[pallet::weight(0)] pub fn add_pruntime(origin: OriginFor, pruntime_hash: Vec) -> DispatchResult { T::GovernanceOrigin::ensure_origin(origin)?; @@ -739,6 +749,7 @@ pub mod pallet { /// Removes a pruntime binary from [`PRuntimeAllowList`] /// /// Can only be called by `GovernanceOrigin`. + #[pallet::call_index(10)] #[pallet::weight(0)] pub fn remove_pruntime(origin: OriginFor, pruntime_hash: Vec) -> DispatchResult { T::GovernanceOrigin::ensure_origin(origin)?; @@ -760,6 +771,7 @@ pub mod pallet { /// Adds an entry in [`RelaychainGenesisBlockHashAllowList`] /// /// Can only be called by `GovernanceOrigin`. + #[pallet::call_index(11)] #[pallet::weight(0)] pub fn add_relaychain_genesis_block_hash( origin: OriginFor, @@ -782,6 +794,7 @@ pub mod pallet { /// Deletes an entry in [`RelaychainGenesisBlockHashAllowList`] /// /// Can only be called by `GovernanceOrigin`. + #[pallet::call_index(12)] #[pallet::weight(0)] pub fn remove_relaychain_genesis_block_hash( origin: OriginFor, @@ -804,6 +817,7 @@ pub mod pallet { /// Set minimum pRuntime version. Versions less than MinimumPRuntimeVersion would be forced to quit. /// /// Can only be called by `GovernanceOrigin`. + #[pallet::call_index(13)] #[pallet::weight(0)] pub fn set_minimum_pruntime_version( origin: OriginFor, @@ -823,6 +837,7 @@ pub mod pallet { /// the current consensus version. /// /// Can only be called by `GovernanceOrigin`. + #[pallet::call_index(14)] #[pallet::weight(0)] pub fn set_pruntime_consensus_version( origin: OriginFor, diff --git a/scripts/debug-cli/Cargo.toml b/scripts/debug-cli/Cargo.toml index 05bf5b0092..ae724eda8a 100644 --- a/scripts/debug-cli/Cargo.toml +++ b/scripts/debug-cli/Cargo.toml @@ -11,10 +11,10 @@ hex = "0.4" clap = { version = "4.0.19", features = ["derive"] } anyhow = "1.0.43" -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } phala-types = { path = "../../crates/phala-types" } phala-pallets = { path = "../../pallets/phala" } diff --git a/standalone/executor/Cargo.toml b/standalone/executor/Cargo.toml index aca277b4e4..08cd244dd9 100644 --- a/standalone/executor/Cargo.toml +++ b/standalone/executor/Cargo.toml @@ -14,33 +14,33 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "3.1" } scale-info = { version = "2.0", features = ["derive"] } -node-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +node-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } node-runtime = { path = "../runtime", package = "phala-node-runtime" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [dev-dependencies] criterion = "0.4.0" -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -# node-testing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -pallet-contracts = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +# node-testing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-contracts = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } wat = "1.0" futures = "0.3.19" diff --git a/standalone/node/Cargo.toml b/standalone/node/Cargo.toml index b7a7d9f70a..c17e178e05 100644 --- a/standalone/node/Cargo.toml +++ b/standalone/node/Cargo.toml @@ -40,81 +40,79 @@ phala-pallets = { path = "../../pallets/phala" } clap = { version = "4.0.19", features = ["derive"], optional = true } codec = { version = "3.1", package = "parity-scale-codec" } serde = { version = "1.0.136", features = ["derive"] } -jsonrpsee = { version = "0.15.1", features = ["server"] } +jsonrpsee = { version = "0.16.2", features = ["server"] } futures = "0.3.16" hex-literal = "0.3.4" log = "0.4.8" rand = "0.8" # primitives -sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -grandpa-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", package = "sp-finality-grandpa" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-transaction-storage-proof = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +grandpa-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", package = "sp-finality-grandpa" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-transaction-storage-proof = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } # client dependencies -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-consensus-uncles = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-consensus-uncles = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } # frame dependencies -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } # node-specific dependencies node-runtime = { path = "../runtime", package = "phala-node-runtime" } node-rpc = { path = "../rpc" } -node-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +node-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } node-executor = { path = "../executor" } # CLI-specific dependencies -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", optional = true } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", optional = true } -node-inspect = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", optional = true } -try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", optional = true } - -[target.'cfg(any(target_arch="x86_64", target_arch="aarch64"))'.dependencies] -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", features = ["memory-tracker"] } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", optional = true } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", optional = true } +node-inspect = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", optional = true } +try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", optional = true } [dev-dependencies] -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-service-test = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-service-test = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } futures = "0.3.19" tempfile = "3.1.0" assert_cmd = "2.0.2" @@ -127,19 +125,19 @@ criterion = { version = "0.3.5", features = ["async_tokio"] } tokio = { version = "1.22.0", features = ["macros", "time", "parking_lot"] } tokio-util = { version = "0.7.4", features = ["compat"] } wait-timeout = "0.2" -substrate-rpc-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +substrate-rpc-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [build-dependencies] clap = { version = "4.0.19", optional = true } clap_complete = { version = "4.0.3", optional = true } -node-inspect = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", optional = true } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", optional = true } -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", optional = true } -substrate-frame-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", optional = true } -try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", optional = true } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", optional = true } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +node-inspect = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", optional = true } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", optional = true } +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", optional = true } +substrate-frame-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", optional = true } +try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", optional = true } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", optional = true } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["cli"] diff --git a/standalone/node/src/command.rs b/standalone/node/src/command.rs index ccd5438861..25b10c98b5 100644 --- a/standalone/node/src/command.rs +++ b/standalone/node/src/command.rs @@ -229,6 +229,8 @@ pub fn run() -> Result<()> { }, #[cfg(feature = "try-runtime")] Some(Subcommand::TryRuntime(cmd)) => { + use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch}; + let runner = cli.create_runner(cmd)?; runner.async_run(|config| { // we don't need any of the components of new_partial, just a runtime, or a task @@ -238,7 +240,13 @@ pub fn run() -> Result<()> { sc_service::TaskManager::new(config.tokio_handle.clone(), registry) .map_err(|e| sc_cli::Error::Service(sc_service::Error::Prometheus(e)))?; - Ok((cmd.run::(config), task_manager)) + Ok(( + cmd.run::::ExtendHostFunctions, + >>(), + task_manager, + )) }) }, #[cfg(not(feature = "try-runtime"))] diff --git a/standalone/pherry/Cargo.toml b/standalone/pherry/Cargo.toml index 63a94a6603..f68fa01582 100644 --- a/standalone/pherry/Cargo.toml +++ b/standalone/pherry/Cargo.toml @@ -21,16 +21,16 @@ rand = "0.8.4" clap = { version = "4.0.19", features = ["derive"] } async-trait = "0.1.57" -system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", package = "frame-system" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", package = "sp-runtime" } -sp-finality-grandpa = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", package = "frame-system" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", package = "sp-runtime" } +sp-finality-grandpa = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } codec = { package = 'parity-scale-codec', version = "3.0" } scale-info = { version = '2.0' } -pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } phala-types = { path = "../../crates/phala-types" } phala-pallets = { path = "../../pallets/phala" } diff --git a/standalone/prouter/Cargo.lock b/standalone/prouter/Cargo.lock index 309a12dda8..58495e6bb0 100644 --- a/standalone/prouter/Cargo.lock +++ b/standalone/prouter/Cargo.lock @@ -941,33 +941,6 @@ dependencies = [ "libc", ] -[[package]] -name = "ethbloom" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60" -dependencies = [ - "crunchy", - "fixed-hash", - "impl-rlp", - "impl-serde", - "tiny-keccak", -] - -[[package]] -name = "ethereum-types" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81224dc661606574f5a0f28c9947d0ee1d93ff11c5f1c4e7272f52e8c0b5483c" -dependencies = [ - "ethbloom", - "fixed-hash", - "impl-rlp", - "impl-serde", - "primitive-types", - "uint", -] - [[package]] name = "event-listener" version = "2.5.3" @@ -1153,7 +1126,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -1176,7 +1149,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.43", @@ -1187,7 +1160,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -1195,6 +1168,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-arithmetic", + "sp-core", "sp-npos-elections", "sp-runtime", "sp-std", @@ -1203,7 +1177,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -1231,7 +1205,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "bitflags", "frame-metadata", @@ -1263,7 +1237,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "Inflector", "cfg-expr", @@ -1277,7 +1251,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1289,7 +1263,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "proc-macro2 1.0.43", "quote 1.0.21", @@ -1299,7 +1273,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "log", @@ -1317,7 +1291,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -1332,7 +1306,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "sp-api", @@ -1341,7 +1315,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "parity-scale-codec", @@ -1497,8 +1471,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] @@ -1750,6 +1726,22 @@ dependencies = [ "want", ] +[[package]] +name = "hyper-rustls" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" +dependencies = [ + "http", + "hyper", + "log", + "rustls", + "rustls-native-certs", + "tokio", + "tokio-rustls", + "webpki-roots", +] + [[package]] name = "hyper-tls" version = "0.5.0" @@ -1835,15 +1827,6 @@ dependencies = [ "parity-scale-codec", ] -[[package]] -name = "impl-rlp" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" -dependencies = [ - "rlp", -] - [[package]] name = "impl-serde" version = "0.4.0" @@ -1940,20 +1923,21 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd0d559d5e679b1ab2f869b486a11182923863b1b3ee8b421763cdd707b783a" +checksum = "7d291e3a5818a2384645fd9756362e6d89cf0541b0b916fa7702ea4a9833608e" dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core", + "jsonrpsee-http-client", "jsonrpsee-types", ] [[package]] name = "jsonrpsee-client-transport" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8752740ecd374bcbf8b69f3e80b0327942df76f793f8d4e60d3355650c31fb74" +checksum = "965de52763f2004bc91ac5bcec504192440f0b568a5d621c59d9dbd6f886c3fb" dependencies = [ "futures-util", "http", @@ -1972,9 +1956,9 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3dc3e9cf2ba50b7b1d7d76a667619f82846caa39e8e8daa8a4962d74acaddca" +checksum = "a4e70b4439a751a5de7dd5ed55eacff78ebf4ffe0fc009cb1ebb11417f5b536b" dependencies = [ "anyhow", "async-lock", @@ -1983,6 +1967,26 @@ dependencies = [ "futures-channel", "futures-timer", "futures-util", + "hyper", + "jsonrpsee-types", + "rustc-hash", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "jsonrpsee-http-client" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc345b0a43c6bc49b947ebeb936e886a419ee3d894421790c969cc56040542ad" +dependencies = [ + "async-trait", + "hyper", + "hyper-rustls", + "jsonrpsee-core", "jsonrpsee-types", "rustc-hash", "serde", @@ -1990,14 +1994,13 @@ dependencies = [ "thiserror", "tokio", "tracing", - "tracing-futures", ] [[package]] name = "jsonrpsee-types" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e290bba767401b646812f608c099b922d8142603c9e73a50fb192d3ac86f4a0d" +checksum = "5bd522fe1ce3702fd94812965d7bb7a3364b1c9aba743944c5a00529aae80f8c" dependencies = [ "anyhow", "beef", @@ -2201,13 +2204,12 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ac11bb793c28fa095b7554466f53b3a60a2cd002afdac01bcf135cbd73a269" +checksum = "5e0c7cba9ce19ac7ffd2053ac9f49843bbd3f4318feedfd74e85c19d5fb0ba66" dependencies = [ "hash-db", "hashbrown", - "parity-util-mem", ] [[package]] @@ -2320,7 +2322,7 @@ dependencies = [ [[package]] name = "node-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-system", "parity-scale-codec", @@ -2506,13 +2508,14 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", "scale-info", + "sp-core", "sp-runtime", "sp-std", ] @@ -2520,7 +2523,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -2536,7 +2539,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -2551,7 +2554,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -2575,7 +2578,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -2595,7 +2598,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -2610,7 +2613,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -2628,7 +2631,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -2647,7 +2650,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -2664,7 +2667,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -2682,7 +2685,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -2706,7 +2709,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -2719,7 +2722,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -2737,7 +2740,7 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -2755,7 +2758,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -2778,7 +2781,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "enumflags2", "frame-benchmarking", @@ -2794,7 +2797,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -2814,7 +2817,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -2831,7 +2834,7 @@ dependencies = [ [[package]] name = "pallet-lottery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -2845,7 +2848,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -2870,7 +2873,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -2886,7 +2889,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -2903,7 +2906,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -2923,7 +2926,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "sp-api", @@ -2933,7 +2936,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -2950,7 +2953,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -2973,7 +2976,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -2990,7 +2993,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -3005,7 +3008,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -3019,7 +3022,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -3034,7 +3037,7 @@ dependencies = [ [[package]] name = "pallet-rmrk-core" version = "0.0.1" -source = "git+https://github.com/Phala-Network/rmrk-substrate?branch=polkadot-v0.9.34#0a9216d4314c78e822854d558835bbce6ffd781f" +source = "git+https://github.com/Phala-Network/rmrk-substrate?branch=polkadot-v0.9.36#b1badc2422193b239b42a328e72c03c7eb6a097d" dependencies = [ "frame-benchmarking", "frame-support", @@ -3052,7 +3055,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -3063,12 +3066,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", + "sp-weights", ] [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -3089,7 +3093,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -3105,7 +3109,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -3119,7 +3123,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -3141,7 +3145,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.43", @@ -3152,7 +3156,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -3166,7 +3170,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -3184,7 +3188,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -3203,7 +3207,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -3219,7 +3223,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -3231,7 +3235,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -3248,7 +3252,7 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -3263,7 +3267,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -3279,7 +3283,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -3318,35 +3322,6 @@ dependencies = [ "syn 1.0.99", ] -[[package]] -name = "parity-util-mem" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d32c34f4f5ca7f9196001c0aba5a1f9a5a12382c8944b8b0f90233282d1e8f8" -dependencies = [ - "cfg-if", - "ethereum-types", - "hashbrown", - "impl-trait-for-tuples", - "lru", - "parity-util-mem-derive", - "parking_lot", - "primitive-types", - "smallvec", - "winapi", -] - -[[package]] -name = "parity-util-mem-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" -dependencies = [ - "proc-macro2 1.0.43", - "syn 1.0.99", - "synstructure", -] - [[package]] name = "parity-wasm" version = "0.45.0" @@ -3650,7 +3625,6 @@ dependencies = [ "sp-io", "sp-offchain", "sp-runtime", - "sp-sandbox", "sp-session", "sp-staking", "sp-std", @@ -3714,7 +3688,6 @@ dependencies = [ "hash-db", "im", "parity-scale-codec", - "parity-util-mem", "scale-info", "serde", "sp-core", @@ -3884,7 +3857,6 @@ checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66" dependencies = [ "fixed-hash", "impl-codec", - "impl-rlp", "impl-serde", "scale-info", "uint", @@ -4427,20 +4399,10 @@ dependencies = [ "winapi", ] -[[package]] -name = "rlp" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "999508abb0ae792aabed2460c45b89106d97fe4adac593bdaef433c2605847b5" -dependencies = [ - "bytes", - "rustc-hex", -] - [[package]] name = "rmrk-traits" version = "0.0.1" -source = "git+https://github.com/Phala-Network/rmrk-substrate?branch=polkadot-v0.9.34#0a9216d4314c78e822854d558835bbce6ffd781f" +source = "git+https://github.com/Phala-Network/rmrk-substrate?branch=polkadot-v0.9.36#b1badc2422193b239b42a328e72c03c7eb6a097d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5009,7 +4971,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "hash-db", "log", @@ -5027,7 +4989,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "blake2", "proc-macro-crate", @@ -5039,7 +5001,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", @@ -5052,7 +5014,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "integer-sqrt", "num-traits", @@ -5067,7 +5029,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", @@ -5080,7 +5042,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "parity-scale-codec", @@ -5092,7 +5054,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "sp-api", @@ -5104,7 +5066,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "futures", @@ -5123,7 +5085,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "merlin", @@ -5146,7 +5108,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", @@ -5160,7 +5122,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", @@ -5173,7 +5135,7 @@ dependencies = [ [[package]] name = "sp-core" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "array-bytes", "base58", @@ -5218,7 +5180,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "blake2", "byteorder", @@ -5232,7 +5194,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "proc-macro2 1.0.43", "quote 1.0.21", @@ -5243,7 +5205,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "proc-macro2 1.0.43", "quote 1.0.21", @@ -5253,7 +5215,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "environmental", "parity-scale-codec", @@ -5264,7 +5226,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "finality-grandpa", "log", @@ -5282,7 +5244,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -5296,7 +5258,7 @@ dependencies = [ [[package]] name = "sp-io" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "bytes", "ed25519-dalek", @@ -5323,7 +5285,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "lazy_static", "sp-core", @@ -5334,7 +5296,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "futures", @@ -5350,7 +5312,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", @@ -5364,7 +5326,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "sp-api", "sp-core", @@ -5374,7 +5336,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "backtrace", "lazy_static", @@ -5384,14 +5346,13 @@ dependencies = [ [[package]] name = "sp-runtime" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "either", "hash256-std-hasher", "impl-trait-for-tuples", "log", "parity-scale-codec", - "parity-util-mem", "paste", "rand 0.7.3", "scale-info", @@ -5407,7 +5368,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -5425,7 +5386,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "Inflector", "proc-macro-crate", @@ -5434,24 +5395,10 @@ dependencies = [ "syn 1.0.99", ] -[[package]] -name = "sp-sandbox" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "log", - "parity-scale-codec", - "sp-core", - "sp-io", - "sp-std", - "sp-wasm-interface", - "wasmi", -] - [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", @@ -5465,10 +5412,11 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", + "sp-core", "sp-runtime", "sp-std", ] @@ -5476,7 +5424,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "hash-db", "log", @@ -5498,12 +5446,12 @@ dependencies = [ [[package]] name = "sp-std" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" [[package]] name = "sp-storage" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "impl-serde", "parity-scale-codec", @@ -5516,7 +5464,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "futures-timer", @@ -5532,7 +5480,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "sp-std", @@ -5544,7 +5492,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "sp-api", "sp-runtime", @@ -5553,7 +5501,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "ahash", "hash-db", @@ -5576,7 +5524,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "impl-serde", "parity-scale-codec", @@ -5593,7 +5541,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "proc-macro2 1.0.43", @@ -5604,7 +5552,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "impl-trait-for-tuples", "log", @@ -5617,7 +5565,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -5771,22 +5719,28 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "subxt" -version = "0.24.0" +version = "0.25.0" dependencies = [ - "bitvec", + "base58", + "blake2", "derivative", "frame-metadata", "futures", + "getrandom 0.2.7", "hex", + "impl-serde", "jsonrpsee", "parity-scale-codec", "parking_lot", + "primitive-types", + "scale-bits", "scale-decode", "scale-info", "scale-value", "serde", "serde_json", "sp-core", + "sp-core-hashing", "sp-runtime", "subxt-macro", "subxt-metadata", @@ -5796,11 +5750,13 @@ dependencies = [ [[package]] name = "subxt-codegen" -version = "0.24.0" +version = "0.25.0" dependencies = [ "darling", "frame-metadata", "heck 0.4.0", + "hex", + "jsonrpsee", "parity-scale-codec", "proc-macro-error", "proc-macro2 1.0.43", @@ -5808,11 +5764,12 @@ dependencies = [ "scale-info", "subxt-metadata", "syn 1.0.99", + "tokio", ] [[package]] name = "subxt-macro" -version = "0.24.0" +version = "0.25.0" dependencies = [ "darling", "proc-macro-error", @@ -5822,12 +5779,12 @@ dependencies = [ [[package]] name = "subxt-metadata" -version = "0.24.0" +version = "0.25.0" dependencies = [ "frame-metadata", "parity-scale-codec", "scale-info", - "sp-core", + "sp-core-hashing", ] [[package]] @@ -6026,15 +5983,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - [[package]] name = "tinyvec" version = "1.6.0" @@ -6176,16 +6124,6 @@ dependencies = [ "valuable", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - [[package]] name = "tracing-log" version = "0.1.3" @@ -6271,7 +6209,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.3", - "rand 0.4.6", + "rand 0.8.5", "static_assertions", ] diff --git a/standalone/pruntime/Cargo.lock b/standalone/pruntime/Cargo.lock index 93c6648d54..0c8797a6f4 100644 --- a/standalone/pruntime/Cargo.lock +++ b/standalone/pruntime/Cargo.lock @@ -1585,33 +1585,6 @@ dependencies = [ "libc", ] -[[package]] -name = "ethbloom" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60" -dependencies = [ - "crunchy", - "fixed-hash", - "impl-rlp", - "impl-serde 0.4.0", - "tiny-keccak", -] - -[[package]] -name = "ethereum-types" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee" -dependencies = [ - "ethbloom", - "fixed-hash", - "impl-rlp", - "impl-serde 0.4.0", - "primitive-types", - "uint", -] - [[package]] name = "event-listener" version = "2.5.3" @@ -1774,7 +1747,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -1797,7 +1770,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.43", @@ -1808,7 +1781,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -1816,6 +1789,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-arithmetic", + "sp-core", "sp-npos-elections", "sp-runtime", "sp-std", @@ -1824,7 +1798,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -1852,7 +1826,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "bitflags", "frame-metadata", @@ -1884,7 +1858,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "Inflector", "cfg-expr", @@ -1898,7 +1872,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1910,7 +1884,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "proc-macro2 1.0.43", "quote 1.0.21", @@ -1920,7 +1894,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "log", @@ -1938,7 +1912,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -1953,7 +1927,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "sp-api", @@ -1962,7 +1936,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "parity-scale-codec", @@ -2595,15 +2569,6 @@ dependencies = [ "parity-scale-codec", ] -[[package]] -name = "impl-rlp" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" -dependencies = [ - "rlp", -] - [[package]] name = "impl-serde" version = "0.3.2" @@ -3163,13 +3128,12 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ac11bb793c28fa095b7554466f53b3a60a2cd002afdac01bcf135cbd73a269" +checksum = "5e0c7cba9ce19ac7ffd2053ac9f49843bbd3f4318feedfd74e85c19d5fb0ba66" dependencies = [ "hash-db", "hashbrown", - "parity-util-mem", ] [[package]] @@ -3294,7 +3258,7 @@ dependencies = [ [[package]] name = "node-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-system", "parity-scale-codec", @@ -3472,13 +3436,14 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", "scale-info", + "sp-core", "sp-runtime", "sp-std", ] @@ -3486,7 +3451,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -3502,7 +3467,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -3517,7 +3482,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -3541,7 +3506,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -3561,7 +3526,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -3576,7 +3541,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -3594,7 +3559,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -3613,7 +3578,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -3630,7 +3595,7 @@ dependencies = [ [[package]] name = "pallet-contracts" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "bitflags", "frame-benchmarking", @@ -3658,7 +3623,7 @@ dependencies = [ [[package]] name = "pallet-contracts-primitives" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "bitflags", "parity-scale-codec", @@ -3670,7 +3635,7 @@ dependencies = [ [[package]] name = "pallet-contracts-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "proc-macro2 1.0.43", "quote 1.0.21", @@ -3680,7 +3645,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -3698,7 +3663,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -3722,7 +3687,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -3735,7 +3700,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -3753,7 +3718,7 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -3771,7 +3736,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -3794,7 +3759,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3810,7 +3775,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -3830,7 +3795,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -3847,7 +3812,7 @@ dependencies = [ [[package]] name = "pallet-lottery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -3861,7 +3826,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -3886,7 +3851,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -3902,7 +3867,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -3919,7 +3884,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -3939,7 +3904,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "sp-api", @@ -3949,7 +3914,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -3966,7 +3931,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -3989,7 +3954,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -4006,7 +3971,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -4021,7 +3986,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -4035,7 +4000,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -4050,7 +4015,7 @@ dependencies = [ [[package]] name = "pallet-rmrk-core" version = "0.0.1" -source = "git+https://github.com/Phala-Network/rmrk-substrate?branch=polkadot-v0.9.34#0a9216d4314c78e822854d558835bbce6ffd781f" +source = "git+https://github.com/Phala-Network/rmrk-substrate?branch=polkadot-v0.9.36#b1badc2422193b239b42a328e72c03c7eb6a097d" dependencies = [ "frame-benchmarking", "frame-support", @@ -4068,7 +4033,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -4079,12 +4044,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", + "sp-weights", ] [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -4105,7 +4071,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -4121,7 +4087,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -4135,7 +4101,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4157,7 +4123,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.43", @@ -4168,7 +4134,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -4182,7 +4148,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -4200,7 +4166,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -4219,7 +4185,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-support", "frame-system", @@ -4235,7 +4201,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -4247,7 +4213,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -4264,7 +4230,7 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -4279,7 +4245,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -4295,7 +4261,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-support", @@ -4334,35 +4300,6 @@ dependencies = [ "syn 1.0.99", ] -[[package]] -name = "parity-util-mem" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d32c34f4f5ca7f9196001c0aba5a1f9a5a12382c8944b8b0f90233282d1e8f8" -dependencies = [ - "cfg-if", - "ethereum-types", - "hashbrown", - "impl-trait-for-tuples", - "lru", - "parity-util-mem-derive", - "parking_lot", - "primitive-types", - "smallvec", - "winapi", -] - -[[package]] -name = "parity-util-mem-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" -dependencies = [ - "proc-macro2 1.0.43", - "syn 1.0.99", - "synstructure", -] - [[package]] name = "parity-wasm" version = "0.45.0" @@ -4739,7 +4676,6 @@ dependencies = [ "sp-io", "sp-offchain", "sp-runtime", - "sp-sandbox", "sp-session", "sp-staking", "sp-std", @@ -4820,7 +4756,6 @@ dependencies = [ "hash-db", "im", "parity-scale-codec", - "parity-util-mem", "scale-info", "serde", "sp-core", @@ -4969,7 +4904,6 @@ dependencies = [ "sp-externalities", "sp-io", "sp-runtime", - "sp-sandbox", "sp-state-machine", "sp-std", "sp-trie", @@ -5080,7 +5014,6 @@ checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66" dependencies = [ "fixed-hash", "impl-codec", - "impl-rlp", "impl-serde 0.4.0", "scale-info", "uint", @@ -5778,20 +5711,10 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc874b127765f014d792f16763a81245ab80500e2ad921ed4ee9e82481ee08fe" -[[package]] -name = "rlp" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec" -dependencies = [ - "bytes", - "rustc-hex", -] - [[package]] name = "rmrk-traits" version = "0.0.1" -source = "git+https://github.com/Phala-Network/rmrk-substrate?branch=polkadot-v0.9.34#0a9216d4314c78e822854d558835bbce6ffd781f" +source = "git+https://github.com/Phala-Network/rmrk-substrate?branch=polkadot-v0.9.36#b1badc2422193b239b42a328e72c03c7eb6a097d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6481,7 +6404,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "hash-db", "log", @@ -6499,7 +6422,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "blake2", "proc-macro-crate", @@ -6511,7 +6434,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", @@ -6524,7 +6447,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "integer-sqrt", "num-traits", @@ -6539,7 +6462,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", @@ -6552,7 +6475,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "parity-scale-codec", @@ -6564,7 +6487,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "sp-api", @@ -6576,7 +6499,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "futures", @@ -6595,7 +6518,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "merlin", @@ -6618,7 +6541,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", @@ -6632,7 +6555,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", @@ -6645,7 +6568,7 @@ dependencies = [ [[package]] name = "sp-core" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "array-bytes", "base58", @@ -6690,7 +6613,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "blake2", "byteorder", @@ -6704,7 +6627,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "proc-macro2 1.0.43", "quote 1.0.21", @@ -6715,7 +6638,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "proc-macro2 1.0.43", "quote 1.0.21", @@ -6725,7 +6648,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "environmental", "parity-scale-codec", @@ -6736,7 +6659,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "finality-grandpa", "log", @@ -6754,7 +6677,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -6768,7 +6691,7 @@ dependencies = [ [[package]] name = "sp-io" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "bytes", "ed25519-dalek", @@ -6795,7 +6718,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "lazy_static", "sp-core", @@ -6806,7 +6729,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "futures", @@ -6822,7 +6745,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", @@ -6836,7 +6759,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "sp-api", "sp-core", @@ -6846,7 +6769,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "backtrace", "lazy_static", @@ -6856,14 +6779,13 @@ dependencies = [ [[package]] name = "sp-runtime" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "either", "hash256-std-hasher", "impl-trait-for-tuples", "log", "parity-scale-codec", - "parity-util-mem", "paste", "rand 0.7.3", "scale-info", @@ -6879,7 +6801,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -6897,7 +6819,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "Inflector", "proc-macro-crate", @@ -6906,24 +6828,10 @@ dependencies = [ "syn 1.0.99", ] -[[package]] -name = "sp-sandbox" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "log", - "parity-scale-codec", - "sp-core", - "sp-io", - "sp-std", - "sp-wasm-interface", - "wasmi 0.13.2", -] - [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", @@ -6937,10 +6845,11 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", + "sp-core", "sp-runtime", "sp-std", ] @@ -6948,7 +6857,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "hash-db", "log", @@ -6970,12 +6879,12 @@ dependencies = [ [[package]] name = "sp-std" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" [[package]] name = "sp-storage" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "impl-serde 0.4.0", "parity-scale-codec", @@ -6988,7 +6897,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "futures-timer", @@ -7004,7 +6913,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "sp-std", @@ -7016,7 +6925,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "sp-api", "sp-runtime", @@ -7025,7 +6934,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "ahash", "hash-db", @@ -7048,7 +6957,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "impl-serde 0.4.0", "parity-scale-codec", @@ -7065,7 +6974,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "proc-macro2 1.0.43", @@ -7076,7 +6985,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "impl-trait-for-tuples", "log", @@ -7089,7 +6998,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7525,15 +7434,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - [[package]] name = "tinyvec" version = "1.6.0" @@ -7790,7 +7690,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.3", - "rand 0.8.5", + "rand 0.4.6", "static_assertions", ] diff --git a/standalone/pruntime/Cargo.toml b/standalone/pruntime/Cargo.toml index e03df8e174..e82e87ef54 100644 --- a/standalone/pruntime/Cargo.toml +++ b/standalone/pruntime/Cargo.toml @@ -48,5 +48,5 @@ rocket = { version = "0.5.0-rc.2", git = "https://github.com/SergioBenitez/Rocke derive_more = { version = "0.99.17", git = "https://github.com/JelteF/derive_more" } # For pink-extension-runtime, it will introduce Substrate from crates-io which usually different with polkadot-branch -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } diff --git a/standalone/replay/Cargo.toml b/standalone/replay/Cargo.toml index ea9828eb8b..584bc6e5b9 100644 --- a/standalone/replay/Cargo.toml +++ b/standalone/replay/Cargo.toml @@ -10,7 +10,7 @@ phala-trie-storage = { path = "../../crates/phala-trie-storage" } phactory = { path = "../../crates/phactory", features = ["gk-stat"] } phactory-api = { path = "../../crates/phactory/api" } pherry = { path = "../pherry" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } log = "0.4.14" anyhow = "1.0.43" diff --git a/standalone/rpc/Cargo.toml b/standalone/rpc/Cargo.toml index 67d753a20f..ef8289e559 100644 --- a/standalone/rpc/Cargo.toml +++ b/standalone/rpc/Cargo.toml @@ -11,25 +11,25 @@ repository = "https://github.com/paritytech/substrate/" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -jsonrpsee = { version = "0.15.1", features = ["server"] } -node-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +jsonrpsee = { version = "0.16.2", features = ["server"] } +node-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } diff --git a/standalone/runtime/Cargo.toml b/standalone/runtime/Cargo.toml index 2072aeb29b..5a338b67d8 100644 --- a/standalone/runtime/Cargo.toml +++ b/standalone/runtime/Cargo.toml @@ -21,90 +21,89 @@ log = { version = "0.4.14", default-features = false } phala-types = { path = "../../crates/phala-types", default-features = false } # primitives -sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -node-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-sandbox = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false, optional = true } +sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +node-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } # frame dependencies -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false, optional = true } -frame-election-provider-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false, optional = true } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false, optional = true } -pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-bags-list = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-child-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-fast-unstake = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-lottery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-nomination-pools = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-nomination-pools-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false, optional = true } -pallet-nomination-pools-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false, optional = true } -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false, features = ["historical"] } -pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false, optional = true } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-society = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-uniques = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false, optional = true } +frame-election-provider-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false, optional = true } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false, optional = true } +pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-bags-list = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-child-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-fast-unstake = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-lottery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-nomination-pools = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-nomination-pools-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false, optional = true } +pallet-nomination-pools-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false, optional = true } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false, features = ["historical"] } +pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false, optional = true } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-society = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-uniques = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } phala-pallets = { path = "../../pallets/phala", default-features = false } pallet-mq-runtime-api = { path = "../../pallets/phala/mq-runtime-api", default-features = false } phat-offchain-rollup = { path = "../../pallets/offchain-rollup", default-features = false } # RMRK dependencies -pallet-rmrk-core = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.34", default-features = false } -rmrk-traits = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.34", default-features = false } +pallet-rmrk-core = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.36", default-features = false } +rmrk-traits = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.36", default-features = false } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", optional = true } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", optional = true } [features] -default = ["std", "include-wasm", "sp-sandbox"] +default = ["std", "include-wasm"] include-wasm = ["substrate-wasm-builder"] with-tracing = ["frame-executive/with-tracing"] std = [ @@ -173,13 +172,11 @@ std = [ "frame-try-runtime?/std", "sp-io/std", "pallet-child-bounties/std", - "sp-sandbox?/std", "pallet-offences-benchmarking?/std", "frame-system-benchmarking?/std", "frame-election-provider-support/std", "phala-pallets/std", "pallet-mq-runtime-api/std", - "sp-sandbox?/std", "pallet-uniques/std", "pallet-rmrk-core/std", "rmrk-traits/std", @@ -267,9 +264,3 @@ try-runtime = [ "phala-pallets/try-runtime", "phat-offchain-rollup/try-runtime", ] -# Force `sp-sandbox` to call into the host resident executor. One still need to make sure -# that `sc-executor` gets the `wasmer-sandbox` feature which happens automatically when -# specified on the command line. -# Don't use that on a production chain. -wasmer-sandbox = ["sp-sandbox/wasmer-sandbox"] - diff --git a/standalone/runtime/src/lib.rs b/standalone/runtime/src/lib.rs index 9c91cb4272..2b46540659 100644 --- a/standalone/runtime/src/lib.rs +++ b/standalone/runtime/src/lib.rs @@ -40,7 +40,9 @@ use frame_support::{ U128CurrencyToVote, WithdrawReasons, }, weights::{ - constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, + constants::{ + BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_REF_TIME_PER_SECOND, + }, IdentityFee, Weight, }, PalletId, RuntimeDebug, @@ -184,7 +186,8 @@ const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10); /// by Operational extrinsics. const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75); /// We allow for 2 seconds of compute with a 6 second average block time, with maximum proof size. -const MAXIMUM_BLOCK_WEIGHT: Weight = WEIGHT_PER_SECOND.saturating_mul(2).set_proof_size(u64::MAX); +const MAXIMUM_BLOCK_WEIGHT: Weight = + Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND.saturating_mul(2), u64::MAX); parameter_types! { pub const BlockHashCount: BlockNumber = 2400; @@ -1839,29 +1842,23 @@ impl_runtime_apis! { #[cfg(feature = "try-runtime")] impl frame_try_runtime::TryRuntime for Runtime { - fn on_runtime_upgrade() -> (Weight, Weight) { + fn on_runtime_upgrade(checks: bool) -> (Weight, Weight) { // NOTE: intentional unwrap: we don't want to propagate the error backwards, and want to // have a backtrace here. If any of the pre/post migration checks fail, we shall stop // right here and right now. - let weight = Executive::try_runtime_upgrade().unwrap(); + let weight = Executive::try_runtime_upgrade(checks).unwrap(); (weight, RuntimeBlockWeights::get().max_block) } fn execute_block( block: Block, state_root_check: bool, + signature_check: bool, select: frame_try_runtime::TryStateSelect ) -> Weight { - log::info!( - target: "node-runtime", - "try-runtime: executing block {:?} / root checks: {:?} / try-state-select: {:?}", - block.header.hash(), - state_root_check, - select, - ); // NOTE: intentional unwrap: we don't want to propagate the error backwards, and want to // have a backtrace here. - Executive::try_execute_block(block, state_root_check, select).unwrap() + Executive::try_execute_block(block, state_root_check, signature_check, select).unwrap() } } } diff --git a/subxt b/subxt index 8d0a847c71..2ef82db9ff 160000 --- a/subxt +++ b/subxt @@ -1 +1 @@ -Subproject commit 8d0a847c71aef953a63b89d05ce440b0f6328ac8 +Subproject commit 2ef82db9ffccc3e58b1ab80a393035392d8905f7 From 3dc73b917fd6112e7027db8380e237b94144df7d Mon Sep 17 00:00:00 2001 From: jasl Date: Wed, 18 Jan 2023 16:52:56 +0800 Subject: [PATCH 2/6] fix compilation --- crates/phactory/src/contracts/pink.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/phactory/src/contracts/pink.rs b/crates/phactory/src/contracts/pink.rs index f1eb590db9..fd1d4e5d20 100644 --- a/crates/phactory/src/contracts/pink.rs +++ b/crates/phactory/src/contracts/pink.rs @@ -131,7 +131,7 @@ impl Pink { block_number: context.block_number, storage, transfer, - gas_limit: WEIGHT_REF_TIME_PER_SECOND * 10, + gas_limit: Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND * 10, u64::MAX), gas_free: true, storage_deposit_limit: None, callbacks: ContractEventCallback::from_log_sender( @@ -202,7 +202,7 @@ impl Pink { block_number: context.block_number, storage, transfer, - gas_limit: WEIGHT_PER_SECOND * 10, + gas_limit: Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND * 10, u64::MAX), gas_free: true, storage_deposit_limit: None, callbacks: ContractEventCallback::from_log_sender( From 69235cac4123ae124d938d12afaf7ff9191dd4da Mon Sep 17 00:00:00 2001 From: Kevin Wang Date: Thu, 19 Jan 2023 06:57:02 +0000 Subject: [PATCH 3/6] Update subxt to latest and fix issues --- Cargo.lock | 1482 ++++++++++------- crates/phaxt/Cargo.toml | 2 + crates/phaxt/src/chain_api.rs | 4 +- crates/phaxt/src/lib.rs | 50 +- crates/phaxt/src/rpc.rs | 3 +- .../pink-drivers/sidevm_deployer/Cargo.toml | 2 +- e2e/res/check_system/sideprog.wasm | Bin 77293 -> 77293 bytes e2e/res/check_system/sideprog.wasm.hash | 3 +- .../target/ink/check_system.contract | 2 +- e2e/res/log_server.contract | 2 +- e2e/res/log_server.sidevm.wasm | Bin 205242 -> 205242 bytes e2e/res/sidevm_deployer.contract | 2 +- e2e/res/system.contract | 2 +- e2e/src/fullstack.js | 1 + standalone/pherry/src/endpoint.rs | 3 +- standalone/pherry/src/headers_cache.rs | 29 +- standalone/pherry/src/lib.rs | 67 +- standalone/pherry/src/msg_sync.rs | 9 +- standalone/pherry/src/types.rs | 61 +- standalone/replay/Cargo.toml | 1 + standalone/replay/src/replay_gk.rs | 2 +- standalone/replay/src/replay_gk/httpserver.rs | 2 +- subxt | 2 +- 23 files changed, 1077 insertions(+), 654 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index da1f2a0e5d..75860b431f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -765,7 +765,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb dependencies = [ "sp-api", "sp-beefy", - "sp-runtime", + "sp-runtime 7.0.0", ] [[package]] @@ -2265,8 +2265,8 @@ dependencies = [ "phala-pallets", "phala-types", "sc-finality-grandpa", - "sp-core", - "sp-runtime", + "sp-core 7.0.0", + "sp-runtime 7.0.0", "tokio", ] @@ -3019,13 +3019,13 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto", - "sp-core", - "sp-io", - "sp-runtime", - "sp-runtime-interface", - "sp-std", - "sp-storage", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-runtime-interface 7.0.0", + "sp-std 5.0.0", + "sp-storage 7.0.0", ] [[package]] @@ -3065,16 +3065,16 @@ dependencies = [ "serde_nanos", "sp-api", "sp-blockchain", - "sp-core", + "sp-core 7.0.0", "sp-database", - "sp-externalities", + "sp-externalities 0.13.0", "sp-inherents", - "sp-keystore", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-storage", - "sp-trie", + "sp-keystore 0.13.0", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", + "sp-std 5.0.0", + "sp-storage 7.0.0", + "sp-trie 7.0.0", "tempfile", "thiserror", "thousands", @@ -3101,11 +3101,11 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-arithmetic", - "sp-core", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", "sp-npos-elections", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -3118,11 +3118,11 @@ dependencies = [ "frame-try-runtime", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "sp-tracing", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", + "sp-tracing 6.0.0", ] [[package]] @@ -3148,9 +3148,9 @@ dependencies = [ "parity-scale-codec", "serde", "serde_json", - "sp-core", - "sp-io", - "sp-runtime", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", "sp-version", "substrate-rpc-client", "tokio", @@ -3174,17 +3174,17 @@ dependencies = [ "serde", "smallvec", "sp-api", - "sp-arithmetic", - "sp-core", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", "sp-core-hashing-proc-macro", "sp-inherents", - "sp-io", - "sp-runtime", + "sp-io 7.0.0", + "sp-runtime 7.0.0", "sp-staking", - "sp-state-machine", - "sp-std", - "sp-tracing", - "sp-weights", + "sp-state-machine 0.13.0", + "sp-std 5.0.0", + "sp-tracing 6.0.0", + "sp-weights 4.0.0", "tt-call", ] @@ -3237,12 +3237,12 @@ dependencies = [ "rustversion", "scale-info", "serde", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-state-machine", - "sp-std", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", + "sp-std 5.0.0", "sp-version", "trybuild", ] @@ -3268,12 +3268,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "sp-version", - "sp-weights", + "sp-weights 4.0.0", ] [[package]] @@ -3286,9 +3286,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -3308,8 +3308,8 @@ dependencies = [ "frame-support", "parity-scale-codec", "sp-api", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -5815,16 +5815,16 @@ dependencies = [ "phala-node-runtime", "sc-executor", "scale-info", - "sp-application-crypto", + "sp-application-crypto 7.0.0", "sp-consensus-babe", - "sp-core", - "sp-externalities", + "sp-core 7.0.0", + "sp-externalities 0.13.0", "sp-keyring", - "sp-keystore", - "sp-runtime", - "sp-state-machine", - "sp-tracing", - "sp-trie", + "sp-keystore 0.13.0", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", + "sp-tracing 6.0.0", + "sp-trie 7.0.0", "wat", ] @@ -5840,8 +5840,8 @@ dependencies = [ "sc-executor", "sc-service", "sp-blockchain", - "sp-core", - "sp-runtime", + "sp-core 7.0.0", + "sp-runtime 7.0.0", "thiserror", ] @@ -5853,9 +5853,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-application-crypto", - "sp-core", - "sp-runtime", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", + "sp-runtime 7.0.0", ] [[package]] @@ -5881,8 +5881,8 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-keystore", - "sp-runtime", + "sp-keystore 0.13.0", + "sp-runtime 7.0.0", "substrate-frame-rpc-system", ] @@ -6157,9 +6157,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -6172,10 +6172,10 @@ dependencies = [ "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto", + "sp-application-crypto 7.0.0", "sp-authority-discovery", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -6189,8 +6189,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-authorship", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -6207,14 +6207,14 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto", + "sp-application-crypto 7.0.0", "sp-consensus-babe", "sp-consensus-vrf", - "sp-io", - "sp-runtime", + "sp-io 7.0.0", + "sp-runtime 7.0.0", "sp-session", "sp-staking", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -6230,11 +6230,11 @@ dependencies = [ "pallet-balances", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "sp-tracing", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", + "sp-tracing 6.0.0", ] [[package]] @@ -6248,8 +6248,8 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -6264,10 +6264,10 @@ dependencies = [ "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -6283,10 +6283,10 @@ dependencies = [ "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -6300,10 +6300,10 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -6325,10 +6325,10 @@ dependencies = [ "serde", "smallvec", "sp-api", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "wasm-instrument 0.4.0", "wasmi 0.20.0", "wasmparser-nostd", @@ -6341,9 +6341,9 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb dependencies = [ "bitflags", "parity-scale-codec", - "sp-runtime", - "sp-std", - "sp-weights", + "sp-runtime 7.0.0", + "sp-std 5.0.0", + "sp-weights 4.0.0", ] [[package]] @@ -6368,10 +6368,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -6388,12 +6388,12 @@ dependencies = [ "parity-scale-codec", "rand 0.7.3", "scale-info", - "sp-arithmetic", - "sp-core", - "sp-io", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", "sp-npos-elections", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "static_assertions", "strum", ] @@ -6408,7 +6408,7 @@ dependencies = [ "frame-system", "parity-scale-codec", "sp-npos-elections", - "sp-runtime", + "sp-runtime 7.0.0", ] [[package]] @@ -6422,11 +6422,11 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", + "sp-core 7.0.0", + "sp-io 7.0.0", "sp-npos-elections", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -6441,10 +6441,10 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", + "sp-io 7.0.0", + "sp-runtime 7.0.0", "sp-staking", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -6460,14 +6460,14 @@ dependencies = [ "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto", - "sp-core", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", "sp-finality-grandpa", - "sp-io", - "sp-runtime", + "sp-io 7.0.0", + "sp-runtime 7.0.0", "sp-session", "sp-staking", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -6481,9 +6481,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -6498,12 +6498,12 @@ dependencies = [ "pallet-authorship", "parity-scale-codec", "scale-info", - "sp-application-crypto", - "sp-core", - "sp-io", - "sp-runtime", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", "sp-staking", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -6516,11 +6516,11 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", + "sp-core 7.0.0", + "sp-io 7.0.0", "sp-keyring", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -6533,8 +6533,8 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -6548,10 +6548,10 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -6573,9 +6573,9 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -6588,11 +6588,11 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", "sp-staking", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -6609,10 +6609,10 @@ dependencies = [ "pallet-staking", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-runtime-interface", + "sp-runtime 7.0.0", + "sp-runtime-interface 7.0.0", "sp-staking", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -6622,7 +6622,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb dependencies = [ "parity-scale-codec", "sp-api", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -6637,9 +6637,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-runtime", + "sp-runtime 7.0.0", "sp-staking", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -6660,9 +6660,9 @@ dependencies = [ "pallet-staking", "parity-scale-codec", "scale-info", - "sp-runtime", + "sp-runtime 7.0.0", "sp-staking", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -6676,10 +6676,10 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -6692,9 +6692,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -6707,8 +6707,8 @@ dependencies = [ "parity-scale-codec", "safe-mix", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -6721,9 +6721,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -6740,8 +6740,8 @@ dependencies = [ "rmrk-traits", "scale-info", "serde", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -6755,10 +6755,10 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", - "sp-weights", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", + "sp-weights 4.0.0", ] [[package]] @@ -6773,13 +6773,13 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", "sp-session", "sp-staking", - "sp-std", - "sp-trie", + "sp-std 5.0.0", + "sp-trie 7.0.0", ] [[package]] @@ -6793,9 +6793,9 @@ dependencies = [ "pallet-session", "pallet-staking", "rand 0.7.3", - "sp-runtime", + "sp-runtime 7.0.0", "sp-session", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -6808,8 +6808,8 @@ dependencies = [ "parity-scale-codec", "rand_chacha 0.2.2", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -6828,11 +6828,11 @@ dependencies = [ "rand_chacha 0.2.2", "scale-info", "serde", - "sp-application-crypto", - "sp-io", - "sp-runtime", + "sp-application-crypto 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", "sp-staking", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -6855,9 +6855,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -6872,9 +6872,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-inherents", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "sp-timestamp", ] @@ -6891,10 +6891,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -6907,10 +6907,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -6923,10 +6923,10 @@ dependencies = [ "parity-scale-codec", "sp-api", "sp-blockchain", - "sp-core", + "sp-core 7.0.0", "sp-rpc", - "sp-runtime", - "sp-weights", + "sp-runtime 7.0.0", + "sp-weights 4.0.0", ] [[package]] @@ -6937,8 +6937,8 @@ dependencies = [ "pallet-transaction-payment", "parity-scale-codec", "sp-api", - "sp-runtime", - "sp-weights", + "sp-runtime 7.0.0", + "sp-weights 4.0.0", ] [[package]] @@ -6954,8 +6954,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -6969,8 +6969,8 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -6983,10 +6983,10 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -7000,8 +7000,8 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -7149,6 +7149,15 @@ dependencies = [ "crypto-mac 0.11.1", ] +[[package]] +name = "pbkdf2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +dependencies = [ + "digest 0.10.3", +] + [[package]] name = "pear" version = "0.2.3" @@ -7297,15 +7306,15 @@ dependencies = [ "serde_path_to_error", "sgx-api-lite", "sidevm-host-runtime", - "sp-application-crypto", - "sp-core", - "sp-externalities", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", + "sp-externalities 0.13.0", "sp-finality-grandpa", - "sp-io", - "sp-runtime", - "sp-runtime-interface", - "sp-state-machine", - "sp-trie", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-runtime-interface 7.0.0", + "sp-state-machine 0.13.0", + "sp-trie 7.0.0", "surf", "thiserror", "tokio", @@ -7336,10 +7345,10 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-application-crypto", - "sp-core", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", "sp-finality-grandpa", - "sp-runtime", + "sp-runtime 7.0.0", "tempdir", "tera", ] @@ -7376,8 +7385,8 @@ dependencies = [ "rand 0.8.5", "ring 0.16.20", "schnorrkel", - "sp-application-crypto", - "sp-core", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", "typenum", ] @@ -7393,7 +7402,7 @@ dependencies = [ "phala-serde-more", "scale-info", "serde", - "sp-core", + "sp-core 7.0.0", "spin 0.9.3", ] @@ -7462,16 +7471,16 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core", + "sp-core 7.0.0", "sp-finality-grandpa", "sp-inherents", - "sp-io", + "sp-io 7.0.0", "sp-keyring", - "sp-keystore", - "sp-runtime", - "sp-state-machine", + "sp-keystore 0.13.0", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", "sp-timestamp", - "sp-tracing", + "sp-tracing 6.0.0", "sp-transaction-pool", "sp-transaction-storage-proof", "substrate-build-script-utils", @@ -7505,7 +7514,7 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-runtime", + "sp-runtime 7.0.0", "thiserror", ] @@ -7590,14 +7599,14 @@ dependencies = [ "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core", + "sp-core 7.0.0", "sp-inherents", - "sp-io", + "sp-io 7.0.0", "sp-offchain", - "sp-runtime", + "sp-runtime 7.0.0", "sp-session", "sp-staking", - "sp-std", + "sp-std 5.0.0", "sp-transaction-pool", "sp-version", "static_assertions", @@ -7639,11 +7648,11 @@ dependencies = [ "rmrk-traits", "scale-info", "serde_json", - "sp-application-crypto", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "untrusted 0.9.0", "webpki 0.22.0", "webpki 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -7673,7 +7682,7 @@ dependencies = [ "hex", "parity-scale-codec", "serde", - "sp-core", + "sp-core 7.0.0", ] [[package]] @@ -7690,11 +7699,11 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-application-crypto", - "sp-core", - "sp-runtime", - "sp-state-machine", - "sp-trie", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", + "sp-trie 7.0.0", "trie-db", ] @@ -7708,7 +7717,7 @@ dependencies = [ "prpc", "scale-info", "serde", - "sp-core", + "sp-core 7.0.0", ] [[package]] @@ -7729,11 +7738,11 @@ dependencies = [ "pink-kv-session", "primitive-types", "scale-info", - "sp-application-crypto", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -7746,9 +7755,11 @@ dependencies = [ "phala-node-rpc-ext-types", "phala-pallets", "phala-types", + "primitive-types", "scale-info", "serde", "serde_json", + "sp-core 11.0.0", "subxt", "tokio", ] @@ -7782,9 +7793,9 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-core", + "sp-core 7.0.0", "sp-finality-grandpa", - "sp-runtime", + "sp-runtime 7.0.0", "tokio", ] @@ -7900,13 +7911,13 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.2", - "sp-core", - "sp-externalities", - "sp-io", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", + "sp-core 7.0.0", + "sp-externalities 0.13.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", + "sp-std 5.0.0", + "sp-trie 7.0.0", "wasmi-validation", "wat", ] @@ -7955,8 +7966,8 @@ dependencies = [ "reqwest", "reqwest-env-proxy", "ring 0.16.20", - "sp-core", - "sp-runtime-interface", + "sp-core 7.0.0", + "sp-runtime-interface 7.0.0", ] [[package]] @@ -8005,7 +8016,7 @@ dependencies = [ "primitive-types", "scale-info", "serde", - "sp-core-hashing", + "sp-core-hashing 5.0.0", "ss58-registry", "xcm", ] @@ -8848,7 +8859,8 @@ dependencies = [ "serde", "serde_cbor", "serde_json", - "sp-core", + "sp-core 7.0.0", + "sp-runtime 7.0.0", "sqlx", "tokio", ] @@ -9017,8 +9029,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -9328,8 +9340,8 @@ version = "4.1.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "log", - "sp-core", - "sp-wasm-interface", + "sp-core 7.0.0", + "sp-wasm-interface 7.0.0", "thiserror", ] @@ -9353,9 +9365,9 @@ dependencies = [ "sp-api", "sp-authority-discovery", "sp-blockchain", - "sp-core", - "sp-keystore", - "sp-runtime", + "sp-core 7.0.0", + "sp-keystore 0.13.0", + "sp-runtime 7.0.0", "substrate-prometheus-endpoint", "thiserror", ] @@ -9377,9 +9389,9 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core", + "sp-core 7.0.0", "sp-inherents", - "sp-runtime", + "sp-runtime 7.0.0", "substrate-prometheus-endpoint", ] @@ -9393,10 +9405,10 @@ dependencies = [ "sp-api", "sp-block-builder", "sp-blockchain", - "sp-core", + "sp-core 7.0.0", "sp-inherents", - "sp-runtime", - "sp-state-machine", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", ] [[package]] @@ -9412,8 +9424,8 @@ dependencies = [ "sc-telemetry", "serde", "serde_json", - "sp-core", - "sp-runtime", + "sp-core 7.0.0", + "sp-runtime 7.0.0", ] [[package]] @@ -9456,14 +9468,14 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core", + "sp-core 7.0.0", "sp-keyring", - "sp-keystore", - "sp-panic-handler", - "sp-runtime", + "sp-keystore 0.13.0", + "sp-panic-handler 5.0.0", + "sp-runtime 7.0.0", "sp-version", "thiserror", - "tiny-bip39", + "tiny-bip39 0.8.2", "tokio", ] @@ -9484,14 +9496,14 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core", + "sp-core 7.0.0", "sp-database", - "sp-externalities", - "sp-keystore", - "sp-runtime", - "sp-state-machine", - "sp-storage", - "sp-trie", + "sp-externalities 0.13.0", + "sp-keystore 0.13.0", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", + "sp-storage 7.0.0", + "sp-trie 7.0.0", "substrate-prometheus-endpoint", ] @@ -9511,13 +9523,13 @@ dependencies = [ "parking_lot 0.12.1", "sc-client-api", "sc-state-db", - "sp-arithmetic", + "sp-arithmetic 6.0.0", "sp-blockchain", - "sp-core", + "sp-core 7.0.0", "sp-database", - "sp-runtime", - "sp-state-machine", - "sp-trie", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", + "sp-trie 7.0.0", ] [[package]] @@ -9538,9 +9550,9 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-runtime", - "sp-state-machine", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", "substrate-prometheus-endpoint", "thiserror", ] @@ -9569,18 +9581,18 @@ dependencies = [ "schnorrkel", "serde", "sp-api", - "sp-application-crypto", + "sp-application-crypto 7.0.0", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core", + "sp-core 7.0.0", "sp-inherents", - "sp-io", - "sp-keystore", - "sp-runtime", + "sp-io 7.0.0", + "sp-keystore 0.13.0", + "sp-runtime 7.0.0", "sp-version", "substrate-prometheus-endpoint", "thiserror", @@ -9598,13 +9610,13 @@ dependencies = [ "sc-rpc-api", "serde", "sp-api", - "sp-application-crypto", + "sp-application-crypto 7.0.0", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core", - "sp-keystore", - "sp-runtime", + "sp-core 7.0.0", + "sp-keystore 0.13.0", + "sp-runtime 7.0.0", "thiserror", ] @@ -9618,7 +9630,7 @@ dependencies = [ "sc-client-api", "sc-consensus", "sp-blockchain", - "sp-runtime", + "sp-runtime 7.0.0", ] [[package]] @@ -9634,14 +9646,14 @@ dependencies = [ "sc-client-api", "sc-consensus", "sc-telemetry", - "sp-arithmetic", + "sp-arithmetic 6.0.0", "sp-blockchain", "sp-consensus", "sp-consensus-slots", - "sp-core", + "sp-core 7.0.0", "sp-inherents", - "sp-runtime", - "sp-state-machine", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", "thiserror", ] @@ -9652,7 +9664,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb dependencies = [ "sc-client-api", "sp-authorship", - "sp-runtime", + "sp-runtime 7.0.0", "thiserror", ] @@ -9668,14 +9680,14 @@ dependencies = [ "sc-executor-wasmi", "sc-executor-wasmtime", "sp-api", - "sp-core", - "sp-externalities", - "sp-io", - "sp-panic-handler", - "sp-runtime-interface", - "sp-trie", + "sp-core 7.0.0", + "sp-externalities 0.13.0", + "sp-io 7.0.0", + "sp-panic-handler 5.0.0", + "sp-runtime-interface 7.0.0", + "sp-trie 7.0.0", "sp-version", - "sp-wasm-interface", + "sp-wasm-interface 7.0.0", "tracing", "wasmi 0.13.2", ] @@ -9687,7 +9699,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", - "sp-wasm-interface", + "sp-wasm-interface 7.0.0", "thiserror", "wasm-instrument 0.3.0", "wasmi 0.13.2", @@ -9701,8 +9713,8 @@ dependencies = [ "log", "sc-allocator", "sc-executor-common", - "sp-runtime-interface", - "sp-wasm-interface", + "sp-runtime-interface 7.0.0", + "sp-wasm-interface 7.0.0", "wasmi 0.13.2", ] @@ -9718,8 +9730,8 @@ dependencies = [ "rustix", "sc-allocator", "sc-executor-common", - "sp-runtime-interface", - "sp-wasm-interface", + "sp-runtime-interface 7.0.0", + "sp-wasm-interface 7.0.0", "wasmtime", ] @@ -9752,14 +9764,14 @@ dependencies = [ "sc-utils", "serde_json", "sp-api", - "sp-application-crypto", - "sp-arithmetic", + "sp-application-crypto 7.0.0", + "sp-arithmetic 6.0.0", "sp-blockchain", "sp-consensus", - "sp-core", + "sp-core 7.0.0", "sp-finality-grandpa", - "sp-keystore", - "sp-runtime", + "sp-keystore 0.13.0", + "sp-runtime 7.0.0", "substrate-prometheus-endpoint", "thiserror", ] @@ -9780,8 +9792,8 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core", - "sp-runtime", + "sp-core 7.0.0", + "sp-runtime 7.0.0", "thiserror", ] @@ -9798,7 +9810,7 @@ dependencies = [ "sc-network-common", "sc-transaction-pool-api", "sp-blockchain", - "sp-runtime", + "sp-runtime 7.0.0", ] [[package]] @@ -9810,9 +9822,9 @@ dependencies = [ "async-trait", "parking_lot 0.12.1", "serde_json", - "sp-application-crypto", - "sp-core", - "sp-keystore", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", + "sp-keystore 0.13.0", "thiserror", ] @@ -9852,11 +9864,11 @@ dependencies = [ "serde", "serde_json", "smallvec", - "sp-arithmetic", + "sp-arithmetic 6.0.0", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-runtime", + "sp-core 7.0.0", + "sp-runtime 7.0.0", "substrate-prometheus-endpoint", "thiserror", "unsigned-varint", @@ -9877,7 +9889,7 @@ dependencies = [ "sc-client-api", "sc-network-common", "sp-blockchain", - "sp-runtime", + "sp-runtime 7.0.0", "thiserror", "unsigned-varint", "void", @@ -9904,7 +9916,7 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-finality-grandpa", - "sp-runtime", + "sp-runtime 7.0.0", "substrate-prometheus-endpoint", "thiserror", ] @@ -9922,7 +9934,7 @@ dependencies = [ "lru", "sc-network-common", "sc-peerset", - "sp-runtime", + "sp-runtime 7.0.0", "substrate-prometheus-endpoint", "tracing", ] @@ -9943,8 +9955,8 @@ dependencies = [ "sc-network-common", "sc-peerset", "sp-blockchain", - "sp-core", - "sp-runtime", + "sp-core 7.0.0", + "sp-runtime 7.0.0", "thiserror", ] @@ -9970,12 +9982,12 @@ dependencies = [ "sc-peerset", "sc-utils", "smallvec", - "sp-arithmetic", + "sp-arithmetic 6.0.0", "sp-blockchain", "sp-consensus", - "sp-core", + "sp-core 7.0.0", "sp-finality-grandpa", - "sp-runtime", + "sp-runtime 7.0.0", "substrate-prometheus-endpoint", "thiserror", ] @@ -9995,7 +10007,7 @@ dependencies = [ "sc-network-common", "sc-peerset", "sp-consensus", - "sp-runtime", + "sp-runtime 7.0.0", "substrate-prometheus-endpoint", ] @@ -10022,9 +10034,9 @@ dependencies = [ "sc-peerset", "sc-utils", "sp-api", - "sp-core", + "sp-core 7.0.0", "sp-offchain", - "sp-runtime", + "sp-runtime 7.0.0", "threadpool", "tracing", ] @@ -10072,11 +10084,11 @@ dependencies = [ "serde_json", "sp-api", "sp-blockchain", - "sp-core", - "sp-keystore", + "sp-core 7.0.0", + "sp-keystore 0.13.0", "sp-offchain", "sp-rpc", - "sp-runtime", + "sp-runtime 7.0.0", "sp-session", "sp-version", ] @@ -10096,10 +10108,10 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-core", + "sp-core 7.0.0", "sp-rpc", - "sp-runtime", - "sp-tracing", + "sp-runtime 7.0.0", + "sp-tracing 6.0.0", "sp-version", "thiserror", ] @@ -10134,8 +10146,8 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-core", - "sp-runtime", + "sp-core 7.0.0", + "sp-runtime 7.0.0", "thiserror", ] @@ -10183,22 +10195,22 @@ dependencies = [ "serde", "serde_json", "sp-api", - "sp-application-crypto", + "sp-application-crypto 7.0.0", "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-externalities", + "sp-core 7.0.0", + "sp-externalities 0.13.0", "sp-inherents", - "sp-keystore", - "sp-runtime", + "sp-keystore 0.13.0", + "sp-runtime 7.0.0", "sp-session", - "sp-state-machine", - "sp-storage", - "sp-tracing", + "sp-state-machine 0.13.0", + "sp-storage 7.0.0", + "sp-tracing 6.0.0", "sp-transaction-pool", "sp-transaction-storage-proof", - "sp-trie", + "sp-trie 7.0.0", "sp-version", "static_init", "substrate-prometheus-endpoint", @@ -10232,15 +10244,15 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-externalities", - "sp-io", - "sp-panic-handler", - "sp-runtime", - "sp-state-machine", - "sp-storage", - "sp-tracing", - "sp-trie", + "sp-core 7.0.0", + "sp-externalities 0.13.0", + "sp-io 7.0.0", + "sp-panic-handler 5.0.0", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", + "sp-storage 7.0.0", + "sp-tracing 6.0.0", + "sp-trie 7.0.0", "substrate-test-runtime", "substrate-test-runtime-client", "tempfile", @@ -10256,7 +10268,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "sc-client-api", - "sp-core", + "sp-core 7.0.0", ] [[package]] @@ -10274,7 +10286,7 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-runtime", + "sp-runtime 7.0.0", "thiserror", ] @@ -10292,9 +10304,9 @@ dependencies = [ "sc-telemetry", "serde", "serde_json", - "sp-core", - "sp-io", - "sp-std", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -10336,10 +10348,10 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-core", + "sp-core 7.0.0", "sp-rpc", - "sp-runtime", - "sp-tracing", + "sp-runtime 7.0.0", + "sp-tracing 6.0.0", "thiserror", "tracing", "tracing-log", @@ -10375,9 +10387,9 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-core", - "sp-runtime", - "sp-tracing", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-tracing 6.0.0", "sp-transaction-pool", "substrate-prometheus-endpoint", "thiserror", @@ -10393,7 +10405,7 @@ dependencies = [ "log", "serde", "sp-blockchain", - "sp-runtime", + "sp-runtime 7.0.0", "thiserror", ] @@ -11161,11 +11173,11 @@ dependencies = [ "log", "parity-scale-codec", "sp-api-proc-macro", - "sp-core", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", + "sp-std 5.0.0", + "sp-trie 7.0.0", "sp-version", "thiserror", ] @@ -11190,9 +11202,23 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-std", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-std 5.0.0", +] + +[[package]] +name = "sp-application-crypto" +version = "12.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a72575f160b1b134ee277a2ab46af4361c072a3fe661c48e474255406cb01c97" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 11.0.0", + "sp-io 12.0.0", + "sp-std 6.0.0", ] [[package]] @@ -11205,8 +11231,23 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-debug-derive", - "sp-std", + "sp-debug-derive 5.0.0", + "sp-std 5.0.0", + "static_assertions", +] + +[[package]] +name = "sp-arithmetic" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2038010f7514d50775dcbd3edb569e17fa9bda63128580a9e172abb1795f2c1d" +dependencies = [ + "integer-sqrt", + "num-traits", + "parity-scale-codec", + "scale-info", + "serde", + "sp-std 6.0.0", "static_assertions", ] @@ -11218,9 +11259,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-application-crypto", - "sp-runtime", - "sp-std", + "sp-application-crypto 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -11231,8 +11272,8 @@ dependencies = [ "async-trait", "parity-scale-codec", "sp-inherents", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -11244,12 +11285,12 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto", - "sp-core", - "sp-io", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", "sp-mmr-primitives", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -11260,8 +11301,8 @@ dependencies = [ "parity-scale-codec", "sp-api", "sp-inherents", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -11277,8 +11318,8 @@ dependencies = [ "sp-api", "sp-consensus", "sp-database", - "sp-runtime", - "sp-state-machine", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", "thiserror", ] @@ -11292,11 +11333,11 @@ dependencies = [ "futures-timer", "log", "parity-scale-codec", - "sp-core", + "sp-core 7.0.0", "sp-inherents", - "sp-runtime", - "sp-state-machine", - "sp-std", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", + "sp-std 5.0.0", "sp-version", "thiserror", ] @@ -11310,12 +11351,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-application-crypto", + "sp-application-crypto 7.0.0", "sp-consensus", "sp-consensus-slots", "sp-inherents", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "sp-timestamp", ] @@ -11330,15 +11371,15 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto", + "sp-application-crypto 7.0.0", "sp-consensus", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core", + "sp-core 7.0.0", "sp-inherents", - "sp-keystore", - "sp-runtime", - "sp-std", + "sp-keystore 0.13.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "sp-timestamp", ] @@ -11350,9 +11391,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-runtime", - "sp-std", + "sp-arithmetic 6.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "sp-timestamp", ] @@ -11364,9 +11405,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "schnorrkel", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -11400,20 +11441,63 @@ dependencies = [ "secp256k1", "secrecy", "serde", - "sp-core-hashing", - "sp-debug-derive", - "sp-externalities", - "sp-runtime-interface", - "sp-std", - "sp-storage", + "sp-core-hashing 5.0.0", + "sp-debug-derive 5.0.0", + "sp-externalities 0.13.0", + "sp-runtime-interface 7.0.0", + "sp-std 5.0.0", + "sp-storage 7.0.0", "ss58-registry", "substrate-bip39", "thiserror", - "tiny-bip39", + "tiny-bip39 0.8.2", "wasmi 0.13.2", "zeroize", ] +[[package]] +name = "sp-core" +version = "11.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d99984f57c9eb858d29fbe0e4cf44092eec484b2ff72176d5afa4ab7bf1dc8b1" +dependencies = [ + "array-bytes", + "base58", + "bitflags", + "blake2", + "dyn-clonable", + "ed25519-zebra", + "futures", + "hash-db", + "hash256-std-hasher", + "impl-serde 0.4.0", + "lazy_static", + "libsecp256k1", + "log", + "merlin", + "parity-scale-codec", + "parking_lot 0.12.1", + "primitive-types", + "rand 0.8.5", + "regex", + "scale-info", + "schnorrkel", + "secp256k1", + "secrecy", + "serde", + "sp-core-hashing 6.0.0", + "sp-debug-derive 6.0.0", + "sp-externalities 0.15.0", + "sp-runtime-interface 10.0.0", + "sp-std 6.0.0", + "sp-storage 9.0.0", + "ss58-registry", + "substrate-bip39", + "thiserror", + "tiny-bip39 1.0.0", + "zeroize", +] + [[package]] name = "sp-core-hashing" version = "5.0.0" @@ -11424,7 +11508,22 @@ dependencies = [ "digest 0.10.3", "sha2 0.10.2", "sha3", - "sp-std", + "sp-std 5.0.0", + "twox-hash", +] + +[[package]] +name = "sp-core-hashing" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbc2d1947252b7a4e403b0a260f596920443742791765ec111daa2bbf98eff25" +dependencies = [ + "blake2", + "byteorder", + "digest 0.10.3", + "sha2 0.10.2", + "sha3", + "sp-std 6.0.0", "twox-hash", ] @@ -11435,7 +11534,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb dependencies = [ "proc-macro2 1.0.47", "quote 1.0.20", - "sp-core-hashing", + "sp-core-hashing 5.0.0", "syn 1.0.98", ] @@ -11458,6 +11557,17 @@ dependencies = [ "syn 1.0.98", ] +[[package]] +name = "sp-debug-derive" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fb9dc63d54de7d7bed62a505b6e0bd66c122525ea1abb348f6564717c3df2d" +dependencies = [ + "proc-macro2 1.0.47", + "quote 1.0.20", + "syn 1.0.98", +] + [[package]] name = "sp-externalities" version = "0.13.0" @@ -11465,8 +11575,20 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb dependencies = [ "environmental", "parity-scale-codec", - "sp-std", - "sp-storage", + "sp-std 5.0.0", + "sp-storage 7.0.0", +] + +[[package]] +name = "sp-externalities" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc754e1cec66b93df0b48a8986d019c1a2a90431c42cf2614cc35a291597c329" +dependencies = [ + "environmental", + "parity-scale-codec", + "sp-std 6.0.0", + "sp-storage 9.0.0", ] [[package]] @@ -11480,11 +11602,11 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto", - "sp-core", - "sp-keystore", - "sp-runtime", - "sp-std", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", + "sp-keystore 0.13.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -11495,9 +11617,9 @@ dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "thiserror", ] @@ -11515,15 +11637,41 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "secp256k1", - "sp-core", - "sp-externalities", - "sp-keystore", - "sp-runtime-interface", - "sp-state-machine", - "sp-std", - "sp-tracing", - "sp-trie", - "sp-wasm-interface", + "sp-core 7.0.0", + "sp-externalities 0.13.0", + "sp-keystore 0.13.0", + "sp-runtime-interface 7.0.0", + "sp-state-machine 0.13.0", + "sp-std 5.0.0", + "sp-tracing 6.0.0", + "sp-trie 7.0.0", + "sp-wasm-interface 7.0.0", + "tracing", + "tracing-core", +] + +[[package]] +name = "sp-io" +version = "12.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ac917b37c7733e3778e7ffc3958f1181a151ac3b14116d65fb10fe7b08db10e" +dependencies = [ + "bytes 1.1.0", + "ed25519", + "ed25519-dalek", + "futures", + "libsecp256k1", + "log", + "parity-scale-codec", + "secp256k1", + "sp-core 11.0.0", + "sp-externalities 0.15.0", + "sp-keystore 0.17.0", + "sp-runtime-interface 10.0.0", + "sp-state-machine 0.17.0", + "sp-std 6.0.0", + "sp-tracing 7.0.0", + "sp-trie 11.0.0", "tracing", "tracing-core", ] @@ -11534,8 +11682,8 @@ version = "7.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "lazy_static", - "sp-core", - "sp-runtime", + "sp-core 7.0.0", + "sp-runtime 7.0.0", "strum", ] @@ -11551,8 +11699,25 @@ dependencies = [ "parking_lot 0.12.1", "schnorrkel", "serde", - "sp-core", - "sp-externalities", + "sp-core 7.0.0", + "sp-externalities 0.13.0", + "thiserror", +] + +[[package]] +name = "sp-keystore" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ada8b7a72404bda58b3353830bc42f027ec764e13a28b4cd4386cf34fb1ae7c" +dependencies = [ + "async-trait", + "futures", + "merlin", + "parity-scale-codec", + "parking_lot 0.12.1", + "schnorrkel", + "sp-core 11.0.0", + "sp-externalities 0.15.0", "thiserror", ] @@ -11576,10 +11741,10 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-core", - "sp-debug-derive", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-debug-derive 5.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "thiserror", ] @@ -11591,10 +11756,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-core", - "sp-runtime", - "sp-std", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -11603,8 +11768,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "sp-api", - "sp-core", - "sp-runtime", + "sp-core 7.0.0", + "sp-runtime 7.0.0", ] [[package]] @@ -11617,6 +11782,17 @@ dependencies = [ "regex", ] +[[package]] +name = "sp-panic-handler" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4abed79c3d5b3622f65ab065676addd9923b9b122cd257df23e2757ce487c6d2" +dependencies = [ + "backtrace", + "lazy_static", + "regex", +] + [[package]] name = "sp-rpc" version = "6.0.0" @@ -11624,7 +11800,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb dependencies = [ "rustc-hash", "serde", - "sp-core", + "sp-core 7.0.0", ] [[package]] @@ -11641,12 +11817,35 @@ dependencies = [ "rand 0.7.3", "scale-info", "serde", - "sp-application-crypto", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-std", - "sp-weights", + "sp-application-crypto 7.0.0", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-std 5.0.0", + "sp-weights 4.0.0", +] + +[[package]] +name = "sp-runtime" +version = "12.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c86578c67b060a6ecab52af64f1cf18b3892fca7fba5ffc5c49934b2e76b1929" +dependencies = [ + "either", + "hash256-std-hasher", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "paste", + "rand 0.8.5", + "scale-info", + "serde", + "sp-application-crypto 12.0.0", + "sp-arithmetic 9.0.0", + "sp-core 11.0.0", + "sp-io 12.0.0", + "sp-std 6.0.0", + "sp-weights 8.0.0", ] [[package]] @@ -11658,12 +11857,31 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", - "sp-externalities", - "sp-runtime-interface-proc-macro", - "sp-std", - "sp-storage", - "sp-tracing", - "sp-wasm-interface", + "sp-externalities 0.13.0", + "sp-runtime-interface-proc-macro 6.0.0", + "sp-std 5.0.0", + "sp-storage 7.0.0", + "sp-tracing 6.0.0", + "sp-wasm-interface 7.0.0", + "static_assertions", +] + +[[package]] +name = "sp-runtime-interface" +version = "10.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3858935567385728ea45f6d159f9970b0b278eb22a8e77625bbf4a63e43a85a" +dependencies = [ + "bytes 1.1.0", + "impl-trait-for-tuples", + "parity-scale-codec", + "primitive-types", + "sp-externalities 0.15.0", + "sp-runtime-interface-proc-macro 7.0.0", + "sp-std 6.0.0", + "sp-storage 9.0.0", + "sp-tracing 7.0.0", + "sp-wasm-interface 8.0.0", "static_assertions", ] @@ -11679,6 +11897,19 @@ dependencies = [ "syn 1.0.98", ] +[[package]] +name = "sp-runtime-interface-proc-macro" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00083a77e938c4f35d0bde7ca0b6e5f616158ebe11af6063795aa664d92a238b" +dependencies = [ + "Inflector", + "proc-macro-crate", + "proc-macro2 1.0.47", + "quote 1.0.20", + "syn 1.0.98", +] + [[package]] name = "sp-session" version = "4.0.0-dev" @@ -11687,10 +11918,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-core", - "sp-runtime", + "sp-core 7.0.0", + "sp-runtime 7.0.0", "sp-staking", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -11700,9 +11931,9 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb dependencies = [ "parity-scale-codec", "scale-info", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -11717,21 +11948,48 @@ dependencies = [ "parking_lot 0.12.1", "rand 0.7.3", "smallvec", - "sp-core", - "sp-externalities", - "sp-panic-handler", - "sp-std", - "sp-trie", + "sp-core 7.0.0", + "sp-externalities 0.13.0", + "sp-panic-handler 5.0.0", + "sp-std 5.0.0", + "sp-trie 7.0.0", "thiserror", "tracing", "trie-root", ] +[[package]] +name = "sp-state-machine" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1fd4c600df0b5abf26c19b6c61d928b64e0c2b8a709a3dbef872be0507cd1ca" +dependencies = [ + "hash-db", + "log", + "parity-scale-codec", + "parking_lot 0.12.1", + "rand 0.8.5", + "smallvec", + "sp-core 11.0.0", + "sp-externalities 0.15.0", + "sp-panic-handler 6.0.0", + "sp-std 6.0.0", + "sp-trie 11.0.0", + "thiserror", + "tracing", +] + [[package]] name = "sp-std" version = "5.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +[[package]] +name = "sp-std" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af0ee286f98455272f64ac5bb1384ff21ac029fbb669afbaf48477faff12760e" + [[package]] name = "sp-storage" version = "7.0.0" @@ -11741,8 +11999,22 @@ dependencies = [ "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive", - "sp-std", + "sp-debug-derive 5.0.0", + "sp-std 5.0.0", +] + +[[package]] +name = "sp-storage" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9acb4059eb0ae4fa8cf9ca9119b0178ad312a592d4c6054bd17b411034f233e9" +dependencies = [ + "impl-serde 0.4.0", + "parity-scale-codec", + "ref-cast", + "serde", + "sp-debug-derive 6.0.0", + "sp-std 6.0.0", ] [[package]] @@ -11756,8 +12028,8 @@ dependencies = [ "parity-scale-codec", "sp-api", "sp-inherents", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "thiserror", ] @@ -11767,7 +12039,20 @@ version = "6.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", - "sp-std", + "sp-std 5.0.0", + "tracing", + "tracing-core", + "tracing-subscriber 0.2.25", +] + +[[package]] +name = "sp-tracing" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b22d28a0bc2365dfb86644d14f2682a79da35891d4656d4896fb09fb05ff1e6c" +dependencies = [ + "parity-scale-codec", + "sp-std 6.0.0", "tracing", "tracing-core", "tracing-subscriber 0.2.25", @@ -11779,7 +12064,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "sp-api", - "sp-runtime", + "sp-runtime 7.0.0", ] [[package]] @@ -11791,11 +12076,11 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core", + "sp-core 7.0.0", "sp-inherents", - "sp-runtime", - "sp-std", - "sp-trie", + "sp-runtime 7.0.0", + "sp-std 5.0.0", + "sp-trie 7.0.0", ] [[package]] @@ -11813,8 +12098,32 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "scale-info", - "sp-core", - "sp-std", + "sp-core 7.0.0", + "sp-std 5.0.0", + "thiserror", + "tracing", + "trie-db", + "trie-root", +] + +[[package]] +name = "sp-trie" +version = "11.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db085f134cb444e52ca569a442d12c84bd17667532613d78dd6f568942632da4" +dependencies = [ + "ahash", + "hash-db", + "hashbrown 0.12.3", + "lazy_static", + "lru", + "memory-db", + "nohash-hasher", + "parity-scale-codec", + "parking_lot 0.12.1", + "scale-info", + "sp-core 11.0.0", + "sp-std 6.0.0", "thiserror", "tracing", "trie-db", @@ -11832,8 +12141,8 @@ dependencies = [ "scale-info", "serde", "sp-core-hashing-proc-macro", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "sp-version-proc-macro", "thiserror", ] @@ -11857,7 +12166,21 @@ dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std", + "sp-std 5.0.0", + "wasmi 0.13.2", + "wasmtime", +] + +[[package]] +name = "sp-wasm-interface" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ebc377987d42f8fc20e3f4ec4fd1147dd098fe90bcb4269e1eddb04e920f889" +dependencies = [ + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "sp-std 6.0.0", "wasmi 0.13.2", "wasmtime", ] @@ -11872,10 +12195,26 @@ dependencies = [ "scale-info", "serde", "smallvec", - "sp-arithmetic", - "sp-core", - "sp-debug-derive", - "sp-std", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", + "sp-debug-derive 5.0.0", + "sp-std 5.0.0", +] + +[[package]] +name = "sp-weights" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90eca2a19f48978e9cd605e23905d0602419f7880a9360ac717b03412e9c7916" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "smallvec", + "sp-arithmetic 9.0.0", + "sp-core 11.0.0", + "sp-debug-derive 6.0.0", + "sp-std 6.0.0", ] [[package]] @@ -12218,8 +12557,8 @@ dependencies = [ "frame-support", "frame-system", "sc-cli", - "sp-core", - "sp-runtime", + "sp-core 7.0.0", + "sp-runtime 7.0.0", ] [[package]] @@ -12239,8 +12578,8 @@ dependencies = [ "sp-api", "sp-block-builder", "sp-blockchain", - "sp-core", - "sp-runtime", + "sp-core 7.0.0", + "sp-runtime 7.0.0", ] [[package]] @@ -12266,7 +12605,7 @@ dependencies = [ "log", "sc-rpc-api", "serde", - "sp-runtime", + "sp-runtime 7.0.0", ] [[package]] @@ -12288,11 +12627,11 @@ dependencies = [ "serde_json", "sp-blockchain", "sp-consensus", - "sp-core", + "sp-core 7.0.0", "sp-keyring", - "sp-keystore", - "sp-runtime", - "sp-state-machine", + "sp-keystore 0.13.0", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", ] [[package]] @@ -12314,25 +12653,25 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto", + "sp-application-crypto 7.0.0", "sp-beefy", "sp-block-builder", "sp-consensus-aura", "sp-consensus-babe", - "sp-core", - "sp-externalities", + "sp-core 7.0.0", + "sp-externalities 0.13.0", "sp-finality-grandpa", "sp-inherents", - "sp-io", + "sp-io 7.0.0", "sp-keyring", "sp-offchain", - "sp-runtime", - "sp-runtime-interface", + "sp-runtime 7.0.0", + "sp-runtime-interface 7.0.0", "sp-session", - "sp-state-machine", - "sp-std", + "sp-state-machine 0.13.0", + "sp-std 5.0.0", "sp-transaction-pool", - "sp-trie", + "sp-trie 7.0.0", "sp-version", "substrate-wasm-builder", "trie-db", @@ -12351,8 +12690,8 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-runtime", + "sp-core 7.0.0", + "sp-runtime 7.0.0", "substrate-test-client", "substrate-test-runtime", ] @@ -12402,9 +12741,9 @@ dependencies = [ "scale-value", "serde", "serde_json", - "sp-core", - "sp-core-hashing", - "sp-runtime", + "sp-core 11.0.0", + "sp-core-hashing 6.0.0", + "sp-runtime 12.0.0", "subxt-macro", "subxt-metadata", "thiserror", @@ -12447,7 +12786,7 @@ dependencies = [ "frame-metadata", "parity-scale-codec", "scale-info", - "sp-core-hashing", + "sp-core-hashing 6.0.0", ] [[package]] @@ -12766,6 +13105,25 @@ dependencies = [ "zeroize", ] +[[package]] +name = "tiny-bip39" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861" +dependencies = [ + "anyhow", + "hmac 0.12.1", + "once_cell", + "pbkdf2 0.11.0", + "rand 0.8.5", + "rustc-hash", + "sha2 0.10.2", + "thiserror", + "unicode-normalization", + "wasm-bindgen", + "zeroize", +] + [[package]] name = "tiny-keccak" version = "2.0.2" @@ -13172,16 +13530,16 @@ dependencies = [ "sc-service", "serde", "sp-api", - "sp-core", - "sp-debug-derive", - "sp-externalities", - "sp-io", - "sp-keystore", + "sp-core 7.0.0", + "sp-debug-derive 5.0.0", + "sp-externalities 0.13.0", + "sp-io 7.0.0", + "sp-keystore 0.13.0", "sp-rpc", - "sp-runtime", - "sp-state-machine", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", "sp-version", - "sp-weights", + "sp-weights 4.0.0", "substrate-rpc-client", "zstd", ] @@ -13216,7 +13574,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.3", - "rand 0.4.6", + "rand 0.8.5", "static_assertions", ] @@ -14586,7 +14944,7 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-runtime", + "sp-runtime 7.0.0", "xcm-procedural", ] diff --git a/crates/phaxt/Cargo.toml b/crates/phaxt/Cargo.toml index 2dc873e9a5..fc46e5462b 100644 --- a/crates/phaxt/Cargo.toml +++ b/crates/phaxt/Cargo.toml @@ -16,3 +16,5 @@ phala-types = { path = "../phala-types" } phala-node-rpc-ext-types = { path = "../phala-node-rpc-ext/types" } phala-pallets = { path = "../../pallets/phala" } jsonrpsee = "0.16.2" +sp-core = { version = "11.0.0", default-features = false } +primitive-types = { version = "0.12.0", default-features = false } diff --git a/crates/phaxt/src/chain_api.rs b/crates/phaxt/src/chain_api.rs index 249519e03b..2cd41ffdcf 100644 --- a/crates/phaxt/src/chain_api.rs +++ b/crates/phaxt/src/chain_api.rs @@ -1,7 +1,7 @@ use anyhow::{anyhow, Context, Result}; use parity_scale_codec::Encode; use subxt::dynamic::Value; -use subxt::rpc::NumberOrHex; +use subxt::rpc::types::{BlockNumber as SubxtBlockNumber, NumberOrHex}; use subxt::{ext::scale_value::At, metadata::EncodeStaticType}; use crate::{BlockNumber, ChainApi, Hash}; @@ -29,7 +29,7 @@ impl ChainApi { pub async fn relay_parent_number(&self) -> Result { let hash = self .rpc() - .block_hash(Some(subxt::rpc::BlockNumber::from(NumberOrHex::Number(1)))) + .block_hash(Some(SubxtBlockNumber::from(NumberOrHex::Number(1)))) .await .context("Failed get the HASH of block 1")?; let addr = subxt::dynamic::storage_root("ParachainSystem", "ValidationData"); diff --git a/crates/phaxt/src/lib.rs b/crates/phaxt/src/lib.rs index 2ff2eb6281..6db6524c54 100644 --- a/crates/phaxt/src/lib.rs +++ b/crates/phaxt/src/lib.rs @@ -3,33 +3,56 @@ use std::{ops::Deref, sync::Arc}; use parity_scale_codec::{Decode, Encode}; use scale_info::TypeInfo; -use subxt::{ - ext::sp_core::sr25519, - tx::{PolkadotExtrinsicParams, PolkadotExtrinsicParamsBuilder}, -}; +use subxt::config::polkadot::{PolkadotExtrinsicParams, PolkadotExtrinsicParamsBuilder}; mod chain_api; pub mod dynamic; pub mod rpc; +pub use sp_core; + #[derive(Encode, Decode, Clone, PartialEq, Eq, TypeInfo, PartialOrd, Ord, Debug)] pub struct ParaId(pub u32); pub type StorageProof = Vec>; pub type StorageState = Vec<(Vec, Vec)>; -pub type PairSigner = subxt::tx::PairSigner; pub type ExtrinsicParams = PolkadotExtrinsicParams; pub type ExtrinsicParamsBuilder = PolkadotExtrinsicParamsBuilder; pub use subxt::PolkadotConfig as Config; pub type RpcClient = subxt::OnlineClient; -pub type Client = subxt::OnlineClient; + +/// A wrapper for subxt::tx::PairSigner to make it compatible with older API. +pub struct PairSigner { + pub signer: subxt::tx::PairSigner, + nonce: Index, +} +impl PairSigner { + pub fn new(pair: sp_core::sr25519::Pair) -> Self { + Self { + signer: subxt::tx::PairSigner::new(pair), + nonce: 0, + } + } + pub fn increment_nonce(&mut self) { + self.nonce += 1; + } + pub fn nonce(&self) -> Index { + self.nonce + } + pub fn set_nonce(&mut self, nonce: Index) { + self.nonce = nonce; + } + pub fn account_id(&self) -> &AccountId { + self.signer.account_id() + } +} #[derive(Clone)] pub struct ChainApi(RpcClient); pub type ParachainApi = ChainApi; pub type RelaychainApi = ChainApi; -impl Deref for ParachainApi { +impl Deref for ChainApi { type Target = RpcClient; fn deref(&self) -> &Self::Target { @@ -38,15 +61,10 @@ impl Deref for ParachainApi { } pub use subxt; -pub type Index = ::Index; pub type BlockNumber = ::BlockNumber; -pub type Hash = ::Hash; -pub type Hashing = ::Hashing; +pub type Hash = primitive_types::H256; pub type AccountId = ::AccountId; -pub type Address = ::Address; -pub type Header = ::Header; -pub type Signature = ::Signature; -pub type Extrinsic = ::ExtrinsicParams; +pub type Index = ::Index; use jsonrpsee::{ async_client::ClientBuilder, @@ -55,10 +73,10 @@ use jsonrpsee::{ pub async fn connect(uri: &str) -> Result { let rpc_client = ws_client(uri).await?; - let client = Client::from_rpc_client(Arc::new(rpc_client)) + let client = RpcClient::from_rpc_client(Arc::new(rpc_client)) .await .context("Failed to connect to substrate")?; - let update_client = client.subscribe_to_updates(); + let update_client = client.updater(); tokio::spawn(async move { let result = update_client.perform_runtime_updates().await; eprintln!("Runtime update failed with result={result:?}"); diff --git a/crates/phaxt/src/rpc.rs b/crates/phaxt/src/rpc.rs index 90f3cbf2f0..f4a42f4952 100644 --- a/crates/phaxt/src/rpc.rs +++ b/crates/phaxt/src/rpc.rs @@ -2,11 +2,12 @@ use phala_node_rpc_ext_types::GetStorageChangesResponse; use serde::{de::DeserializeOwned, Deserialize, Serialize}; use serde_json::to_value as to_json_value; use subxt::{ - ext::sp_core::storage::{StorageData, StorageKey}, rpc::{rpc_params, RpcClient}, Config, Error, OnlineClient, }; +pub use sp_core::storage::{StorageData, StorageKey}; + pub trait ExtraRpcExt { type Config: Config; fn extra_rpc(&self) -> ExtraRpcClient; diff --git a/crates/pink-drivers/sidevm_deployer/Cargo.toml b/crates/pink-drivers/sidevm_deployer/Cargo.toml index 1e381958de..468a170c58 100755 --- a/crates/pink-drivers/sidevm_deployer/Cargo.toml +++ b/crates/pink-drivers/sidevm_deployer/Cargo.toml @@ -16,7 +16,7 @@ scale = { package = "parity-scale-codec", version = "3", default-features = fals scale-info = { version = "2", default-features = false, features = ["derive"], optional = true } pink-extension = { version = "0.2", default-features = false, path = "../../pink/pink-extension", features = ["ink-as-dependency"] } -pink-system = { version = "0.2", default-features = false, path = "../system", features = ["ink-as-dependency"] } +pink-system = { version = "0.1", default-features = false, path = "../system", features = ["ink-as-dependency"] } [lib] name = "sidevm_deployer" diff --git a/e2e/res/check_system/sideprog.wasm b/e2e/res/check_system/sideprog.wasm index 73436d3203f12786f4c7a771401be23d01efdd8d..a742a1860bbc7b9f83caed4094491bf06ee4906a 100755 GIT binary patch delta 217 zcmaERo8|3omJRug`pk@s%&Z*D42+Ci%-jsDtPBjytc;9|3_OfL7Bf&BD8m3$!pj5% z%nY07F)A<$alkTkX-+=RR5y7(bKYcM=Ag~IEV;Ujotvu-vzRyk zGi79){Lgg%I*432vi9%x`NV`5QYP+&A;V&G=l{MSr`jd9CnAzM)ca&9+c QVhrbHG}_+B&loQU0M{Zk3;+NC delta 207 zcmaERo8|3omJRug`izXs%&Z*D42+Ci%-jsDtPBjytc;9|3_OfL7Bf(s0Vu`D%*x9I z1PsiZ=P@cU3bJ!b3P{U%DXXh#7;716YU@ls&r~;gH*?TrU*^2cyezr8j2)Y+4YQcV zL>Lqp9QQ0d(7<5E#G=5Uz-Y$Az|FMzi77MVdaUW+7Wqrp*@| zlNni-vof+yet1`8v%UQsM#e3Z?>Ky6*~rYuIe7!S*k)hn7yB4Fwwp0AhVwESZtvq~ HjF$rdpyD!6 diff --git a/e2e/res/check_system/sideprog.wasm.hash b/e2e/res/check_system/sideprog.wasm.hash index 74e5bb26a3..890aa3c5e1 100644 --- a/e2e/res/check_system/sideprog.wasm.hash +++ b/e2e/res/check_system/sideprog.wasm.hash @@ -1 +1,2 @@ -�Sn��i�@�A'��]={�H�z�T�]�1��� \ No newline at end of file +�?��^J��S�V@���� +GT�t���>J \ No newline at end of file diff --git a/e2e/res/check_system/target/ink/check_system.contract b/e2e/res/check_system/target/ink/check_system.contract index 21d3a25967..084882d096 100644 --- a/e2e/res/check_system/target/ink/check_system.contract +++ b/e2e/res/check_system/target/ink/check_system.contract @@ -1 +1 @@ -{"source":{"hash":"0x24225865cdde10a4004de7d763a07a3d85309f0ce4c0a7a145fa4dfaa71f26f1","language":"ink! 3.4.0","compiler":"rustc 1.66.0-nightly","wasm":"0x0061736d01000000018f011460037f7f7f017f60027f7f017f60027f7f0060037f7f7f0060017f0060047f7f7f7f0060057f7f7f7f7f017f60017f017f60000060047f7f7f7f017f60087f7f7e7f7f7f7f7f017f60067f7f7f7f7f7f017f60047f7e7e7e006000017f60037f7e7e017f60077f7f7e7f7f7f7f017f60057f7f7f7f7f0060077f7f7f7f7f7f7f017f60037f7e7e0060037e7f7f000280020b057365616c31097365616c5f63616c6c000a057365616c30127365616c5f64656c65676174655f63616c6c000b057365616c30107365616c5f7365745f73746f726167650003057365616c30107365616c5f6765745f73746f726167650000057365616c30197365616c5f63616c6c5f636861696e5f657874656e73696f6e0006057365616c300a7365616c5f696e7075740002057365616c300b7365616c5f72657475726e0003057365616c300b7365616c5f63616c6c65720002057365616c300c7365616c5f616464726573730002057365616c30167365616c5f76616c75655f7472616e73666572726564000203656e76066d656d6f727902010210035c5b0002000c0302030203010106010001010101010105010102020102040202030303010202020204020d04080408040e0202070f07090405010100000301010003050301030907030606051004010100010111050500011213020000040501700117170608017f01418080040b071102066465706c6f7900340463616c6c0036091c010041010b1614191b1c1a13181d201f5f4c5544464717565758595a0abab7015b2b01017f037f2002200346047f200005200020036a200120036a2d00003a0000200341016a21030c010b0b0b2601017f037f2001200246047f200005200020026a41303a0000200241016a21020c010b0b1a0b3f01027f0340200245044041000f0b200241016b210220012d0000210320002d00002104200041016a2100200141016a210120032004460d000b200420036b0b950102017f057e230041106b220424002004200342ffffffff0f832205200142ffffffff0f8322067e22072005200142208822087e22052006200342208822097e7c22014220867c220637030020042006200754ad200820097e2001200554ad4220862001422088847c7c200220037e7c370308200429030021012000200441086a29030037030820002001370300200441106a24000b370020022001100f2001044020002001410c6c6a210103402000280200200041086a280200200210102000410c6a22002001470d000b0b0b7401017f230041106b2202240002402001413f4d04402000200141027410620c010b200141ffff004d0440200220014102744101723b010e20002002410e6a4102102a0c010b200141ffffffff034d044020014102744102722000103a0c010b20004103106220012000103a0b200241106a24000b100020022001100f200220002001102a0b8d0101017f230041406a22022400200241286a200141186a290000370300200241206a200141106a290000370300200241186a200141086a2900003703002002420137030820022001290000370310200241386a41808001360200200241989904360234200241003602302002200241306a20001012200241106a200228020020022802041002200241406b24000b6202017f017e230041206b22032400200129020421042003410036021820032004370310200320023a001f200341106a2003411f6a4101102a20012003290310370204200341086a20012003280218102920002003290308370300200341206a24000b5b01017f230041106b22022400027f2000280200220029030050044020012802184184800441042001411c6a28020028020c1100000c010b2002200041086a36020c20014180800441042002410c6a410110150b200241106a24000b820301067f230041406a220224002000280200210641012100024020012802182203419e970441032001411c6a280200220728020c22041100000d00024020012802002205410471450440200341d58104410320041100000d022003419b9704410320041100000d02200341cf8104410220041100000d022006200110160d02200128020021050c010b200341cc8104410320041100000d01200241013a0017200241346a41b081043602002002200736020c2002200336020820022005360218200220012d00203a00382002200128020436021c20022001290210370328200220012902083703202002200241176a3602102002200241086a22033602302003419b9704410310170d01200241086a41cf8104410210170d012006200241186a10160d01200228023041d181044102200228023428020c1100000d010b2005410471450440200128021841d981044102200128021c28020c11000021000c010b200128021841d881044101200128021c28020c11000021000b200241406b240020000ba20201047f230041406a2205240041012107024020002802182206200120022000411c6a280200220228020c22011100000d00024020002802002208410471450440200641dd8104410120011100000d022003200020041101000d0220002802182106200028021c28020c21010c010b200641db8104410220011100000d01200541013a0017200541346a41b081043602002005200236020c2005200636020820052008360218200520002d00203a00382005200028020436021c20052000290210370328200520002902083703202005200541176a3602102005200541086a3602302003200541186a20041101000d01200528023041d181044102200528023428020c1100000d010b200641ac81044101200111000021070b200541406b240020070be50402047f027e230041c0016b220224000240027f02402001280200220341107145044020034120710d01200041086a2903002106200029030021072002412736023c200241206a200720061060200241286a2903002106200229032021072002290330200241406b2002413c6a106102402006200784500d00200228023c220041146b220320004b0d04200241d4006a2003100b2002411436023c200241086a200720061060200241106a2903002107200229030821062002290318200241406b2002413c6a10612006200784500d00200228023c220041016b220320004b0d04200241c1006a2003100b2002410036023c2006a741ff017141306a220041ff01712000470d04200220003a00400b4127200228023c22006b220341284f0d03200141cc98044100200241406b20006a200310510c020b200041086a2903002106200029030021074180012100024003402000450440410021000c020b200041016b2200200241406b6a413041d7002007a7410f712203410a491b20036a3a00002007420f5620064200522006502006423c862007420488842107200642048821061b0d000b20004181014f0d030b200141e181044102200241406b20006a41800120006b10510c010b200041086a2903002106200029030021074180012100024003402000450440410021000c020b200041016b2200200241406b6a413041372007a7410f712203410a491b20036a3a00002007420f5620064200522006502006423c862007420488842107200642048821061b0d000b20004181014f0d020b200141e181044102200241406b20006a41800120006b10510b200241c0016a24000f0b000b9a0701127f230041d0006b22032400200341003b014c2003410a3602482003428a808080103703402003200236023c2003410036023820032002360234200320013602302003200236022c200341003602282000280204210b2000280200210c2000280208210d200341c8006a210e0240027f034002400240024020032d004d0d0020032802302100027f0240200328023c22082003280234220f4b0440200021060c010b2003280244220541016b220220054b211020002106024003402002200e6a2113200328023821040340200420084b22010d0320100d0a4100200420066a20011b210120132d00002109027f0240024002400240200820046b220741084f04402001200141036a417c712202460440200741086b2111410021020c030b200341206a20092001200220016b2202200720022007491b2202105320032802204101470d01200328022421010c040b200341106a20092001200710532003280214210120032802100c040b2002200741086b22114b0d010b200941818284086c21120340200241046a220a2002490d0e200120026a2802002012732214417f73201441818284086b712001200a6a280200201273220a417f73200a41818284086b7172418081828478710d012002200241086a22024b0d0e200220114d0d000b0b200220074b0d0c200341186a2009200120026a200720026b1053410020032802184101470d011a2002200328021c6a22012002490d0c0b41010b4101470d02200141016a2201450d0a2004200120046a22044b0d0a2003200436023820042005492004200f4b720d000b200341086a41002005200e410410542006200420056b6a210120032802082102200328020c200546047f200120022005100c0541010b04402003280244220541016b220220054b211020032802302106200328023c22082003280234220f4d0d010c030b0b20032802382201200328022822066b220220014b0d0820032001360228200020066a0c020b200320083602380b20032d004d0d01024020032d004c0440200328022c2201200328022822006b220220014b21010c010b200328022c2201200328022822006b220220014b22010d072002450d020b200341013a004d20014101710d06200020066a0b2100200d2d0000450d01200c41c881044104200b28020c110000450d010c020b41000c030b200d2002047f200020026a41016b2d0000410a460541000b3a0000200c20002002200b28020c110000450d010b0b41010b200341d0006a24000f0b000b9a0301017f230041106b22022400027f024002400240024002400240024002400240024002400240200028020022002d000041016b0e0b0102030405060708090a0b000b2002200041016a36020c200141bf980441062002410c6a410210150c0b0b200128021841b29804410d2001411c6a28020028020c1100000c0a0b200128021841a49804410e2001411c6a28020028020c1100000c090b200128021841999804410b2001411c6a28020028020c1100000c080b200128021841ff9704411a2001411c6a28020028020c1100000c070b200128021841f19704410e2001411c6a28020028020c1100000c060b200128021841e1970441102001411c6a28020028020c1100000c050b200128021841d59704410c2001411c6a28020028020c1100000c040b200128021841ca9704410b2001411c6a28020028020c1100000c030b200128021841c3970441072001411c6a28020028020c1100000c020b200128021841b49704410f2001411c6a28020028020c1100000c010b200128021841a1970441132001411c6a28020028020c1100000b200241106a24000b1b00200128021841c5980441052001411c6a28020028020c1100000b850101017f230041106b22022400027f0240024002402000280200220028020041016b0e020102000b2002200041046a3602082001418e81044106200241086a410310150c020b2002200041046a36020c20014189810441052002410c6a410410150c010b20012802184180810441092001411c6a28020028020c1100000b200241106a24000bdd0b01117f230041206b2207240020002802002200280208210a200028020021094101210c024002402001280218220b41222001411c6a280200220e280210220f1101000d00200741003602102007200936021420072009200a6a22013602180240200741106a4104722210104f2202418080c400460d00200921000340200120006b220020072802142211200728021822126b6a220120004b0d032007280210220820016a22002008490d0320072000360210418280c40021010240024002400240027f02400240024002400240200241096b0e050806010107000b2002450440413021000c090b2002412246200241dc0046720d010b2002410b74210641002101412121044121210002400340200120044101766a22032001490d0d024002402006200341027441c090046a280200410b7422044d044020042006460d02200321000c010b200341016a2201450d0f0b200020016b220420004b0d0e200020014b0d010c020b0b200341016a21010b200141204b0d0b2001410274220341c090046a2802004115762100024020014120470440200341c490046a280200411576220320006b220420034d0d010c0d0b41d70520006b220441d8054f0d0c0b4100210320022001200141016b22064f047f200641214f0d0c200641027441c090046a28020041ffffff00710541000b6b220d20024b0d0b200441016b220620044b0d0b200020046a41016b210302402006450d00200041d705200041d705491b41d7056b21044100210103402004450d0d20012001200041c491046a2d00006a22014b0d0d2001200d4b0440200021030c020b200441016a2104200041016a2100200641016b22060d000b0b20024101726741027641077320034101710d031a20024120490d02418180c4002101200241ff004f0d010b200221000c060b2002418080044f04402002418080084f0440200241b0c70c6b41d0ba2b49200241cba60c6b410549722002419ef40b6b41e20b49200241e1d70b6b419f18497272200241feffff0071419ef00a46200241a29d0b6b410e4972200241e0ffff007141e0cd0a46200241baee0a6b4106497272720d02200221002002418080c4006b41f083744f0d020c070b20022100200241e28a04412c41ba8b0441c40141fe8c0441c203105b0d060c010b20022100200241c48504412841948604419f0241b3880441af02105b0d050b2002410172674102764107730b2100200221010c030b41ee0021000c020b41f20021000c010b41f40021000b0240024002402001418080c4006b2203410320034103491b41016b0e03020100010b200041056a22032000490d0520034101460d010b0240200520084b0d0002402005450d002005200a4f04402005200a460d010c020b200520096a2c00004140480d010b02402008450d002008200a4f04402008200a470d020c010b200820096a2c00004140480d010b200820056b220320084b0d05200b200520096a2003200e28020c1100004504404105210303402003210620012105418080c40021012000210402400240024002402005418080c4006b220d4103200d4103491b41016b0e03030200010b41fd00210441002103200521010240024002400240200641ff017141016b0e050603000102040b41fb002104410221030c050b41f5002104410321030c040b41dc002104410421030c030b200041ffffffff03712000470d0a2000410274220341204f0d0a20012003411c7176410f712203413072200341d7006a2003410a491b21042006410120001b2103200041016b410020001b21000c020b027f41012002418001490d001a41022002418010490d001a41034104200241808004491b0b20086a22052008490d0920112100201221012010104f2202418080c400470d060c070b41dc002104418180c40021010b200b2004200f110100450d000b0b0c040b2009200a20052008105d000b20112100201221012010104f2202418080c400470d000b0b200741086a2009200a2005105c200b2007280208200728020c200e28020c1100000d00200b4122200f110100210c0b200741206a2400200c0f0b000ba00301057f230041406a2202240020002802002200280208210520002802002103200128021841df810441012001411c6a28020028020c11000021002005044041012104034020004101712100027f410120000d001a0240024002400240200128020022064104714504402004410171450d010c040b20044101710d01200128021c2104200128021821000c020b4101200128021841d381044102200128021c28020c1100000d031a0c020b41012001280218220041de81044101200128021c220428020c1100000d021a0b200241013a00172002200436020c2002200036020820022006360218200241b08104360234200220012d00203a00382002200128020436021c20022001290210370328200220012902083703202002200241176a3602102002200241086a3602302003200241186a1041450440200228023041d181044102200228023428020c1100000c020b41010c010b2003200110410b2100200341016a210341002104200541016b22050d000b0b410121032000450440200128021841e081044101200128021c28020c11000021030b200241406b240020030b5c01017f230041106b22022400027f200028020022002802004103470440200220003602082001418b80044102200241086a410510150c010b2002200041046a36020c20014188800441032002410c6a410310150b200241106a24000bff0201077f230041106b220524002000027f0240027f02400240200204400240200141004e044020032802080d0120052001200210492005280200210420052802040c050b200041086a41003602000c050b20032802042209450440200541086a200120024100104a20052802082104200528020c0c040b200120026a41016b410020026b7122082001490d01200141909904280200220620086a22072006490d031a2003280200210a419499042802002007490440200841ffff036a22032008490d032003411076220740002203417f46200341ffff0371200347720d032003411074220620074110746a22032006490d034194990420033602002001200620086a22072006490d041a0b41909904200736020020012006450d031a2006200a2009100a210420010c030b20002001360204200041086a41003602000c030b000b20010b21072004044020002004360204200041086a200736020041000c020b20002001360204200041086a20023602000b41010b360200200541106a24000b5701017f230041106b22022400027f20002903004202520440200220003602082001418b80044102200241086a410610150c010b2002200041086a36020c20014188800441032002410c6a410710150b200241106a24000b5701017f230041106b22022400027f20002802004104470440200220003602082001418b80044102200241086a410810150c010b2002200041046a36020c20014188800441032002410c6a410710150b200241106a24000be20302097f017e230041306b22022400200241086a2001102202402002280208450440024002402001280204410c6e2203200228020c220720032007491b2205450440410421030c010b200541aad5aad5004b0d012005410c6c410410232203450d010b200241003602182002200536021420022003360210200704400340200241206a2001102402402002280220220904402002290224210b20042002280214470d01200241106a2105230041206b2203240002400240200441016a2206450d002005280204220420046a22082004490d002008200620062008491b22064104200641044b1b2206410c6c2108200641abd5aad50049410274210a0240200404402003410436021820032004410c6c360214200320052802003602100c010b200341003602180b20032008200a200341106a101e2003280200450d01200341086a2802001a0b000b200328020421042005200636020420052004360200200341206a240020022802102103200228021821040c010b200041003602000c050b20032004410c6c6a2204200b37020420042009360200200228021841016a2204450d0220022004360218200741016b22070d000b0b20002002290310370200200041086a200241186a2802003602000c020b000b200041003602000b200241306a24000bc30201047f230041206b22022400200241086a2001102e41012104024020022d00084101710d00024002400240024020022d0009220341037122054103470440200541016b0e020302010b200341ff017141044f0d04200128020422054104490d042001280200220428000021032001200541046b3602042001200441046a36020020034180808080044921040c040b200341fc01714102762103410021040c030b200220033a0015200241013a0014200220013602102002410036021c200241106a2002411c6a41041063450d010c020b200220033a0015200241013a001420022001360210200241003b011c200241106a2002411c6a410210630d0120022f011c220141ff014d0d0120014102762103410021040c010b200228021c220141808004492104200141027621030b2000200336020420002004360200200241206a24000bb50101027f2000200020016a41016b410020016b7122014d0440024041909904280200220020016a22032000490d004194990428020020034904402001200141ffff036a22004b044041000f0b2000411076220240002200417f46044041000f0b2000200041ffff037147044041000f0b2000411074220020024110746a2203200049044041000f0b41002102419499042003360200200020016a22032000490d010b419099042003360200200021020b20020f0b000b9c0502087f017e230041106b2205240020052001102f0240200528020022030440024002402005290204220a422088a72204450d004100200441076b2201200120044b1b2108200341036a417c7120036b210941002101034002400240024002400240200120036a2d00002206411874411875220741004e0440200920016b4103712009417f46720d020240200120084f0d000340200120036a2202280200200241046a28020072418081828478710d012001200141086a22014b0d0320012008490d000b0b200120044f0d050340200120036a2c00004100480d062004200141016a2201470d000b0c070b02400240200641c483046a2d000041026b0e03040100090b200141016a220220044f0d08200220036a2c000021020240024002400240200641f0016b0e050100000002000b2007410f6a41ff017141024b200241004e720d0b20024140490d020c0b0b200241f0006a41ff01714130490d010c0a0b2002418f7f4a0d090b200141026a220220044f0d08200220036a2c000041bf7f4a0d08200141036a220120044f0d08200120036a2c000041bf7f4c0d040c080b200141016a220220044f0d07200220036a2c00002102024002400240200641e001470440200641ed01460d012007411f6a41ff0171410c490d022007417e71416e47200241004e720d0b20024140490d030c0b0b200241607141a07f460d020c0a0b200241a07f480d010c090b200241bf7f4a0d080b200141026a220120044f0d07200120036a2c000041bf7f4c0d030c070b000b200141016a21010c020b200141016a220120044f0d04200120036a2c000041bf7f4a0d040b200141016a21010b20012004490d000b0b200020043602082000200a3e0204200020033602000c020b200041003602000c010b200041003602000b200541106a24000b4601017f230041206b22012400200141186a4180800136020020014198990436021420014100360210200141086a200141106a2000101241002001280208200128020c1028000be80201077f230041206b22032400200341186a4180800136020020034198990436021420034100360210200341086a2107230041206b22022400200341106a220628020421042002200641086a2802002205360214200220043602100240024002402001280200220841034704402005450d02200441003a0000024002400240200841016b0e020102000b200541014d0d04200441003a000120024102360218200141046a2802002001410c6a280200200241106a10100c030b200541014d0d03200441013a000120024102360218200141046a2802002001410c6a280200200241106a10100c020b200541014d0d02200441023a0001200241023602180c010b2005450d01200441013a000020024101360218200141046a2802002001410c6a280200200241106a10100b20062002290310370204200241086a20062002280218102920072002290308370300200241206a24000c010b000b20002003280208200328020c1028000bd20201077f230041206b22052400200541186a4180800136020020054198990436021420054100360210200541086a2107230041206b22022400200541106a220628020421032002200641086a28020022043602142002200336021002400240027f20012d0000220841034604402004450d02200341003a000041010c010b2004450d01200341013a0000024002400240200841016b0e020102000b200441014d0d03200341003a000120024102360218200141046a2802002001410c6a280200200241106a1010200228021421042002280210210320022802180c020b200441014d0d02200341013a000120044102460d02200320012d00013a000241030c010b200441014d0d01200341023a000141020b21012006200436020820062003360204200241086a20062001102920072002290308370300200241206a24000c010b000b20002005280208200528020c1028000b0b002000200120021006000b3c01017f2002200141086a28020022034b0440000b2001200320026b36020820012001280204220120026a36020420002002360204200020013602000b5e01037f230041106b2203240002402000280208220420026a220520044f0440200341086a20042005200028020020002802041054200328020c2002470d01200328020820012002100a1a20002005360208200341106a24000f0b000b000b5102017f017e230041206b220224002000290204210320024100360218200220033703102001200241106a102c20002002290310370204200241086a2000200228021810292002280208200241206a24000b0a00200120004120102a0bb90201027f230041306b22022400200241086a2001102e024020022d00084101710440200041043602000c010b024002400240024020022d00090e020102000b200041043602000c030b20022001102e20022d00004101710d0102400240024020022d000122030e03000102040b200241206a200110242002280220450d03200241186a200241286a28020036020020022002290320370310410021030c010b200241206a2001102f2002280220450d02200241186a200241286a28020036020020022002290320370310410121030b200020022903103702042000410c6a200241186a280200360200200020033602000c020b200241206a200110242002280220220104402000200229022437020820002001360204200041033602000c020b200041043602000c010b200041043602000b200241306a24000b3c01017f200020012802042202047f2001200241016b36020420012001280200220141016a36020020012d00000520010b3a000120002002453a00000b990102057f017e230041106b22022400200241086a200110220240200228020845044020012802042204200228020c22034f0440200220034101104b200235020421072002280200200128020022052003100a21062001200420036b3602042001200320056a360200200020072003ad42208684370204200020063602000c020b200041003602000c010b200041003602000b200241106a24000b6001017f230041106b2201240020004200370000200041186a4200370000200041106a4200370000200041086a420037000020014120360204200120003602002001412036020c20002001410c6a10082001200128020c1031200141106a24000b3301017f230041106b22022400200241086a4100200120002802002000280204105420002002290308370200200241106a24000b6c02027f027e230041206b22002400200041086a220142003703002000420037030020004110360214200020003602102000411036021c20002000411c6a1009200041106a200028021c10312001290300210220002903002103200041206a2400410541042002200384501b0b0a00200041a4800410110b8b0101017f230041206b220024000240103241ff01714105470d002000418080013602042000419899043602002000103520002802044104490d00200028020028000041ed97f5dc01470d00103241ff01714105470d00200041186a4200370300200041106a4200370300200041086a420037030020004200370300410020001011200041206a24000f0b000b3301017f230041106b220124002001200028020436020c20002802002001410c6a10052000200128020c1031200141106a24000bb534020d7f0a7e230041a0036b2200240002400240103241ff01714105470d0020004180800136029c012000419899043602980120004198016a10352000200028029c0122053602d401200020002802980122023602d00120054104490d00200228000021072000200541046b22063602d4012000200241046a22083602d001200741187621042007411076210120074108762103027f0240024002400240024002400240200741ff01712207044020074105460d062007411e460d01200741f301460d052007419601460d03200741a201460d07200741af01460d04200741b901470440200741c701460d03200741800147200341ff017141064772200141ff0171419d0147200441cf014772720d0a41000c090b200341ff017141f70147200141ff0171411b4772200441fd0147200641084972720d092008290000220f420888210d200fa7210541010c080b200341ff0171200141ff0171722004410147720d0841020c070b200341ff0171413747200141ff017141db014772200441d00047720d0741030c060b200341ff017141d20047200141ff017141cf004772200441b90147720d06200041d8006a200041d0016a102f20002802582203450d06200029025c210f20004188026a200041d0016a102f2000280288022204450d06200f420888210d2000280290022101200028028c022108200fa7210541040c050b200341ff017141e40147200141ff0171412b4772200441de0047720d0520004188026a200041d0016a102f2000280288022203450d05200035008d0220004191026a33000020004193026a3100004210868442208684210d20002d008c02210541050c040b200341ff017141ea0147200141ff017141d90147722004419e0147200641204972720d042000200541246b3602d4012000200241246a3602d001200241076a2d0000210320022f0005200229001c21132002280018210120022800142108200228001021042002290008210f20022d0004210220004188026a200041d0016a10242000280288022206450d04200f420888210d2003411074724108742002722103200029028c02210e200fa7210541060c030b200341ff0171412e47200141ff017141d4004772200441c50147200641204972720d032000200541246b3602d4012000200241246a3602d001200229001c210e2002280018210620022900102113200228000c21012002280008210820022800042104200041d8006a200041d0016a102420002802582203450d03200029025c210f20004188026a200041d0016a1021200028028802450d03200f420888210d20003502900221112000290388022110200fa7210541070c020b200341ff017141e60047200141ff0171410f4772200441a20147200641204972720d022000200541246b3602d4012000200241246a3602d001200229001c210e2002280018210620022900102113200228000c21012002280008210820022800042104200041d8006a200041d0016a102f20002802582203450d02200029025c210f20004188026a200041d0016a1021200028028802450d02200f420888210d20003502900221112000290388022110200fa7210541080c010b200341ff017141cb0047200141ff017141cb014772200441c4004720064120497272200541246b411049720d012002290004220f420888210d2002412c6a29000021102002290024210e200228000c210420022800102108200228001421012002290018211320022800202106200fa7210541090b210720004198026a4200370300200041a0026a4200370300200041a8026a42003703002000420037039002200042013703880220004180800136025c2000419899043602582000418080013602d00120004190026a41989904200041d0016a10032102200041d8006a20002802d00110312002410c4f0d00200241027441e098046a2802000d00200028025c450d00410021020240024020002802582d00000e020100020b410121020b2005ad42ff0183200d420886842114200d42ffffffffffffffff0083210d0240024002400240024002400240024002400240024002400240200741016b0e09080706050403020100090b103241ff01714105470d0c4200210d4200210f230041206b22032400230041206b220924000240024002400240024020105045044020104280c8afa025540d0120104280c8afa025510d0320104280c8afa02582210d20104280c8afa0258021120c020b200e4280c8afa025822111200e4280c8afa02580210f0c030b0240201079a72207411e6b220520074b0d0002402005450440413f21050c010b41c00020056b220541c0004b0d010b200941106a210b230041106b220724004280c8afa0252111024002400240200541ff0071220a41c00071450440200a450d0141c000200a6b220c41c0004b0d024200200a413f71ad2211864280c8afa025200c413f71ad8884210d4280c8afa02520118621110c010b4280c8afa025200a413f71ad86210d420021110b200720113703002007200d3703080c010b000b2007290300210d200b200741086a290300370308200b200d370300200741106a2400200541ff004b200541c0004f720d00200941186a29030021122009290310210f42012005ad86210d03400240201020127d200e200f54ad7d22114200530d00200e200f7d210e200d2015842115201150450440201121100c010b200e4280c8afa025822111200e4280c8afa02580201584210f0c050b2012423f86200f42018884210f200d420188210d201242018821120c000b000b000b200e4280c8afa0255a4101200d501b450440200e21110c030b4280e497d012210f428080808080808080807f211103400240200d200f7d200e201654ad7d22104200530d00200e20167d210e201120158421152010504504402010210d0c010b200e4280c8afa025822111200e4280c8afa02580201584210f4200210d0c040b200f423f86201642018884211620114201882111200f420188210f0c000b000b200e2010822111200e201080210f420121120c010b4200210d420021120b200320113703102003200f370300200341186a200d37030020032012370308200941206a24002003290300210d2000200341086a2903003703082000200d370300200341206a2400200041d0016a1037200041b8026a200041e8016a290300370300200041b0026a200041e0016a290300370300200041a8026a200041d8016a29030037030020004190026a420037030020004198026a22074200370300200020002903d0013703a002200042003703880220002802f0012103200041d8006a220520004188026a22094138100a1a200920054138100a1a200041e4026a220941c5d8efc401360200200041e0026a2006360200200041d8026a2013370300200041d4026a2001360200200041d0026a2008360200200041cc026a2004360200200041c4026a220420143702002000200028020022063602c002200020033602e802200041186a418080013602002000419899043602144100210520004100360210200029038802210d200041106a2201200041a0026a102b210a20012000290390022007290300103821072000027f200341ffff0371044041cc980421012000280214210820002802180c010b2000290214210e200041003602a0012000200e37039801200920004198016a2201103920042001102c20062001103a200028029c01220420002802a0012205490d0d200028029801220120056a2108200420056b0b36023c200020083602382003103b200a200d200720012005200041386a103c410d710d0c20002000290338370398010240024020004198016a103d41ff0171220141026b0e02010e000b200041013a008802200020014100473a008902410120004188026a1027000b200041033a00880220021033410020004188026a1027000b103241ff01714105470d0b200041bc026a200e370200200041b8026a2006360200200041b0026a2013370300200041ac026a2001360200200041a8026a2008360200200041003602c402200020043602a402200041d4ecbafe7d3602a0022000201437039802200020033602940220002011a72202360290022000201042ffffffff0f8320104220884220868437038802200041a0016a4180800136020020004198990436029c01200041003602980120004198016a200041a4026a102b2104200029029c01210e200041003602602000200e370358200041a0026a200041d8006a220110392003200d421888a7200110102010a720022001100e200028025c220320002802602201490d0b200028025821022000200320016b36023c2000200120026a360238024002400240200420022001200041386a103e2201410d7145044020002000290338370310200041d8006a200041106a102d200028025822024104460d02200041dc016a200041e4006a2802003602002000200029025c3702d4010c010b2000200141d398046a2d00003a00d401410421020b200020023602d0010c010b200041003a00d401200041043602d0010b2000419c026a41013602002000420137028c022000419c8004360288022000410936025c2000200041d8006a360298022000200041d0016a36025820004188026a103f20002802d00122024104460d0b0c0c0b103241ff01714105470d0a200041b8026a200e370300200041b4026a2006360200200041ac026a2013370200200041a8026a2001360200200041a4026a2008360200200041003602c002200020043602a002200041c9feb6a60236029c022000200d421888a7220236029802200020033602940220002011a72204360290022000201042ffffffff0f8320104220884220868437038802200041a0016a4180800136020020004198990436029c01200041003602980120004198016a200041a0026a102b2105200029029c01210d200041003602602000200d3703582000419c026a200041d8006a2201103920032002200110102010a720042001100e200028025c220320002802602201490d0a200028025821022000200320016b36023c2000200120026a360238024002400240200520022001200041386a103e2201410d7145044020002000290338370310200041d8006a200041106a102d200028025822024104460d02200041dc016a200041e4006a2802003602002000200029025c3702d4010c010b2000200141d398046a2d00003a00d401410421020b200020023602d0010c010b200041003a00d401200041043602d0010b2000419c026a41013602002000420137028c022000419c8004360288022000410936025c2000200041d8006a360298022000200041d0016a36025820004188026a103f20002802d00122024104460d0a0c0b0b103241ff01714105470d09200041b0026a2013370300200041ac026a2001360200200041a8026a2008360200200041a4026a20043602002000419c026a2014370200200041003602b8022000200336029802200041afd5e7f6793602940220002006360288022000200e37028c02200041d8016a418080013602002000419899043602d401200041003602d001200041d0016a20004198026a102b20002902d401210d200041003602602000200d37035820004194026a200041d8006a220110392006200e422088a720011010200028025c220420002802602201490d09200028025821022000200420016b36029c012000200120026a360298012002200120004198016a103e2201410d710d060240200028029c012202450d004200210d0240024020002802980122012d00000e020100020b200241016b4110490d01200141096a2900002110200129000121144201210d0b200041e8006a2010370300200020143703602000200d3703580c090b20004202370358200041003a00600c080b103241ff01714105470d0820004280800137028c02200041989904360288022003200d421888a720004188026a1010200028028c0222032000280290022201490d0820002802880221022000200320016b3602d4012000200120026a3602d001410820022001200041d0016a104020002802d0012102200020002802d401220136025c200020023602582001450d082000200141016b36025c2000200241016a360258410021010240024020022d000022020e0201000a0b20004188026a200041d8006a102f2000280288022201450d0920004190026a28020021020b230041206b22032400200341186a4180800136020020034198990436021420034100360210200341086a2108230041206b22002400200341106a220528020421042000200541086a28020022063602142000200436021002400240027f20014504402006450d02200441003a000041010c010b2006450d01200441013a00002000410136021820012002200041106a1010200028021421062000280210210420002802180b21012005200636020820052004360204200041086a20052001102920082000290308370300200041206a24000c010b000b41002003280208200328020c1028000b103241ff01714105470d0720004280800137028c02200041989904360288022003200d421888a720004188026a220210102004200120021010200028028c0222032000280290022201490d0720002802880221022000200320016b36028c022000200120026a3602880241062002200120004188026a1040200028028c02450d072000280288022d0000220141024f0d072001451025000b103241ff01714105470d06200041106a1037200041386a103020004180026a200041286a290300370300200041f8016a200041206a290300370300200041f0016a200041186a290300370300200020002903103703e801200041c0026a200041d0006a290300370300200041b8026a200041c8006a290300370300200041b0026a200041406b2903003703004100210120004190026a41cc800429000037030020004198026a220341d48004290000370300200041a0026a220441dc8004290000370300200020002903383703a802200041c4800429000037038802200041d8006a220520004188026a220641c000100a1a200041d8016a4200370300200041e0016a4200370300200042003703d0012000280230210220004198016a2208200041d0016a4138100a1a200620084138100a1a200041e6dea8a27a3602c402200041c8026a200541c000100a2105200020023602c00220004190036a4180800136020020004198990436028c032000410036028803200029038802210d20004188036a22062004102b210820062000290390022003290300103821032000027f200241ffff0371044041cc98042104200028028c0321062000280290030c010b200029028c03210e200041003602d8012000200e3703d001200041c4026a200041d0016a22011039200041e8026a2001102c20052001102c20002802d401220520002802d8012201490d0720002802d001220420016a2106200520016b0b36029c0320002006360298032002103b2008200d20032004200120004198036a103c410d710d0620002000290398033703d001200041d0016a103d41ff017122014103462001410247720d0641011025000b103241ff01714105470d05200041f0006a4200370300200041e8006a4200370300200041e0006a4200370300200042003703582000412036028c022000200041d8006a220136028802200041203602d0012001200041d0016a100720004188026a220320002802d0011031200310302002200120034120100c457210330c030b103241ff01714105470d04200041d0016a103720004198016a1030200041b8026a200041e8016a290300370300200041b0026a200041e0016a290300370300200041a8026a200041d8016a29030037030020004190026a420037030020004198026a22034200370300200020002903d0013703a002200042003703880220002802f0012102200041d8006a220120004188026a22044138100a1a200420014138100a1a200041c8026a4101360200200041f0026a220441b5d8ace305360200200041cc026a2205200029039801370200200041d4026a200041a0016a290300370200200041dc026a200041a8016a290300370200200041e4026a200041b0016a290300370200200020143703c002200020023602f802200041406b4180800136020020004198990436023c4100210120004100360238200029038802210d200041386a2206200041a0026a102b210820062000290390022003290300103821032000027f200241ffff0371044041cc98042104200028023c210620002802400c010b200029023c210e200041003602182000200e3703102004200041106a10392000280218220120002802144f0d05200028021020016a41003a00002000200141016a3602182005200041106a2201102c41012001103a2000201437038803200120004188036a4108102a2000280214220520002802182201490d052000280210220420016a2106200520016b0b36028c0320002006360288032002103b2008200d20032004200120004188036a103c410d710d042000200029038803370310200041106a103d41ff01714103470d020c040b103241ff01714105470d0320021025000b200042023703582000200141d398046a2d00003a00600c010b200041a0036a24000f0b2000419c026a41013602002000420137028c02200041f88004360288022000410a3602d4012000200041d0016a360298022000200041d8006a3602d00120004188026a103f2000290358220d4202510d002000290360210e200041e8006a2903002110230041206b22002400200041186a4180800136020020004198990436021420004100360210200041086a2105230041306b22012400200041106a220428020421022001200441086a28020022033602142001200236021002400240027f200d5004402003450d02200241003a000041010c010b2003450d01200241013a000020014101360218200120103703282001200e370320200141106a200141206a4110102a200128021421032001280210210220012802180b21062004200336020820042002360204200141086a20042006102920052001290308370300200141306a24000c010b000b41002000280208200028020c1028000b000b20004194026a200041dc016a280200360200200020002902d40137028c02200020023602880220024103470440410020004188026a1026000b410120004188026a1026000b870101027f230041106b2201240020014180800136020c200141989904360208410f419899044100200141086a1040200128020c411f4d0440000b200020012802082202290000370000200041086a200241086a290000370000200041106a200241106a290000370000200041186a200241186a29000037000020004100360020200141106a24000b6402017f017e230041306b220324002000290204210420034100360218200320043703102003200237032820032001370320200341106a200341206a4110102a20002003290310370204200341086a2000200328021810292003280208200341306a24000b0a00200120004104102a0b2601017f230041106b220224002002200036020c20012002410c6a4104102a200241106a24000b220020004115764108712000410e76410471200041077641027120004101717272720b5e01017f230041106b220724002007200628020436020c20002001200220032004200520062802002007410c6a100021002006200728020c1031410c21062000410b4d0440200041027441e098046a28020021060b200741106a240020060b7401027f230041106b22012400200141086a2000102e41032102024020012d00084101710d00410221020240024020012d00090e020201000b410321020c010b20012000102e4103210220012d00004101710d004101410320012d000122004101461b410020001b21020b200141106a240020020b5a01017f230041106b220424002004200328020436020c410020002001200220032802002004410c6a100121002003200428020c1031410c21032000410b4d0440200041027441e098046a28020021030b200441106a240020030bd20201037f23004190016b220124002001412c6a2000290210370200200141246a20002902083702002001410036024c200141023602402001410236023420014100360218200141cc9804360214200141033602102001200029020037021c2001410b36026c20012001411c6a3602742001200141f4006a360268200141086a41004100104b20014100360260200120012903083703582001410136028c012001420137027c200141cc98043602782001200141e8006a360288010240200141d8006a200141f8006a10420d00200128025820012802602001280210210220014280800137027c200141989904360278200120023a0068200141f8006a2202200141e8006a4101102a20021010200128027c22022001280280012200490d00200128027821032001200220006b36027c2001200020036a360278410a20032000200141f8006a104020014190016a24000f0b000b3a01017f230041106b220424002004200328020436020c20002001200220032802002004410c6a10041a2003200428020c1031200441106a24000b890301037f23004180016b220324000240027f0240200128020022024110714504402002412071450d0120002d00002102410021000340200020036a41ff006a413041372002410f712204410a491b20046a3a0000200041016b21002002220441047621022004410f4b0d000b20004180016a4181014f0d03200141e181044102200020036a4180016a410020006b10510c020b20002d00002102410021000340200020036a41ff006a413041d7002002410f712204410a491b20046a3a0000200041016b21002002220441047621022004410f4b0d000b20004180016a4181014f0d02200141e181044102200020036a4180016a410020006b10510c010b0240024020002d0000220241e3004d0440412621002002410a490d012003200241017441e381046a2f00003b0025412521000c020b20032002200241e4006e220241e4006c6b41ff017141017441e381046a2f00003b0025412421000b200020036a200241306a3a00000b200141cc98044100200020036a412720006b10510b20034180016a24000f0b000b0c00200020014194810410640bf50301057f230041406a22032400200341346a2001360200200341033a003820034280808080800437031820032000360230410021002003410036022820034100360220027f0240024020022802082201450440200241146a28020022004103742106200041ffffffff017121072002280210210041002101034020012006460d02200228020020016a220441046a28020022050440200328023020042802002005200328023428020c1100000d040b200141086a2101200028020020002802042105200041086a2100200341186a2005110100450d000b0c020b2002410c6a28020022074105742106200741ffffff3f71210703402006450d01200228020020006a220441046a28020022050440200328023020042802002005200328023428020c1100000d030b20032001411c6a2d00003a003820032001290204422089370318200341106a20022802102204200141146a105020032003290310370320200341086a20042001410c6a105020032003290308370328200041086a2100200641206b210620012802002105200141206a2101200420054103746a2204280200200341186a2004280204110100450d000b0c010b200228020420074b04402003280230200228020020074103746a22002802002000280204200328023428020c1100000d010b41000c010b41010b200341406b24000b0f00200028020020012002104541000b5601017f024020022000280204200028020822036b4b04402000200320021048418180808078470d01200028020821030b200028020020036a20012002100a1a200220036a22012003490d00200020013602080f0b000bbb0201027f230041106b220224000240024002400240200028020022002002410c6a027f0240024020014180014f04402002410036020c2001418010490d012001418080044f0d0220022001413f71418001723a000e20022001410c7641e001723a000c20022001410676413f71418001723a000d41030c030b200028020822032000280204460d030c040b20022001413f71418001723a000d2002200141067641c001723a000c41020c010b20022001413f71418001723a000f20022001410676413f71418001723a000e20022001410c76413f71418001723a000d2002200141127641077141f001723a000c41040b10450c020b2000200341011048418180808078470440000b200028020821030b200028020020036a20013a0000200341016a2201450d01200020013602080b200241106a240041000f0b000b4a01017f230041206b220224002000280200200241186a200141106a290200370300200241106a200141086a29020037030020022001290200370308200241086a1042200241206a24000bbe0101027f230041206b220324000240027f4100200120026a22022001490d001a2000280204220120016a22042001490d012004200220022004491b22024108200241084b1b2202417f73411f7621040240200104402003410136021820032001360214200320002802003602100c010b200341003602180b200320022004200341106a101e20032802004504402003280204210120002002360204200020013602004181808080780c010b200341086a2802000b200341206a24000f0b000b3901017f230041106b22032400200341086a200120024100104a200328020c21012000200328020836020020002001360204200341106a24000bd80101027f02402001450440200221030c010b200345044020012002102321030c010b4100210302402001200120026a41016b410020026b7122054d044041909904280200220220056a22042002490d02419499042802002004490440200541ffff036a22022005490d022002411076220340002202417f46200241ffff0371200247720d022002411074220220034110746a22042002490d0241002103419499042004360200200220056a22042002490d030b419099042004360200200221030c020b000b410021030b20002001360204200020033602000b6a01027f230041106b2203240002402001450440410121020c010b200141004e22040440027f2002450440200341086a20012004104920032802080c010b2003200120044101104a20032802000b22020d010b000b2000200136020420002002360200200341106a24000b0e0020002802001a03400c000b000ba40101037f20022104024002400240410120012d0020220320034103461b410371220341016b0e03010001020b200241016a2203044020034101762104200241017621030c020b000b41002104200221030b200341016a21022001411c6a2802002105200128020421032001280218210102400340200241016b2202450d01200120032005280210110100450d000b418080c40021030b20002004360204200020033602000b3201017f027f0340200120012004460d011a200441016a2104200220002003280210110100450d000b200441016b0b2001490bb70101047f200028020022012000280204460440418080c4000f0b2000200141016a36020020012d00002203411874411875410048047f2000200141026a36020020012d0001413f7121022003411f712104200341df014d044020044106742002720f0b2000200141036a36020020012d0002413f712002410674722102200341f00149044020022004410c74720f0b2000200141046a3602002004411274418080f0007120012d0003413f71200241067472720520030b0b5501027f0240027f02400240200228020041016b0e020103000b200241046a0c010b200120022802044103746a2201280204410c470d0120012802000b2802002104410121030b20002004360204200020033602000bae0401097f230041106b22082400418080c400210a20042107024002402000280200220b4101710440200441016a2207450d01412b210a0b0240200b41047145044041002101200721050c010b024020024504400c010b200221092001210503402006200620052c000041bf7f4a6a22064b0d03200541016a2105200941016b22090d000b0b200620076a22052007490d010b200028020845044041012106200041186a28020022052000411c6a2802002200200a2001200210520d02200520032004200028020c11000021060c020b02402000410c6a280200220720054b0440200b4108710d01200720056b220520074b0d02200820002005104d4101210620082802002207418080c400460d0320082802042109200041186a28020022052000411c6a2802002200200a2001200210520d03200520032004200028020c1100000d032007200920052000104e21060c030b41012106200041186a28020022052000411c6a2802002200200a2001200210520d02200520032004200028020c11000021060c020b2000280204210c2000413036020420002d0020210d41012106200041013a0020200041186a28020022092000411c6a280200220b200a2001200210520d01200720056b220120074b0d00200841086a20002001104d20082802082201418080c400460d01200828020c2102200920032004200b28020c1100000d01200120022009200b104e0d012000200d3a00202000200c360204410021060c010b000b200841106a240020060b39000240027f2002418080c40047044041012000200220012802101101000d011a0b20030d0141000b0f0b200020032004200128020c1100000b5701027f024002402003450440410021030c010b200141ff017121054101210103402005200220046a2d0000460440200421030c030b2003200441016a2204470d000b0b410021010b20002003360204200020013602000b31000240200120024b200220044b720d002002200220016b2202490d00200020023602042000200120036a3602000f0b000b0300010be60101017f230041106b220224002002410036020c20002002410c6a027f0240024020014180014f04402001418010490d012001418080044f0d0220022001413f71418001723a000e20022001410c7641e001723a000c20022001410676413f71418001723a000d41030c030b200220013a000c41010c020b20022001413f71418001723a000d2002200141067641c001723a000c41020c010b20022001413f71418001723a000f20022001410676413f71418001723a000e20022001410c76413f71418001723a000d2002200141127641077141f001723a000c41040b1017200241106a24000b0c002000200141ac830410640b0d0020002802002001200210170b0b002000280200200110560b4a01017f230041206b220224002000280200200241186a200141106a290200370300200241106a200141086a29020037030020022001290200370308200241086a1057200241206a24000bde0201097f230041106b22092400410121080240024002402002450d00200120024101746a210b20004180fe0371410876210c20012d00012102200041ff0171210e03402002210d200141026a210a0240200c20012d00002202470440200a200b462002200c4b720d030c010b200941086a2007200d200320041054200928020c210220092802082107024003402002450d01200241016b210220072d0000210f200741016a2107200e200f470d000b410021080c040b200a200b460d020b200141036a2102200a2101200d2207200720022d00006a22024d0d000b0c020b2006450d00200520066a2101200041ffff037121070340200541016a210020052d00002202411874411875220341004e047f20000520002001460d0320052d0001200341ff0071410874722102200541026a0b2105200720026b22074100480d012008410173210820012005470d000b0b200941106a240020084101710f0b000b5801017f024002402003450d00200220034d044020022003460d010c020b200120036a2c00004140480d010b2002200220036b2204490440000b200020043602042000200120036a3602000f0b2001200220032002105d000bbf0101027f230041106b220424000240024020002001418002105e2205450d00200120054d044020012005460d010c020b200020056a2c000041bf7f4c0d010b2001200249200120034972200220034b72450440024002402002450d00200120024d044020012002460d010c020b200020026a2c00004140480d010b200321020b200420002001200020012002105e105c2004200428020022003602082004200020042802046a36020c200441086a104f1a0b000b2000200141002005105d000b7f01037f230041106b220324000240200120024b0440200341086a4100200241036b220420022004491b2204200241016a200020011054200328020841016b2100200328020c2101034020010440200020016a200141016b220221012c00004140480d010b0b200220046a22012004490d010b200341106a240020010f0b000b5b01027f230041206b220224002001411c6a28020021032001280218200241186a2000280200220041106a290200370300200241106a200041086a290200370300200220002902003703082003200241086a1043200241206a24000bd50202017f047e230041d0006b220324002003027e2002428080205a0440200341406b2002420042d2e1aadaeda7c987f600100d200341206a2001420042d2e1aadaeda7c987f600100d200341106a2001420042f3b2d8c19e9ebdcc957f100d200341306a2002420042f3b2d8c19e9ebdcc957f100d200341c8006a290300200341286a290300200341186a290300220420032903207c2205200454ad7c220620032903407c2204200654ad7c20042004200341386a290300200520032903307c200554ad7c7c220456ad7c2206423e88210520064202862004423e88840c010b2002422d8620014213888442bda282a38eab04800b22042005428080a0cfc8e0c8e38a7f100d2001200329030022067d22072001562002200341086a2903007d2001200654ad7d220120025620012002511b450440200020043703002000200737031020002005370308200341d0006a24000f0b000b9f0602057f027e0240200228020022054114490d000240200120056a41026b027f0240200042ffff83fea6dee111580440200042ffc1d72f560d01200521030c030b200120056a220341046b2000200042808084fea6dee11180220042808084fea6dee1117e7d220842e40080220942e40082a741017441e381046a2f00003b0000200341066b20084290ce008042e40082a741017441e381046a2f00003b0000200341086b200842c0843d8042e40082a741017441e381046a2f00003b00002003410a6b20084280c2d72f80a741e4007041017441e381046a2f00003b00002003410c6b20084280c8afa02580a741e4007041017441e381046a2f00003b00002003410e6b20084280a094a58d1d80a741ffff037141e4007041017441e381046a2f00003b00002001200541106b22036a2008428080e983b1de1680a741ff017141e4007041017441e381046a2f00003b00002008200942e4007e7da70c010b2002200541086b2203360200200120056a220741046b200020004280c2d72f8022004280c2d72f7e7da7220641e4006e220441e4007041017441e381046a2f00003b0000200741066b20064190ce006e41ffff037141e4007041017441e381046a2f00003b0000200120036a200641c0843d6e41ff017141e4007041017441e381046a2f00003b00002006200441e4006c6b0b41017441e381046a2f00003b00000b02402000a72204418fce004d0440200321050c010b2001200341046b22056a200420044190ce006e22044190ce006c6b220641ffff037141e4006e220741017441e381046a2f00003b0000200120036a41026b2006200741e4006c6b41ffff037141017441e381046a2f00003b00000b0240200441ffff037141e3004d0440200521030c010b200541026b220320054b0d01200120036a2004200441ffff037141e4006e220441e4006c6b41ffff037141017441e381046a2f00003b00000b200441ffff0371410a4f04402003200341026b2203490d0120022003360200200120036a200441ffff037141017441e381046a2f00003b00000f0b2003200341016b2203490d0020022003360200200120036a200441306a3a00000f0b000b2d01017f2000280208220220002802044904402000200241016a360208200028020020026a20013a00000f0b000b910101027f20002f01042103200041003a0004410121040240024020034101714504402000280200220028020422032002490d022001200028020022012002100a1a0c010b200120034108763a0000200028020022002802042203200241016b2202490d01200141016a200028020022012002100a1a0b2000200320026b3602042000200120026a360200410021040b20040b5301017f230041206b2203240020032000360204200341186a200141106a290200370300200341106a200141086a29020037030020032001290200370308200341046a2002200341086a1043200341206a24000b0bbb180400418080040b21536f6d654e6f6e654572724f6b6576616c20726573756c743a2000000d0001000d0041c480040b8004dd536ecec069fd40dd4127fa9f5d3d137bf5488e7aed54de5df831ad11a9cc0270617273655f75736420726573756c743a2000006400010012000000556e646566696e65644279746573537472696e670d00000004000000040000000e0000000f00000010000000290000000d0000000c0000000400000011000000120000001300000020202020207b0a3a202c0a2c20207b207d207d280a280a5b5d30783030303130323033303430353036303730383039313031313132313331343135313631373138313932303231323232333234323532363237323832393330333133323333333433353336333733383339343034313432343334343435343634373438343935303531353235333534353535363537353835393630363136323633363436353636363736383639373037313732373337343735373637373738373938303831383238333834383538363837383838393930393139323933393439353936393739383939000d0000000400000004000000140000001500000016000000010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010100418685040b330202020202020202020202020202020202020202020202020202020202020303030303030303030303030303030304040404040041c585040bc813010305050606020706080709110a1c0b190c1a0d100e0c0f0410031212130916011704180119031a071b011c021f1620032b032d0b2e01300331023201a702a902aa04ab08fa02fb05fd02fe03ff09ad78798b8da23057588b8c901cdd0e0f4b4cfbfc2e2f3f5c5d5fe2848d8e9192a9b1babbc5c6c9cadee4e5ff00041112293134373a3b3d494a5d848e92a9b1b4babbc6cacecfe4e500040d0e11122931343a3b4546494a5e646584919b9dc9cecf0d11293a3b4549575b5c5e5f64658d91a9b4babbc5c9dfe4e5f00d11454964658084b2bcbebfd5d7f0f183858ba4a6bebfc5c7cfdadb4898bdcdc6cecf494e4f57595e5f898e8fb1b6b7bfc1c6c7d71116175b5cf6f7feff806d71dedf0e1f6e6f1c1d5f7d7eaeaf7fbbbc16171e1f46474e4f585a5c5e7e7fb5c5d4d5dcf0f1f572738f747596262e2fa7afb7bfc7cfd7df9a409798308f1fd2d4ceff4e4f5a5b07080f10272feeef6e6f373d3f42459091536775c8c9d0d1d8d9e7feff00205f2282df048244081b04061181ac0e80ab051f09811b03190801042f043404070301070607110a500f1207550703041c0a090308030703020303030c0405030b06010e15054e071b0757070206170c500443032d03010411060f0c3a041d255f206d046a2580c80582b0031a0682fd03590716091809140c140c6a060a061a0659072b05460a2c040c040103310b2c041a060b0380ac060a062f314d0380a4083c030f033c0738082b0582ff1118082f112d03210f210f808c048297190b158894052f053b07020e180980be22740c80d61a0c0580ff0580df0cf29d033709815c1480b80880cb050a183b030a06380846080c06740b1e035a0459098083181c0a16094c04808a06aba40c170431a10481da26070c050580a61081f50701202a064c04808d0480be031b030f0d000601010301040205070702080809020a050b020e041001110212051311140115021702190d1c051d081f0124016a046b02af03b102bc02cf02d102d40cd509d602d702da01e005e102e704e802ee20f004f802fa03fb010c273b3e4e4f8f9e9e9f7b8b9396a2b2ba86b1060709363d3e56f3d0d1041418363756577faaaeafbd35e01287898e9e040d0e11122931343a4546494a4e4f64655cb6b71b1c07080a0b141736393aa8a9d8d909379091a8070a3b3e66698f92116f5fbfeeef5a62f4fcff53549a9b2e2f2728559da0a1a3a4a7a8adbabcc4060b0c151d3a3f4551a6a7cccda007191a22253e3fe7ecefffc5c604202325262833383a484a4c50535556585a5c5e606365666b73787d7f8aa4aaafb0c0d0aeaf6e6fbe935e227b0503042d036603012f2e80821d03310f1c0424091e052b0544040e2a80aa06240424042808340b4e43813709160a08183b45390363080930160521031b05014038044b052f040a070907402027040c0936033a051a07040c07504937330d33072e080a8126524b2b082a161a261c1417094e042409440d19070a0648082709750b423e2a063b050a0651060105100305808b621e48080a80a65e22450b0a060d133a060a362c041780b93c64530c48090a46451b4808530d49070a80f6460a1d03474937030e080a0639070a813619073b031c56010f320d839b66750b80c48a4c630d843010168faa8247a1b98239072a045c06260a460a28051382b05b654b0439071140050b020e97f80884d62a09a2e781330f011d060e0408818c89046b050d0309071092604709743c80f60a73087015467a140c140c570919808781470385420f1584501f060680d52b053e2101702d031a040281401f113a050181d02a82e680f7294c040a04028311444c3d80c23c06010455051b3402810e2c04640c560a80ae381d0d2c040907020e06809a83d80411030d0377045f060c04010f0c0438080a062808224e81540c1d03090736080e040907090780cb250a84060003000083042000910560005d13a0001217201f0c20601fef2ca02b2a30202c6fa6e02c02a8602d1efb602e00fe20369eff6036fd01e136010a2137240de137ab0e61392f18a139301c6148f31ea14c40346150f06aa1514f6f21529dbca15200cf615365d1a15300da215400e0e155aee26157ece42159d0e8a1592000ee59f0017f5a00700007002d0101010201020101480b30151001650702060202010423011e1b5b0b3a09090118040109010301052b033c082a180120370101010408040103070a021d013a0101010204080109010a021a010202390104020402020303011e0203010b0239010405010204011402160601013a0101020104080107030a021e013b0101010c01090128010301370101030503010407020b021d013a01020102010301050207020b021c02390201010204080109010a021d0148010401020301010801510102070c08620102090b0749021b0101010101370e01050102050b0124090166040106010202021902040310040d01020206010f01000300031d021e021e02400201070801020b09012d030101750222017603040209010603db0202013a010107010101010208060a0201301f310430070101050128090c0220040202010338010102030101033a0802029803010d0107040106010302c6400001c32100038d016020000669020004010a200250020001030104011902050197021a120d012608190b2e0330010204020227014306020202020c0108012f01330101030202050201012a020801ee010201040100010010101000020001e201950500030102050428030401a502000400025003460b31047b01360f290102020a033104020207013d03240501083e010c0234090a0402015f0302010102060102019d010308150239020101010116010e070305c308020301011701510102060101020101020102eb010204060201021b025508020101026a0101010206010165030204010500090102f5010a0201010401900402020401200a280602040801090602032e0d010200070106010152160207010201027a06030101020107010148020301010100020b023405050101010001060f00053b0700013f0451010002002e0217000101030405080802071e0494030037043208010e011605010f000701110207010201056401a00700013d04000400076d07006080f00075736455736445636473615265636f766572794661696c65644c6f6767696e6744697361626c6564556e6b6e6f776e4e6f7443616c6c61626c65436f64654e6f74466f756e645f456e646f776d656e74546f6f4c6f775472616e736665724661696c65645f42656c6f7753756273697374656e63655468726573686f6c644b65794e6f74466f756e6443616c6c6565526576657274656443616c6c6565547261707065644465636f64654572726f7200004c0c01000000000001020304050607080a010b09000000000100000002000000030000000400000005000000060000000700000008000000090000000c0000000b"},"contract":{"name":"check_system","version":"0.1.0","authors":["[your_name] <[your_email]>"]},"V3":{"spec":{"constructors":[{"args":[],"docs":[],"label":"default","payable":false,"selector":"0xed4b9d1b"}],"docs":[],"events":[],"messages":[{"args":[],"docs":[],"label":"on_block_end_called","mutates":false,"payable":false,"returnType":{"displayName":["bool"],"type":0},"selector":"0x80069dcf"},{"args":[{"label":"gas_limit","type":{"displayName":["u64"],"type":1}}],"docs":[],"label":"set_hook","mutates":false,"payable":false,"returnType":null,"selector":"0xb9f71bfd"},{"args":[],"docs":[],"label":"on_block_end","mutates":true,"payable":false,"returnType":null,"selector":"0x00000001"},{"args":[],"docs":[],"label":"start_sidevm","mutates":false,"payable":false,"returnType":{"displayName":["bool"],"type":0},"selector":"0x1e37db50"},{"args":[{"label":"key","type":{"displayName":["Vec"],"type":2}},{"label":"value","type":{"displayName":["Vec"],"type":2}}],"docs":[],"label":"cache_set","mutates":false,"payable":false,"returnType":{"displayName":["bool"],"type":0},"selector":"0xc7524fb9"},{"args":[{"label":"key","type":{"displayName":["Vec"],"type":2}}],"docs":[],"label":"cache_get","mutates":false,"payable":false,"returnType":{"displayName":["Option"],"type":4},"selector":"0x96e42b5e"},{"args":[{"label":"delegate","type":{"displayName":["Hash"],"type":5}},{"label":"json","type":{"displayName":["String"],"type":7}}],"docs":[],"label":"parse_usd","mutates":false,"payable":false,"returnType":{"displayName":["Option"],"type":8},"selector":"0xafead99e"},{"args":[{"label":"delegate","type":{"displayName":["ink_env","Hash"],"type":5}},{"label":"script","type":{"displayName":["String"],"type":7}},{"label":"args","type":{"displayName":["Vec"],"type":11}}],"docs":[],"label":"eval_js","mutates":false,"payable":false,"returnType":{"displayName":["Result"],"type":12},"selector":"0xf32e54c5"},{"args":[{"label":"delegate","type":{"displayName":["ink_env","Hash"],"type":5}},{"label":"script","type":{"displayName":["Vec"],"type":2}},{"label":"args","type":{"displayName":["Vec"],"type":11}}],"docs":[],"label":"eval_js_bytecode","mutates":false,"payable":false,"returnType":{"displayName":["Result"],"type":12},"selector":"0x05660fa2"},{"args":[{"label":"contract_id","type":{"displayName":["AccountId"],"type":14}},{"label":"deposit","type":{"displayName":["Balance"],"type":10}}],"docs":[],"label":"ContractDeposit::change_deposit","mutates":true,"payable":false,"returnType":{"displayName":["Result"],"type":15},"selector":"0xa24bcb44"}]},"storage":{"struct":{"fields":[{"layout":{"cell":{"key":"0x0000000000000000000000000000000000000000000000000000000000000000","ty":0}},"name":"on_block_end_called"}]}},"types":[{"id":0,"type":{"def":{"primitive":"bool"}}},{"id":1,"type":{"def":{"primitive":"u64"}}},{"id":2,"type":{"def":{"sequence":{"type":3}}}},{"id":3,"type":{"def":{"primitive":"u8"}}},{"id":4,"type":{"def":{"variant":{"variants":[{"index":0,"name":"None"},{"fields":[{"type":2}],"index":1,"name":"Some"}]}},"params":[{"name":"T","type":2}],"path":["Option"]}},{"id":5,"type":{"def":{"composite":{"fields":[{"type":6,"typeName":"[u8; 32]"}]}},"path":["ink_env","types","Hash"]}},{"id":6,"type":{"def":{"array":{"len":32,"type":3}}}},{"id":7,"type":{"def":{"primitive":"str"}}},{"id":8,"type":{"def":{"variant":{"variants":[{"index":0,"name":"None"},{"fields":[{"type":9}],"index":1,"name":"Some"}]}},"params":[{"name":"T","type":9}],"path":["Option"]}},{"id":9,"type":{"def":{"composite":{"fields":[{"name":"usd","type":10,"typeName":"u128"}]}},"path":["indeterministic_functions","indeterministic_functions","Usd"]}},{"id":10,"type":{"def":{"primitive":"u128"}}},{"id":11,"type":{"def":{"sequence":{"type":7}}}},{"id":12,"type":{"def":{"variant":{"variants":[{"fields":[{"type":13}],"index":0,"name":"Ok"},{"fields":[{"type":7}],"index":1,"name":"Err"}]}},"params":[{"name":"T","type":13},{"name":"E","type":7}],"path":["Result"]}},{"id":13,"type":{"def":{"variant":{"variants":[{"fields":[{"type":7,"typeName":"String"}],"index":0,"name":"String"},{"fields":[{"type":2,"typeName":"Vec"}],"index":1,"name":"Bytes"},{"index":2,"name":"Undefined"}]}},"path":["check_system","js","Output"]}},{"id":14,"type":{"def":{"composite":{"fields":[{"type":6,"typeName":"[u8; 32]"}]}},"path":["ink_env","types","AccountId"]}},{"id":15,"type":{"def":{"variant":{"variants":[{"fields":[{"type":16}],"index":0,"name":"Ok"},{"fields":[{"type":17}],"index":1,"name":"Err"}]}},"params":[{"name":"T","type":16},{"name":"E","type":17}],"path":["Result"]}},{"id":16,"type":{"def":{"tuple":[]}}},{"id":17,"type":{"def":{"variant":{"variants":[{"fields":[{"type":7,"typeName":"String"}],"index":0,"name":"Other"},{"fields":[{"type":18,"typeName":"Error"}],"index":1,"name":"SystemError"},{"index":2,"name":"BadOrigin"}]}},"path":["pink_extension","system","DriverError"]}},{"id":18,"type":{"def":{"variant":{"variants":[{"index":0,"name":"PermisionDenied"},{"index":1,"name":"DriverNotFound"}]}},"path":["pink_extension","system","Error"]}}]}} \ No newline at end of file +{"source":{"hash":"0xacfc958c703ef51c9240200af9ba00c07f7f0a31d2635646f3679f34d9730f87","language":"ink! 3.4.0","compiler":"rustc 1.66.0-nightly","wasm":"0x0061736d01000000018f011460037f7f7f017f60027f7f017f60027f7f0060037f7f7f0060017f0060047f7f7f7f0060057f7f7f7f7f017f60017f017f60000060047f7f7f7f017f60087f7f7e7f7f7f7f7f017f60067f7f7f7f7f7f017f60047f7e7e7e006000017f60037f7e7e017f60077f7f7e7f7f7f7f017f60057f7f7f7f7f0060077f7f7f7f7f7f7f017f60037f7e7e0060037e7f7f000280020b057365616c31097365616c5f63616c6c000a057365616c30127365616c5f64656c65676174655f63616c6c000b057365616c30107365616c5f7365745f73746f726167650003057365616c30107365616c5f6765745f73746f726167650000057365616c30197365616c5f63616c6c5f636861696e5f657874656e73696f6e0006057365616c300a7365616c5f696e7075740002057365616c300b7365616c5f72657475726e0003057365616c300b7365616c5f63616c6c65720002057365616c300c7365616c5f616464726573730002057365616c30167365616c5f76616c75655f7472616e73666572726564000203656e76066d656d6f727902010210035c5b0002000c0302030203010106010001010101010105010102020102040202030301020302020204020d04080408040e0202070f07090405010100000301010003050301030907030606051004010100010111050500011213020000040501700117170608017f01418080040b071102066465706c6f7900340463616c6c0036091c010041010b1614191b1c1a13181d201f5f4c5544464717565758595a0ab9b7015b2b01017f037f2002200346047f200005200020036a200120036a2d00003a0000200341016a21030c010b0b0b2601017f037f2001200246047f200005200020026a41303a0000200241016a21020c010b0b1a0b3f01027f0340200245044041000f0b200241016b210220012d0000210320002d00002104200041016a2100200141016a210120032004460d000b200420036b0b950102017f057e230041106b220424002004200342ffffffff0f832205200142ffffffff0f8322067e22072005200142208822087e22052006200342208822097e7c22014220867c220637030020042006200754ad200820097e2001200554ad4220862001422088847c7c200220037e7c370308200429030021012000200441086a29030037030820002001370300200441106a24000b370020022001100f2001044020002001410c6c6a210103402000280200200041086a280200200210102000410c6a22002001470d000b0b0b7401017f230041106b2202240002402001413f4d04402000200141027410620c010b200141ffff004d0440200220014102744101723b010e20002002410e6a4102102c0c010b200141ffffffff034d044020014102744102722000103a0c010b20004103106220012000103a0b200241106a24000b100020022001100f200220002001102c0b8d0101017f230041406a22022400200241286a200141186a290000370300200241206a200141106a290000370300200241186a200141086a2900003703002002420137030820022001290000370310200241386a41808001360200200241989904360234200241003602302002200241306a20001012200241106a200228020020022802041002200241406b24000b6202017f017e230041206b22032400200129020421042003410036021820032004370310200320023a001f200341106a2003411f6a4101102c20012003290310370204200341086a20012003280218102920002003290308370300200341206a24000b5b01017f230041106b22022400027f2000280200220029030050044020012802184184800441042001411c6a28020028020c1100000c010b2002200041086a36020c20014180800441042002410c6a410110150b200241106a24000b820301067f230041406a220224002000280200210641012100024020012802182203419e970441032001411c6a280200220728020c22041100000d00024020012802002205410471450440200341d58104410320041100000d022003419b9704410320041100000d02200341cf8104410220041100000d022006200110160d02200128020021050c010b200341cc8104410320041100000d01200241013a0017200241346a41b081043602002002200736020c2002200336020820022005360218200220012d00203a00382002200128020436021c20022001290210370328200220012902083703202002200241176a3602102002200241086a22033602302003419b9704410310170d01200241086a41cf8104410210170d012006200241186a10160d01200228023041d181044102200228023428020c1100000d010b2005410471450440200128021841d981044102200128021c28020c11000021000c010b200128021841d881044101200128021c28020c11000021000b200241406b240020000ba20201047f230041406a2205240041012107024020002802182206200120022000411c6a280200220228020c22011100000d00024020002802002208410471450440200641dd8104410120011100000d022003200020041101000d0220002802182106200028021c28020c21010c010b200641db8104410220011100000d01200541013a0017200541346a41b081043602002005200236020c2005200636020820052008360218200520002d00203a00382005200028020436021c20052000290210370328200520002902083703202005200541176a3602102005200541086a3602302003200541186a20041101000d01200528023041d181044102200528023428020c1100000d010b200641ac81044101200111000021070b200541406b240020070be50402047f027e230041c0016b220224000240027f02402001280200220341107145044020034120710d01200041086a2903002106200029030021072002412736023c200241206a200720061060200241286a2903002106200229032021072002290330200241406b2002413c6a106102402006200784500d00200228023c220041146b220320004b0d04200241d4006a2003100b2002411436023c200241086a200720061060200241106a2903002107200229030821062002290318200241406b2002413c6a10612006200784500d00200228023c220041016b220320004b0d04200241c1006a2003100b2002410036023c2006a741ff017141306a220041ff01712000470d04200220003a00400b4127200228023c22006b220341284f0d03200141cc98044100200241406b20006a200310510c020b200041086a2903002106200029030021074180012100024003402000450440410021000c020b200041016b2200200241406b6a413041d7002007a7410f712203410a491b20036a3a00002007420f5620064200522006502006423c862007420488842107200642048821061b0d000b20004181014f0d030b200141e181044102200241406b20006a41800120006b10510c010b200041086a2903002106200029030021074180012100024003402000450440410021000c020b200041016b2200200241406b6a413041372007a7410f712203410a491b20036a3a00002007420f5620064200522006502006423c862007420488842107200642048821061b0d000b20004181014f0d020b200141e181044102200241406b20006a41800120006b10510b200241c0016a24000f0b000b9a0701127f230041d0006b22032400200341003b014c2003410a3602482003428a808080103703402003200236023c2003410036023820032002360234200320013602302003200236022c200341003602282000280204210b2000280200210c2000280208210d200341c8006a210e0240027f034002400240024020032d004d0d0020032802302100027f0240200328023c22082003280234220f4b0440200021060c010b2003280244220541016b220220054b211020002106024003402002200e6a2113200328023821040340200420084b22010d0320100d0a4100200420066a20011b210120132d00002109027f0240024002400240200820046b220741084f04402001200141036a417c712202460440200741086b2111410021020c030b200341206a20092001200220016b2202200720022007491b2202105320032802204101470d01200328022421010c040b200341106a20092001200710532003280214210120032802100c040b2002200741086b22114b0d010b200941818284086c21120340200241046a220a2002490d0e200120026a2802002012732214417f73201441818284086b712001200a6a280200201273220a417f73200a41818284086b7172418081828478710d012002200241086a22024b0d0e200220114d0d000b0b200220074b0d0c200341186a2009200120026a200720026b1053410020032802184101470d011a2002200328021c6a22012002490d0c0b41010b4101470d02200141016a2201450d0a2004200120046a22044b0d0a2003200436023820042005492004200f4b720d000b200341086a41002005200e410410542006200420056b6a210120032802082102200328020c200546047f200120022005100c0541010b04402003280244220541016b220220054b211020032802302106200328023c22082003280234220f4d0d010c030b0b20032802382201200328022822066b220220014b0d0820032001360228200020066a0c020b200320083602380b20032d004d0d01024020032d004c0440200328022c2201200328022822006b220220014b21010c010b200328022c2201200328022822006b220220014b22010d072002450d020b200341013a004d20014101710d06200020066a0b2100200d2d0000450d01200c41c881044104200b28020c110000450d010c020b41000c030b200d2002047f200020026a41016b2d0000410a460541000b3a0000200c20002002200b28020c110000450d010b0b41010b200341d0006a24000f0b000b9a0301017f230041106b22022400027f024002400240024002400240024002400240024002400240200028020022002d000041016b0e0b0102030405060708090a0b000b2002200041016a36020c200141bf980441062002410c6a410210150c0b0b200128021841b29804410d2001411c6a28020028020c1100000c0a0b200128021841a49804410e2001411c6a28020028020c1100000c090b200128021841999804410b2001411c6a28020028020c1100000c080b200128021841ff9704411a2001411c6a28020028020c1100000c070b200128021841f19704410e2001411c6a28020028020c1100000c060b200128021841e1970441102001411c6a28020028020c1100000c050b200128021841d59704410c2001411c6a28020028020c1100000c040b200128021841ca9704410b2001411c6a28020028020c1100000c030b200128021841c3970441072001411c6a28020028020c1100000c020b200128021841b49704410f2001411c6a28020028020c1100000c010b200128021841a1970441132001411c6a28020028020c1100000b200241106a24000b1b00200128021841c5980441052001411c6a28020028020c1100000b850101017f230041106b22022400027f0240024002402000280200220028020041016b0e020102000b2002200041046a3602082001418e81044106200241086a410310150c020b2002200041046a36020c20014189810441052002410c6a410410150c010b20012802184180810441092001411c6a28020028020c1100000b200241106a24000bdd0b01117f230041206b2207240020002802002200280208210a200028020021094101210c024002402001280218220b41222001411c6a280200220e280210220f1101000d00200741003602102007200936021420072009200a6a22013602180240200741106a4104722210104f2202418080c400460d00200921000340200120006b220020072802142211200728021822126b6a220120004b0d032007280210220820016a22002008490d0320072000360210418280c40021010240024002400240027f02400240024002400240200241096b0e050806010107000b2002450440413021000c090b2002412246200241dc0046720d010b2002410b74210641002101412121044121210002400340200120044101766a22032001490d0d024002402006200341027441c090046a280200410b7422044d044020042006460d02200321000c010b200341016a2201450d0f0b200020016b220420004b0d0e200020014b0d010c020b0b200341016a21010b200141204b0d0b2001410274220341c090046a2802004115762100024020014120470440200341c490046a280200411576220320006b220420034d0d010c0d0b41d70520006b220441d8054f0d0c0b4100210320022001200141016b22064f047f200641214f0d0c200641027441c090046a28020041ffffff00710541000b6b220d20024b0d0b200441016b220620044b0d0b200020046a41016b210302402006450d00200041d705200041d705491b41d7056b21044100210103402004450d0d20012001200041c491046a2d00006a22014b0d0d2001200d4b0440200021030c020b200441016a2104200041016a2100200641016b22060d000b0b20024101726741027641077320034101710d031a20024120490d02418180c4002101200241ff004f0d010b200221000c060b2002418080044f04402002418080084f0440200241b0c70c6b41d0ba2b49200241cba60c6b410549722002419ef40b6b41e20b49200241e1d70b6b419f18497272200241feffff0071419ef00a46200241a29d0b6b410e4972200241e0ffff007141e0cd0a46200241baee0a6b4106497272720d02200221002002418080c4006b41f083744f0d020c070b20022100200241e28a04412c41ba8b0441c40141fe8c0441c203105b0d060c010b20022100200241c48504412841948604419f0241b3880441af02105b0d050b2002410172674102764107730b2100200221010c030b41ee0021000c020b41f20021000c010b41f40021000b0240024002402001418080c4006b2203410320034103491b41016b0e03020100010b200041056a22032000490d0520034101460d010b0240200520084b0d0002402005450d002005200a4f04402005200a460d010c020b200520096a2c00004140480d010b02402008450d002008200a4f04402008200a470d020c010b200820096a2c00004140480d010b200820056b220320084b0d05200b200520096a2003200e28020c1100004504404105210303402003210620012105418080c40021012000210402400240024002402005418080c4006b220d4103200d4103491b41016b0e03030200010b41fd00210441002103200521010240024002400240200641ff017141016b0e050603000102040b41fb002104410221030c050b41f5002104410321030c040b41dc002104410421030c030b200041ffffffff03712000470d0a2000410274220341204f0d0a20012003411c7176410f712203413072200341d7006a2003410a491b21042006410120001b2103200041016b410020001b21000c020b027f41012002418001490d001a41022002418010490d001a41034104200241808004491b0b20086a22052008490d0920112100201221012010104f2202418080c400470d060c070b41dc002104418180c40021010b200b2004200f110100450d000b0b0c040b2009200a20052008105d000b20112100201221012010104f2202418080c400470d000b0b200741086a2009200a2005105c200b2007280208200728020c200e28020c1100000d00200b4122200f110100210c0b200741206a2400200c0f0b000ba00301057f230041406a2202240020002802002200280208210520002802002103200128021841df810441012001411c6a28020028020c11000021002005044041012104034020004101712100027f410120000d001a0240024002400240200128020022064104714504402004410171450d010c040b20044101710d01200128021c2104200128021821000c020b4101200128021841d381044102200128021c28020c1100000d031a0c020b41012001280218220041de81044101200128021c220428020c1100000d021a0b200241013a00172002200436020c2002200036020820022006360218200241b08104360234200220012d00203a00382002200128020436021c20022001290210370328200220012902083703202002200241176a3602102002200241086a3602302003200241186a1041450440200228023041d181044102200228023428020c1100000c020b41010c010b2003200110410b2100200341016a210341002104200541016b22050d000b0b410121032000450440200128021841e081044101200128021c28020c11000021030b200241406b240020030b5c01017f230041106b22022400027f200028020022002802004103470440200220003602082001418b80044102200241086a410510150c010b2002200041046a36020c20014188800441032002410c6a410310150b200241106a24000bff0201077f230041106b220524002000027f0240027f02400240200204400240200141004e044020032802080d0120052001200210492005280200210420052802040c050b200041086a41003602000c050b20032802042209450440200541086a200120024100104a20052802082104200528020c0c040b200120026a41016b410020026b7122082001490d01200141909904280200220620086a22072006490d031a2003280200210a419499042802002007490440200841ffff036a22032008490d032003411076220740002203417f46200341ffff0371200347720d032003411074220620074110746a22032006490d034194990420033602002001200620086a22072006490d041a0b41909904200736020020012006450d031a2006200a2009100a210420010c030b20002001360204200041086a41003602000c030b000b20010b21072004044020002004360204200041086a200736020041000c020b20002001360204200041086a20023602000b41010b360200200541106a24000b5701017f230041106b22022400027f20002903004202520440200220003602082001418b80044102200241086a410610150c010b2002200041086a36020c20014188800441032002410c6a410710150b200241106a24000b5701017f230041106b22022400027f20002802004104470440200220003602082001418b80044102200241086a410810150c010b2002200041046a36020c20014188800441032002410c6a410710150b200241106a24000be20302097f017e230041306b22022400200241086a2001102202402002280208450440024002402001280204410c6e2203200228020c220720032007491b2205450440410421030c010b200541aad5aad5004b0d012005410c6c410410232203450d010b200241003602182002200536021420022003360210200704400340200241206a2001102402402002280220220904402002290224210b20042002280214470d01200241106a2105230041206b2203240002400240200441016a2206450d002005280204220420046a22082004490d002008200620062008491b22064104200641044b1b2206410c6c2108200641abd5aad50049410274210a0240200404402003410436021820032004410c6c360214200320052802003602100c010b200341003602180b20032008200a200341106a101e2003280200450d01200341086a2802001a0b000b200328020421042005200636020420052004360200200341206a240020022802102103200228021821040c010b200041003602000c050b20032004410c6c6a2204200b37020420042009360200200228021841016a2204450d0220022004360218200741016b22070d000b0b20002002290310370200200041086a200241186a2802003602000c020b000b200041003602000b200241306a24000bc30201047f230041206b22022400200241086a2001102e41012104024020022d00084101710d00024002400240024020022d0009220341037122054103470440200541016b0e020302010b200341ff017141044f0d04200128020422054104490d042001280200220428000021032001200541046b3602042001200441046a36020020034180808080044921040c040b200341fc01714102762103410021040c030b200220033a0015200241013a0014200220013602102002410036021c200241106a2002411c6a41041063450d010c020b200220033a0015200241013a001420022001360210200241003b011c200241106a2002411c6a410210630d0120022f011c220141ff014d0d0120014102762103410021040c010b200228021c220141808004492104200141027621030b2000200336020420002004360200200241206a24000bb50101027f2000200020016a41016b410020016b7122014d0440024041909904280200220020016a22032000490d004194990428020020034904402001200141ffff036a22004b044041000f0b2000411076220240002200417f46044041000f0b2000200041ffff037147044041000f0b2000411074220020024110746a2203200049044041000f0b41002102419499042003360200200020016a22032000490d010b419099042003360200200021020b20020f0b000b9c0502087f017e230041106b2205240020052001102f0240200528020022030440024002402005290204220a422088a72204450d004100200441076b2201200120044b1b2108200341036a417c7120036b210941002101034002400240024002400240200120036a2d00002206411874411875220741004e0440200920016b4103712009417f46720d020240200120084f0d000340200120036a2202280200200241046a28020072418081828478710d012001200141086a22014b0d0320012008490d000b0b200120044f0d050340200120036a2c00004100480d062004200141016a2201470d000b0c070b02400240200641c483046a2d000041026b0e03040100090b200141016a220220044f0d08200220036a2c000021020240024002400240200641f0016b0e050100000002000b2007410f6a41ff017141024b200241004e720d0b20024140490d020c0b0b200241f0006a41ff01714130490d010c0a0b2002418f7f4a0d090b200141026a220220044f0d08200220036a2c000041bf7f4a0d08200141036a220120044f0d08200120036a2c000041bf7f4c0d040c080b200141016a220220044f0d07200220036a2c00002102024002400240200641e001470440200641ed01460d012007411f6a41ff0171410c490d022007417e71416e47200241004e720d0b20024140490d030c0b0b200241607141a07f460d020c0a0b200241a07f480d010c090b200241bf7f4a0d080b200141026a220120044f0d07200120036a2c000041bf7f4c0d030c070b000b200141016a21010c020b200141016a220120044f0d04200120036a2c000041bf7f4a0d040b200141016a21010b20012004490d000b0b200020043602082000200a3e0204200020033602000c020b200041003602000c010b200041003602000b200541106a24000b4601017f230041206b22012400200141186a4180800136020020014198990436021420014100360210200141086a200141106a2000101241002001280208200128020c1028000be80201077f230041206b22032400200341186a4180800136020020034198990436021420034100360210200341086a2107230041206b22022400200341106a220628020421042002200641086a2802002205360214200220043602100240024002402001280200220841034704402005450d02200441003a0000024002400240200841016b0e020102000b200541014d0d04200441003a000120024102360218200141046a2802002001410c6a280200200241106a10100c030b200541014d0d03200441013a000120024102360218200141046a2802002001410c6a280200200241106a10100c020b200541014d0d02200441023a0001200241023602180c010b2005450d01200441013a000020024101360218200141046a2802002001410c6a280200200241106a10100b20062002290310370204200241086a20062002280218102920072002290308370300200241206a24000c010b000b20002003280208200328020c1028000bd20201077f230041206b22052400200541186a4180800136020020054198990436021420054100360210200541086a2107230041206b22022400200541106a220628020421032002200641086a28020022043602142002200336021002400240027f20012d0000220841034604402004450d02200341003a000041010c010b2004450d01200341013a0000024002400240200841016b0e020102000b200441014d0d03200341003a000120024102360218200141046a2802002001410c6a280200200241106a1010200228021421042002280210210320022802180c020b200441014d0d02200341013a000120044102460d02200320012d00013a000241030c010b200441014d0d01200341023a000141020b21012006200436020820062003360204200241086a20062001102920072002290308370300200241206a24000c010b000b20002005280208200528020c1028000b0b002000200120021006000b3c01017f2002200141086a28020022034b0440000b2001200320026b36020820012001280204220120026a36020420002002360204200020013602000b5102017f017e230041206b220224002000290204210320024100360218200220033703102001200241106a102b20002002290310370204200241086a2000200228021810292002280208200241206a24000b0a00200120004120102c0b5e01037f230041106b2203240002402000280208220420026a220520044f0440200341086a20042005200028020020002802041054200328020c2002470d01200328020820012002100a1a20002005360208200341106a24000f0b000b000bb90201027f230041306b22022400200241086a2001102e024020022d00084101710440200041043602000c010b024002400240024020022d00090e020102000b200041043602000c030b20022001102e20022d00004101710d0102400240024020022d000122030e03000102040b200241206a200110242002280220450d03200241186a200241286a28020036020020022002290320370310410021030c010b200241206a2001102f2002280220450d02200241186a200241286a28020036020020022002290320370310410121030b200020022903103702042000410c6a200241186a280200360200200020033602000c020b200241206a200110242002280220220104402000200229022437020820002001360204200041033602000c020b200041043602000c010b200041043602000b200241306a24000b3c01017f200020012802042202047f2001200241016b36020420012001280200220141016a36020020012d00000520010b3a000120002002453a00000b990102057f017e230041106b22022400200241086a200110220240200228020845044020012802042204200228020c22034f0440200220034101104b200235020421072002280200200128020022052003100a21062001200420036b3602042001200320056a360200200020072003ad42208684370204200020063602000c020b200041003602000c010b200041003602000b200241106a24000b6001017f230041106b2201240020004200370000200041186a4200370000200041106a4200370000200041086a420037000020014120360204200120003602002001412036020c20002001410c6a10082001200128020c1031200141106a24000b3301017f230041106b22022400200241086a4100200120002802002000280204105420002002290308370200200241106a24000b6c02027f027e230041206b22002400200041086a220142003703002000420037030020004110360214200020003602102000411036021c20002000411c6a1009200041106a200028021c10312001290300210220002903002103200041206a2400410541042002200384501b0b0a00200041a4800410110b8b0101017f230041206b220024000240103241ff01714105470d002000418080013602042000419899043602002000103520002802044104490d00200028020028000041ed97f5dc01470d00103241ff01714105470d00200041186a4200370300200041106a4200370300200041086a420037030020004200370300410020001011200041206a24000f0b000b3301017f230041106b220124002001200028020436020c20002802002001410c6a10052000200128020c1031200141106a24000bb434020d7f0a7e230041a0036b2200240002400240103241ff01714105470d0020004180800136029c012000419899043602980120004198016a10352000200028029c0122053602d401200020002802980122023602d00120054104490d00200228000021072000200541046b22063602d4012000200241046a22083602d001200741187621042007411076210120074108762103027f0240024002400240024002400240200741ff01712207044020074105460d062007411e460d01200741f301460d052007419601460d03200741a201460d07200741af01460d04200741b901470440200741c701460d03200741800147200341ff017141064772200141ff0171419d0147200441cf014772720d0a41000c090b200341ff017141f70147200141ff0171411b4772200441fd0147200641084972720d092008290000220f420888210d200fa7210541010c080b200341ff0171200141ff0171722004410147720d0841020c070b200341ff0171413747200141ff017141db014772200441d00047720d0741030c060b200341ff017141d20047200141ff017141cf004772200441b90147720d06200041d8006a200041d0016a102f20002802582203450d06200029025c210f20004188026a200041d0016a102f2000280288022204450d06200f420888210d2000280290022101200028028c022108200fa7210541040c050b200341ff017141e40147200141ff0171412b4772200441de0047720d0520004188026a200041d0016a102f2000280288022203450d05200035008d0220004191026a33000020004193026a3100004210868442208684210d20002d008c02210541050c040b200341ff017141ea0147200141ff017141d90147722004419e0147200641204972720d042000200541246b3602d4012000200241246a3602d001200241076a2d0000210320022f0005200229001c21132002280018210120022800142108200228001021042002290008210f20022d0004210220004188026a200041d0016a10242000280288022206450d04200f420888210d2003411074724108742002722103200029028c02210e200fa7210541060c030b200341ff0171412e47200141ff017141d4004772200441c50147200641204972720d032000200541246b3602d4012000200241246a3602d001200229001c210e2002280018210620022900102113200228000c21012002280008210820022800042104200041d8006a200041d0016a102420002802582203450d03200029025c210f20004188026a200041d0016a1021200028028802450d03200f420888210d20003502900221112000290388022110200fa7210541070c020b200341ff017141e60047200141ff0171410f4772200441a20147200641204972720d022000200541246b3602d4012000200241246a3602d001200229001c210e2002280018210620022900102113200228000c21012002280008210820022800042104200041d8006a200041d0016a102f20002802582203450d02200029025c210f20004188026a200041d0016a1021200028028802450d02200f420888210d20003502900221112000290388022110200fa7210541080c010b200341ff017141cb0047200141ff017141cb014772200441c4004720064120497272200541246b411049720d012002290004220f420888210d2002412c6a29000021102002290024210e200228000c210420022800102108200228001421012002290018211320022800202106200fa7210541090b210720004198026a4200370300200041a0026a4200370300200041a8026a42003703002000420037039002200042013703880220004180800136025c2000419899043602582000418080013602d00120004190026a41989904200041d0016a10032102200041d8006a20002802d00110312002410c4f0d00200241027441d498046a2802000d00200028025c450d00410021020240024020002802582d00000e020100020b410121020b2005ad42ff0183200d420886842114200d42ffffffffffffffff0083210d0240024002400240024002400240024002400240024002400240200741016b0e09080706050403020100090b103241ff01714105470d0c4200210d4200210f230041206b22032400230041206b220924000240024002400240024020105045044020104280c8afa025540d0120104280c8afa025510d0320104280c8afa02582210d20104280c8afa0258021120c020b200e4280c8afa025822111200e4280c8afa02580210f0c030b0240201079a72207411e6b220520074b0d0002402005450440413f21050c010b41c00020056b220541c0004b0d010b200941106a210b230041106b220724004280c8afa0252111024002400240200541ff0071220a41c00071450440200a450d0141c000200a6b220c41c0004b0d024200200a413f71ad2211864280c8afa025200c413f71ad8884210d4280c8afa02520118621110c010b4280c8afa025200a413f71ad86210d420021110b200720113703002007200d3703080c010b000b2007290300210d200b200741086a290300370308200b200d370300200741106a2400200541ff004b200541c0004f720d00200941186a29030021122009290310210f42012005ad86210d03400240201020127d200e200f54ad7d22114200530d00200e200f7d210e200d2015842115201150450440201121100c010b200e4280c8afa025822111200e4280c8afa02580201584210f0c050b2012423f86200f42018884210f200d420188210d201242018821120c000b000b000b200e4280c8afa0255a4101200d501b450440200e21110c030b4280e497d012210f428080808080808080807f211103400240200d200f7d200e201654ad7d22104200530d00200e20167d210e201120158421152010504504402010210d0c010b200e4280c8afa025822111200e4280c8afa02580201584210f4200210d0c040b200f423f86201642018884211620114201882111200f420188210f0c000b000b200e2010822111200e201080210f420121120c010b4200210d420021120b200320113703102003200f370300200341186a200d37030020032012370308200941206a24002003290300210d2000200341086a2903003703082000200d370300200341206a2400200041d0016a1037200041b8026a200041e8016a290300370300200041b0026a200041e0016a290300370300200041a8026a200041d8016a29030037030020004190026a420037030020004198026a22074200370300200020002903d0013703a002200042003703880220002802f0012103200041d8006a220520004188026a22094138100a1a200920054138100a1a200041e4026a220941c5d8efc401360200200041e0026a2006360200200041d8026a2013370300200041d4026a2001360200200041d0026a2008360200200041cc026a2004360200200041c4026a220420143702002000200028020022063602c002200020033602e802200041186a418080013602002000419899043602144100210520004100360210200029038802210d200041106a2201200041a0026a102a210a20012000290390022007290300103821072000027f200341ffff0371044041cc980421012000280214210820002802180c010b2000290214210e200041003602a0012000200e37039801200920004198016a2201103920042001102b20062001103a200028029c01220420002802a0012205490d0d200028029801220120056a2108200420056b0b36023c200020083602382003103b200a200d200720012005200041386a103c410d710d0c20002000290338370398010240024020004198016a103d41ff0171220141026b0e02010e000b200041013a008802200020014100473a008902410120004188026a1027000b200041033a00880220021033410020004188026a1027000b103241ff01714105470d0b200041bc026a200e370200200041b8026a2006360200200041b0026a2013370300200041ac026a2001360200200041a8026a2008360200200041003602c402200020043602a402200041bf9d881e3602a0022000201437039802200020033602940220002011a72202360290022000201042ffffffff0f8320104220884220868437038802200041a0016a4180800136020020004198990436029c01200041003602980120004198016a200041a4026a102a2104200029029c01210e200041003602602000200e370358200041a0026a200041d8006a220110392003200d421888a7200110102010a720022001100e200028025c220320002802602201490d0b200028025821022000200320016b36023c2000200120026a360238024002400240200420022001200041386a103e2201410d7145044020002000290338370310200041d8006a200041106a102d200028025822024104460d02200041dc016a200041e4006a2802003602002000200029025c3702d4010c010b20002001418399046a2d00003a00d401410421020b200020023602d0010c010b200041003a00d401200041043602d0010b2000419c026a41013602002000420137028c022000419c8004360288022000410936025c2000200041d8006a360298022000200041d0016a36025820004188026a103f20002802d00122024104460d0b0c0c0b103241ff01714105470d0a200041b8026a200e370300200041b4026a2006360200200041ac026a2013370200200041a8026a2001360200200041a4026a2008360200200041003602c002200020043602a002200041c9feb6a60236029c022000200d421888a7220236029802200020033602940220002011a72204360290022000201042ffffffff0f8320104220884220868437038802200041a0016a4180800136020020004198990436029c01200041003602980120004198016a200041a0026a102a2105200029029c01210d200041003602602000200d3703582000419c026a200041d8006a2201103920032002200110102010a720042001100e200028025c220320002802602201490d0a200028025821022000200320016b36023c2000200120026a360238024002400240200520022001200041386a103e2201410d7145044020002000290338370310200041d8006a200041106a102d200028025822024104460d02200041dc016a200041e4006a2802003602002000200029025c3702d4010c010b20002001418399046a2d00003a00d401410421020b200020023602d0010c010b200041003a00d401200041043602d0010b2000419c026a41013602002000420137028c022000419c8004360288022000410936025c2000200041d8006a360298022000200041d0016a36025820004188026a103f20002802d00122024104460d0a0c0b0b103241ff01714105470d09200041b0026a2013370300200041ac026a2001360200200041a8026a2008360200200041a4026a20043602002000419c026a2014370200200041003602b8022000200336029802200041afd5e7f6793602940220002006360288022000200e37028c02200041d8016a418080013602002000419899043602d401200041003602d001200041d0016a20004198026a102a20002902d401210d200041003602602000200d37035820004194026a200041d8006a220110392006200e422088a720011010200028025c220420002802602201490d09200028025821022000200420016b36029c012000200120026a360298012002200120004198016a103e2201410d710d060240200028029c012202450d004200210d0240024020002802980122012d00000e020100020b200241016b4110490d01200141096a2900002110200129000121144201210d0b200041e8006a2010370300200020143703602000200d3703580c090b20004202370358200041003a00600c080b103241ff01714105470d0820004280800137028c02200041989904360288022003200d421888a720004188026a1010200028028c0222032000280290022201490d0820002802880221022000200320016b3602d4012000200120026a3602d001410820022001200041d0016a104020002802d0012102200020002802d401220136025c200020023602582001450d082000200141016b36025c2000200241016a360258410021010240024020022d000022020e0201000a0b20004188026a200041d8006a102f2000280288022201450d0920004190026a28020021020b230041206b22032400200341186a4180800136020020034198990436021420034100360210200341086a2108230041206b22002400200341106a220528020421042000200541086a28020022063602142000200436021002400240027f20014504402006450d02200441003a000041010c010b2006450d01200441013a00002000410136021820012002200041106a1010200028021421062000280210210420002802180b21012005200636020820052004360204200041086a20052001102920082000290308370300200041206a24000c010b000b41002003280208200328020c1028000b103241ff01714105470d0720004280800137028c02200041989904360288022003200d421888a720004188026a220210102004200120021010200028028c0222032000280290022201490d0720002802880221022000200320016b36028c022000200120026a3602880241062002200120004188026a1040200028028c02450d072000280288022d0000220141024f0d072001451025000b103241ff01714105470d06200041106a1037200041386a103020004180026a200041286a290300370300200041f8016a200041206a290300370300200041f0016a200041186a290300370300200020002903103703e801200041c0026a200041d0006a290300370300200041b8026a200041c8006a290300370300200041b0026a200041406b2903003703004100210120004190026a41cc800429000037030020004198026a220341d48004290000370300200041a0026a220441dc8004290000370300200020002903383703a802200041c4800429000037038802200041d8006a220520004188026a220641c000100a1a200041d8016a4200370300200041e0016a4200370300200042003703d0012000280230210220004198016a2208200041d0016a4138100a1a200620084138100a1a200041e6dea8a27a3602c402200041c8026a200541c000100a2105200020023602c00220004190036a4180800136020020004198990436028c032000410036028803200029038802210d20004188036a22062004102a210820062000290390022003290300103821032000027f200241ffff0371044041cc98042104200028028c0321062000280290030c010b200029028c03210e200041003602d8012000200e3703d001200041c4026a200041d0016a22011039200041e8026a2001102b20052001102b20002802d401220520002802d8012201490d0720002802d001220420016a2106200520016b0b36029c0320002006360298032002103b2008200d20032004200120004198036a103c410d710d0620002000290398033703d001200041d0016a103d41ff017122014103462001410247720d0641011025000b103241ff01714105470d05200041f0006a4200370300200041e8006a4200370300200041e0006a4200370300200042003703582000412036028c022000200041d8006a220136028802200041203602d0012001200041d0016a100720004188026a220320002802d0011031200310302002200120034120100c457210330c030b103241ff01714105470d04200041d0016a103720004198016a1030200041b8026a200041e8016a290300370300200041b0026a200041e0016a290300370300200041a8026a200041d8016a29030037030020004190026a420037030020004198026a22034200370300200020002903d0013703a002200042003703880220002802f0012102200041d8006a220120004188026a22044138100a1a200420014138100a1a200041c8026a4101360200200041f0026a220441b5d8ace305360200200041cc026a2205200029039801370200200041d4026a200041a0016a290300370200200041dc026a200041a8016a290300370200200041e4026a200041b0016a290300370200200020143703c002200020023602f802200041406b4180800136020020004198990436023c4100210120004100360238200029038802210d200041386a2206200041a0026a102a210820062000290390022003290300103821032000027f200241ffff0371044041cc98042104200028023c210620002802400c010b200029023c210e200041003602182000200e3703102004200041106a10392000280218220120002802144f0d05200028021020016a41003a00002000200141016a3602182005200041106a2201102b41012001103a2000201437038803200120004188036a4108102c2000280214220520002802182201490d052000280210220420016a2106200520016b0b36028c0320002006360288032002103b2008200d20032004200120004188036a103c410d710d042000200029038803370310200041106a103d41ff01714103470d020c040b103241ff01714105470d0320021025000b2000420237035820002001418399046a2d00003a00600c010b200041a0036a24000f0b2000419c026a41013602002000420137028c02200041f88004360288022000410a3602d4012000200041d0016a360298022000200041d8006a3602d00120004188026a103f2000290358220d4202510d002000290360210e200041e8006a2903002110230041206b22002400200041186a4180800136020020004198990436021420004100360210200041086a2105230041306b22012400200041106a220428020421022001200441086a28020022033602142001200236021002400240027f200d5004402003450d02200241003a000041010c010b2003450d01200241013a000020014101360218200120103703282001200e370320200141106a200141206a4110102c200128021421032001280210210220012802180b21062004200336020820042002360204200141086a20042006102920052001290308370300200141306a24000c010b000b41002000280208200028020c1028000b000b20004194026a200041dc016a280200360200200020002902d40137028c02200020023602880220024103470440410020004188026a1026000b410120004188026a1026000b870101027f230041106b2201240020014180800136020c200141989904360208410f419899044100200141086a1040200128020c411f4d0440000b200020012802082202290000370000200041086a200241086a290000370000200041106a200241106a290000370000200041186a200241186a29000037000020004100360020200141106a24000b6402017f017e230041306b220324002000290204210420034100360218200320043703102003200237032820032001370320200341106a200341206a4110102c20002003290310370204200341086a2000200328021810292003280208200341306a24000b0a00200120004104102c0b2601017f230041106b220224002002200036020c20012002410c6a4104102c200241106a24000b220020004115764108712000410e76410471200041077641027120004101717272720b5e01017f230041106b220724002007200628020436020c20002001200220032004200520062802002007410c6a100021002006200728020c1031410c21062000410b4d0440200041027441d498046a28020021060b200741106a240020060b7401027f230041106b22012400200141086a2000102e41032102024020012d00084101710d00410221020240024020012d00090e020201000b410321020c010b20012000102e4103210220012d00004101710d004101410320012d000122004101461b410020001b21020b200141106a240020020b5a01017f230041106b220424002004200328020436020c410020002001200220032802002004410c6a100121002003200428020c1031410c21032000410b4d0440200041027441d498046a28020021030b200441106a240020030bd20201037f23004190016b220124002001412c6a2000290210370200200141246a20002902083702002001410036024c200141023602402001410236023420014100360218200141cc9804360214200141033602102001200029020037021c2001410b36026c20012001411c6a3602742001200141f4006a360268200141086a41004100104b20014100360260200120012903083703582001410136028c012001420137027c200141cc98043602782001200141e8006a360288010240200141d8006a200141f8006a10420d00200128025820012802602001280210210220014280800137027c200141989904360278200120023a0068200141f8006a2202200141e8006a4101102c20021010200128027c22022001280280012200490d00200128027821032001200220006b36027c2001200020036a360278410a20032000200141f8006a104020014190016a24000f0b000b3a01017f230041106b220424002004200328020436020c20002001200220032802002004410c6a10041a2003200428020c1031200441106a24000b890301037f23004180016b220324000240027f0240200128020022024110714504402002412071450d0120002d00002102410021000340200020036a41ff006a413041372002410f712204410a491b20046a3a0000200041016b21002002220441047621022004410f4b0d000b20004180016a4181014f0d03200141e181044102200020036a4180016a410020006b10510c020b20002d00002102410021000340200020036a41ff006a413041d7002002410f712204410a491b20046a3a0000200041016b21002002220441047621022004410f4b0d000b20004180016a4181014f0d02200141e181044102200020036a4180016a410020006b10510c010b0240024020002d0000220241e3004d0440412621002002410a490d012003200241017441e381046a2f00003b0025412521000c020b20032002200241e4006e220241e4006c6b41ff017141017441e381046a2f00003b0025412421000b200020036a200241306a3a00000b200141cc98044100200020036a412720006b10510b20034180016a24000f0b000b0c00200020014194810410640bf50301057f230041406a22032400200341346a2001360200200341033a003820034280808080800437031820032000360230410021002003410036022820034100360220027f0240024020022802082201450440200241146a28020022004103742106200041ffffffff017121072002280210210041002101034020012006460d02200228020020016a220441046a28020022050440200328023020042802002005200328023428020c1100000d040b200141086a2101200028020020002802042105200041086a2100200341186a2005110100450d000b0c020b2002410c6a28020022074105742106200741ffffff3f71210703402006450d01200228020020006a220441046a28020022050440200328023020042802002005200328023428020c1100000d030b20032001411c6a2d00003a003820032001290204422089370318200341106a20022802102204200141146a105020032003290310370320200341086a20042001410c6a105020032003290308370328200041086a2100200641206b210620012802002105200141206a2101200420054103746a2204280200200341186a2004280204110100450d000b0c010b200228020420074b04402003280230200228020020074103746a22002802002000280204200328023428020c1100000d010b41000c010b41010b200341406b24000b0f00200028020020012002104541000b5601017f024020022000280204200028020822036b4b04402000200320021048418180808078470d01200028020821030b200028020020036a20012002100a1a200220036a22012003490d00200020013602080f0b000bbb0201027f230041106b220224000240024002400240200028020022002002410c6a027f0240024020014180014f04402002410036020c2001418010490d012001418080044f0d0220022001413f71418001723a000e20022001410c7641e001723a000c20022001410676413f71418001723a000d41030c030b200028020822032000280204460d030c040b20022001413f71418001723a000d2002200141067641c001723a000c41020c010b20022001413f71418001723a000f20022001410676413f71418001723a000e20022001410c76413f71418001723a000d2002200141127641077141f001723a000c41040b10450c020b2000200341011048418180808078470440000b200028020821030b200028020020036a20013a0000200341016a2201450d01200020013602080b200241106a240041000f0b000b4a01017f230041206b220224002000280200200241186a200141106a290200370300200241106a200141086a29020037030020022001290200370308200241086a1042200241206a24000bbe0101027f230041206b220324000240027f4100200120026a22022001490d001a2000280204220120016a22042001490d012004200220022004491b22024108200241084b1b2202417f73411f7621040240200104402003410136021820032001360214200320002802003602100c010b200341003602180b200320022004200341106a101e20032802004504402003280204210120002002360204200020013602004181808080780c010b200341086a2802000b200341206a24000f0b000b3901017f230041106b22032400200341086a200120024100104a200328020c21012000200328020836020020002001360204200341106a24000bd80101027f02402001450440200221030c010b200345044020012002102321030c010b4100210302402001200120026a41016b410020026b7122054d044041909904280200220220056a22042002490d02419499042802002004490440200541ffff036a22022005490d022002411076220340002202417f46200241ffff0371200247720d022002411074220220034110746a22042002490d0241002103419499042004360200200220056a22042002490d030b419099042004360200200221030c020b000b410021030b20002001360204200020033602000b6a01027f230041106b2203240002402001450440410121020c010b200141004e22040440027f2002450440200341086a20012004104920032802080c010b2003200120044101104a20032802000b22020d010b000b2000200136020420002002360200200341106a24000b0e0020002802001a03400c000b000ba40101037f20022104024002400240410120012d0020220320034103461b410371220341016b0e03010001020b200241016a2203044020034101762104200241017621030c020b000b41002104200221030b200341016a21022001411c6a2802002105200128020421032001280218210102400340200241016b2202450d01200120032005280210110100450d000b418080c40021030b20002004360204200020033602000b3201017f027f0340200120012004460d011a200441016a2104200220002003280210110100450d000b200441016b0b2001490bb70101047f200028020022012000280204460440418080c4000f0b2000200141016a36020020012d00002203411874411875410048047f2000200141026a36020020012d0001413f7121022003411f712104200341df014d044020044106742002720f0b2000200141036a36020020012d0002413f712002410674722102200341f00149044020022004410c74720f0b2000200141046a3602002004411274418080f0007120012d0003413f71200241067472720520030b0b5501027f0240027f02400240200228020041016b0e020103000b200241046a0c010b200120022802044103746a2201280204410c470d0120012802000b2802002104410121030b20002004360204200020033602000bae0401097f230041106b22082400418080c400210a20042107024002402000280200220b4101710440200441016a2207450d01412b210a0b0240200b41047145044041002101200721050c010b024020024504400c010b200221092001210503402006200620052c000041bf7f4a6a22064b0d03200541016a2105200941016b22090d000b0b200620076a22052007490d010b200028020845044041012106200041186a28020022052000411c6a2802002200200a2001200210520d02200520032004200028020c11000021060c020b02402000410c6a280200220720054b0440200b4108710d01200720056b220520074b0d02200820002005104d4101210620082802002207418080c400460d0320082802042109200041186a28020022052000411c6a2802002200200a2001200210520d03200520032004200028020c1100000d032007200920052000104e21060c030b41012106200041186a28020022052000411c6a2802002200200a2001200210520d02200520032004200028020c11000021060c020b2000280204210c2000413036020420002d0020210d41012106200041013a0020200041186a28020022092000411c6a280200220b200a2001200210520d01200720056b220120074b0d00200841086a20002001104d20082802082201418080c400460d01200828020c2102200920032004200b28020c1100000d01200120022009200b104e0d012000200d3a00202000200c360204410021060c010b000b200841106a240020060b39000240027f2002418080c40047044041012000200220012802101101000d011a0b20030d0141000b0f0b200020032004200128020c1100000b5701027f024002402003450440410021030c010b200141ff017121054101210103402005200220046a2d0000460440200421030c030b2003200441016a2204470d000b0b410021010b20002003360204200020013602000b31000240200120024b200220044b720d002002200220016b2202490d00200020023602042000200120036a3602000f0b000b0300010be60101017f230041106b220224002002410036020c20002002410c6a027f0240024020014180014f04402001418010490d012001418080044f0d0220022001413f71418001723a000e20022001410c7641e001723a000c20022001410676413f71418001723a000d41030c030b200220013a000c41010c020b20022001413f71418001723a000d2002200141067641c001723a000c41020c010b20022001413f71418001723a000f20022001410676413f71418001723a000e20022001410c76413f71418001723a000d2002200141127641077141f001723a000c41040b1017200241106a24000b0c002000200141ac830410640b0d0020002802002001200210170b0b002000280200200110560b4a01017f230041206b220224002000280200200241186a200141106a290200370300200241106a200141086a29020037030020022001290200370308200241086a1057200241206a24000bde0201097f230041106b22092400410121080240024002402002450d00200120024101746a210b20004180fe0371410876210c20012d00012102200041ff0171210e03402002210d200141026a210a0240200c20012d00002202470440200a200b462002200c4b720d030c010b200941086a2007200d200320041054200928020c210220092802082107024003402002450d01200241016b210220072d0000210f200741016a2107200e200f470d000b410021080c040b200a200b460d020b200141036a2102200a2101200d2207200720022d00006a22024d0d000b0c020b2006450d00200520066a2101200041ffff037121070340200541016a210020052d00002202411874411875220341004e047f20000520002001460d0320052d0001200341ff0071410874722102200541026a0b2105200720026b22074100480d012008410173210820012005470d000b0b200941106a240020084101710f0b000b5801017f024002402003450d00200220034d044020022003460d010c020b200120036a2c00004140480d010b2002200220036b2204490440000b200020043602042000200120036a3602000f0b2001200220032002105d000bbf0101027f230041106b220424000240024020002001418002105e2205450d00200120054d044020012005460d010c020b200020056a2c000041bf7f4c0d010b2001200249200120034972200220034b72450440024002402002450d00200120024d044020012002460d010c020b200020026a2c00004140480d010b200321020b200420002001200020012002105e105c2004200428020022003602082004200020042802046a36020c200441086a104f1a0b000b2000200141002005105d000b7f01037f230041106b220324000240200120024b0440200341086a4100200241036b220420022004491b2204200241016a200020011054200328020841016b2100200328020c2101034020010440200020016a200141016b220221012c00004140480d010b0b200220046a22012004490d010b200341106a240020010f0b000b5b01027f230041206b220224002001411c6a28020021032001280218200241186a2000280200220041106a290200370300200241106a200041086a290200370300200220002902003703082003200241086a1043200241206a24000bd50202017f047e230041d0006b220324002003027e2002428080205a0440200341406b2002420042d2e1aadaeda7c987f600100d200341206a2001420042d2e1aadaeda7c987f600100d200341106a2001420042f3b2d8c19e9ebdcc957f100d200341306a2002420042f3b2d8c19e9ebdcc957f100d200341c8006a290300200341286a290300200341186a290300220420032903207c2205200454ad7c220620032903407c2204200654ad7c20042004200341386a290300200520032903307c200554ad7c7c220456ad7c2206423e88210520064202862004423e88840c010b2002422d8620014213888442bda282a38eab04800b22042005428080a0cfc8e0c8e38a7f100d2001200329030022067d22072001562002200341086a2903007d2001200654ad7d220120025620012002511b450440200020043703002000200737031020002005370308200341d0006a24000f0b000b9f0602057f027e0240200228020022054114490d000240200120056a41026b027f0240200042ffff83fea6dee111580440200042ffc1d72f560d01200521030c030b200120056a220341046b2000200042808084fea6dee11180220042808084fea6dee1117e7d220842e40080220942e40082a741017441e381046a2f00003b0000200341066b20084290ce008042e40082a741017441e381046a2f00003b0000200341086b200842c0843d8042e40082a741017441e381046a2f00003b00002003410a6b20084280c2d72f80a741e4007041017441e381046a2f00003b00002003410c6b20084280c8afa02580a741e4007041017441e381046a2f00003b00002003410e6b20084280a094a58d1d80a741ffff037141e4007041017441e381046a2f00003b00002001200541106b22036a2008428080e983b1de1680a741ff017141e4007041017441e381046a2f00003b00002008200942e4007e7da70c010b2002200541086b2203360200200120056a220741046b200020004280c2d72f8022004280c2d72f7e7da7220641e4006e220441e4007041017441e381046a2f00003b0000200741066b20064190ce006e41ffff037141e4007041017441e381046a2f00003b0000200120036a200641c0843d6e41ff017141e4007041017441e381046a2f00003b00002006200441e4006c6b0b41017441e381046a2f00003b00000b02402000a72204418fce004d0440200321050c010b2001200341046b22056a200420044190ce006e22044190ce006c6b220641ffff037141e4006e220741017441e381046a2f00003b0000200120036a41026b2006200741e4006c6b41ffff037141017441e381046a2f00003b00000b0240200441ffff037141e3004d0440200521030c010b200541026b220320054b0d01200120036a2004200441ffff037141e4006e220441e4006c6b41ffff037141017441e381046a2f00003b00000b200441ffff0371410a4f04402003200341026b2203490d0120022003360200200120036a200441ffff037141017441e381046a2f00003b00000f0b2003200341016b2203490d0020022003360200200120036a200441306a3a00000f0b000b2d01017f2000280208220220002802044904402000200241016a360208200028020020026a20013a00000f0b000b910101027f20002f01042103200041003a0004410121040240024020034101714504402000280200220028020422032002490d022001200028020022012002100a1a0c010b200120034108763a0000200028020022002802042203200241016b2202490d01200141016a200028020022012002100a1a0b2000200320026b3602042000200120026a360200410021040b20040b5301017f230041206b2203240020032000360204200341186a200141106a290200370300200341106a200141086a29020037030020032001290200370308200341046a2002200341086a1043200341206a24000b0bbc180500418080040b21536f6d654e6f6e654572724f6b6576616c20726573756c743a2000000d0001000d0041c480040b8004ab3ff2b5e15e4ae4d3539f5640a184d603e90a475402f0a0748ea5e8bb3e4a1170617273655f75736420726573756c743a2000006400010012000000556e646566696e65644279746573537472696e670d00000004000000040000000e0000000f00000010000000290000000d0000000c0000000400000011000000120000001300000020202020207b0a3a202c0a2c20207b207d207d280a280a5b5d30783030303130323033303430353036303730383039313031313132313331343135313631373138313932303231323232333234323532363237323832393330333133323333333433353336333733383339343034313432343334343435343634373438343935303531353235333534353535363537353835393630363136323633363436353636363736383639373037313732373337343735373637373738373938303831383238333834383538363837383838393930393139323933393439353936393739383939000d0000000400000004000000140000001500000016000000010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010100418685040b330202020202020202020202020202020202020202020202020202020202020303030303030303030303030303030304040404040041c585040b8a13010305050606020706080709110a1c0b190c1a0d100e0c0f0410031212130916011704180119031a071b011c021f1620032b032d0b2e01300331023201a702a902aa04ab08fa02fb05fd02fe03ff09ad78798b8da23057588b8c901cdd0e0f4b4cfbfc2e2f3f5c5d5fe2848d8e9192a9b1babbc5c6c9cadee4e5ff00041112293134373a3b3d494a5d848e92a9b1b4babbc6cacecfe4e500040d0e11122931343a3b4546494a5e646584919b9dc9cecf0d11293a3b4549575b5c5e5f64658d91a9b4babbc5c9dfe4e5f00d11454964658084b2bcbebfd5d7f0f183858ba4a6bebfc5c7cfdadb4898bdcdc6cecf494e4f57595e5f898e8fb1b6b7bfc1c6c7d71116175b5cf6f7feff806d71dedf0e1f6e6f1c1d5f7d7eaeaf7fbbbc16171e1f46474e4f585a5c5e7e7fb5c5d4d5dcf0f1f572738f747596262e2fa7afb7bfc7cfd7df9a409798308f1fd2d4ceff4e4f5a5b07080f10272feeef6e6f373d3f42459091536775c8c9d0d1d8d9e7feff00205f2282df048244081b04061181ac0e80ab051f09811b03190801042f043404070301070607110a500f1207550703041c0a090308030703020303030c0405030b06010e15054e071b0757070206170c500443032d03010411060f0c3a041d255f206d046a2580c80582b0031a0682fd03590716091809140c140c6a060a061a0659072b05460a2c040c040103310b2c041a060b0380ac060a062f314d0380a4083c030f033c0738082b0582ff1118082f112d03210f210f808c048297190b158894052f053b07020e180980be22740c80d61a0c0580ff0580df0cf29d033709815c1480b80880cb050a183b030a06380846080c06740b1e035a0459098083181c0a16094c04808a06aba40c170431a10481da26070c050580a61081f50701202a064c04808d0480be031b030f0d000601010301040205070702080809020a050b020e041001110212051311140115021702190d1c051d081f0124016a046b02af03b102bc02cf02d102d40cd509d602d702da01e005e102e704e802ee20f004f802fa03fb010c273b3e4e4f8f9e9e9f7b8b9396a2b2ba86b1060709363d3e56f3d0d1041418363756577faaaeafbd35e01287898e9e040d0e11122931343a4546494a4e4f64655cb6b71b1c07080a0b141736393aa8a9d8d909379091a8070a3b3e66698f92116f5fbfeeef5a62f4fcff53549a9b2e2f2728559da0a1a3a4a7a8adbabcc4060b0c151d3a3f4551a6a7cccda007191a22253e3fe7ecefffc5c604202325262833383a484a4c50535556585a5c5e606365666b73787d7f8aa4aaafb0c0d0aeaf6e6fbe935e227b0503042d036603012f2e80821d03310f1c0424091e052b0544040e2a80aa06240424042808340b4e43813709160a08183b45390363080930160521031b05014038044b052f040a070907402027040c0936033a051a07040c07504937330d33072e080a8126524b2b082a161a261c1417094e042409440d19070a0648082709750b423e2a063b050a0651060105100305808b621e48080a80a65e22450b0a060d133a060a362c041780b93c64530c48090a46451b4808530d49070a80f6460a1d03474937030e080a0639070a813619073b031c56010f320d839b66750b80c48a4c630d843010168faa8247a1b98239072a045c06260a460a28051382b05b654b0439071140050b020e97f80884d62a09a2e781330f011d060e0408818c89046b050d0309071092604709743c80f60a73087015467a140c140c570919808781470385420f1584501f060680d52b053e2101702d031a040281401f113a050181d02a82e680f7294c040a04028311444c3d80c23c06010455051b3402810e2c04640c560a80ae381d0d2c040907020e06809a83d80411030d0377045f060c04010f0c0438080a062808224e81540c1d03090736080e040907090780cb250a84060003000083042000910560005d13a0001217201f0c20601fef2ca02b2a30202c6fa6e02c02a8602d1efb602e00fe20369eff6036fd01e136010a2137240de137ab0e61392f18a139301c6148f31ea14c40346150f06aa1514f6f21529dbca15200cf615365d1a15300da215400e0e155aee26157ece42159d0e8a1592000ee59f0017f5a00700007002d0101010201020101480b30151001650702060202010423011e1b5b0b3a09090118040109010301052b033c082a180120370101010408040103070a021d013a0101010204080109010a021a010202390104020402020303011e0203010b0239010405010204011402160601013a0101020104080107030a021e013b0101010c01090128010301370101030503010407020b021d013a01020102010301050207020b021c02390201010204080109010a021d0148010401020301010801510102070c08620102090b0749021b0101010101370e01050102050b0124090166040106010202021902040310040d01020206010f01000300031d021e021e02400201070801020b09012d030101750222017603040209010603db0202013a010107010101010208060a0201301f310430070101050128090c0220040202010338010102030101033a0802029803010d0107040106010302c6400001c32100038d016020000669020004010a200250020001030104011902050197021a120d012608190b2e0330010204020227014306020202020c0108012f01330101030202050201012a020801ee010201040100010010101000020001e201950500030102050428030401a502000400025003460b31047b01360f290102020a033104020207013d03240501083e010c0234090a0402015f0302010102060102019d010308150239020101010116010e070305c308020301011701510102060101020101020102eb010204060201021b025508020101026a0101010206010165030204010500090102f5010a0201010401900402020401200a280602040801090602032e0d010200070106010152160207010201027a06030101020107010148020301010100020b023405050101010001060f00053b0700013f0451010002002e0217000101030405080802071e0494030037043208010e011605010f000701110207010201056401a00700013d04000400076d07006080f00075736455736445636473615265636f766572794661696c65644c6f6767696e6744697361626c6564556e6b6e6f776e4e6f7443616c6c61626c65436f64654e6f74466f756e645f456e646f776d656e74546f6f4c6f775472616e736665724661696c65645f42656c6f7753756273697374656e63655468726573686f6c644b65794e6f74466f756e6443616c6c6565526576657274656443616c6c6565547261707065644465636f64654572726f7200004c0c010041d898040b380100000002000000030000000400000005000000060000000700000008000000090000000c0000000b00000001020304050607080a010b09"},"contract":{"name":"check_system","version":"0.1.0","authors":["[your_name] <[your_email]>"]},"V3":{"spec":{"constructors":[{"args":[],"docs":[],"label":"default","payable":false,"selector":"0xed4b9d1b"}],"docs":[],"events":[],"messages":[{"args":[],"docs":[],"label":"on_block_end_called","mutates":false,"payable":false,"returnType":{"displayName":["bool"],"type":0},"selector":"0x80069dcf"},{"args":[{"label":"gas_limit","type":{"displayName":["u64"],"type":1}}],"docs":[],"label":"set_hook","mutates":false,"payable":false,"returnType":null,"selector":"0xb9f71bfd"},{"args":[],"docs":[],"label":"on_block_end","mutates":true,"payable":false,"returnType":null,"selector":"0x00000001"},{"args":[],"docs":[],"label":"start_sidevm","mutates":false,"payable":false,"returnType":{"displayName":["bool"],"type":0},"selector":"0x1e37db50"},{"args":[{"label":"key","type":{"displayName":["Vec"],"type":2}},{"label":"value","type":{"displayName":["Vec"],"type":2}}],"docs":[],"label":"cache_set","mutates":false,"payable":false,"returnType":{"displayName":["bool"],"type":0},"selector":"0xc7524fb9"},{"args":[{"label":"key","type":{"displayName":["Vec"],"type":2}}],"docs":[],"label":"cache_get","mutates":false,"payable":false,"returnType":{"displayName":["Option"],"type":4},"selector":"0x96e42b5e"},{"args":[{"label":"delegate","type":{"displayName":["Hash"],"type":5}},{"label":"json","type":{"displayName":["String"],"type":7}}],"docs":[],"label":"parse_usd","mutates":false,"payable":false,"returnType":{"displayName":["Option"],"type":8},"selector":"0xafead99e"},{"args":[{"label":"delegate","type":{"displayName":["ink_env","Hash"],"type":5}},{"label":"script","type":{"displayName":["String"],"type":7}},{"label":"args","type":{"displayName":["Vec"],"type":11}}],"docs":[],"label":"eval_js","mutates":false,"payable":false,"returnType":{"displayName":["Result"],"type":12},"selector":"0xf32e54c5"},{"args":[{"label":"delegate","type":{"displayName":["ink_env","Hash"],"type":5}},{"label":"script","type":{"displayName":["Vec"],"type":2}},{"label":"args","type":{"displayName":["Vec"],"type":11}}],"docs":[],"label":"eval_js_bytecode","mutates":false,"payable":false,"returnType":{"displayName":["Result"],"type":12},"selector":"0x05660fa2"},{"args":[{"label":"contract_id","type":{"displayName":["AccountId"],"type":14}},{"label":"deposit","type":{"displayName":["Balance"],"type":10}}],"docs":[],"label":"ContractDeposit::change_deposit","mutates":true,"payable":false,"returnType":{"displayName":["Result"],"type":15},"selector":"0xa24bcb44"}]},"storage":{"struct":{"fields":[{"layout":{"cell":{"key":"0x0000000000000000000000000000000000000000000000000000000000000000","ty":0}},"name":"on_block_end_called"}]}},"types":[{"id":0,"type":{"def":{"primitive":"bool"}}},{"id":1,"type":{"def":{"primitive":"u64"}}},{"id":2,"type":{"def":{"sequence":{"type":3}}}},{"id":3,"type":{"def":{"primitive":"u8"}}},{"id":4,"type":{"def":{"variant":{"variants":[{"index":0,"name":"None"},{"fields":[{"type":2}],"index":1,"name":"Some"}]}},"params":[{"name":"T","type":2}],"path":["Option"]}},{"id":5,"type":{"def":{"composite":{"fields":[{"type":6,"typeName":"[u8; 32]"}]}},"path":["ink_env","types","Hash"]}},{"id":6,"type":{"def":{"array":{"len":32,"type":3}}}},{"id":7,"type":{"def":{"primitive":"str"}}},{"id":8,"type":{"def":{"variant":{"variants":[{"index":0,"name":"None"},{"fields":[{"type":9}],"index":1,"name":"Some"}]}},"params":[{"name":"T","type":9}],"path":["Option"]}},{"id":9,"type":{"def":{"composite":{"fields":[{"name":"usd","type":10,"typeName":"u128"}]}},"path":["indeterministic_functions","indeterministic_functions","Usd"]}},{"id":10,"type":{"def":{"primitive":"u128"}}},{"id":11,"type":{"def":{"sequence":{"type":7}}}},{"id":12,"type":{"def":{"variant":{"variants":[{"fields":[{"type":13}],"index":0,"name":"Ok"},{"fields":[{"type":7}],"index":1,"name":"Err"}]}},"params":[{"name":"T","type":13},{"name":"E","type":7}],"path":["Result"]}},{"id":13,"type":{"def":{"variant":{"variants":[{"fields":[{"type":7,"typeName":"String"}],"index":0,"name":"String"},{"fields":[{"type":2,"typeName":"Vec"}],"index":1,"name":"Bytes"},{"index":2,"name":"Undefined"}]}},"path":["check_system","js","Output"]}},{"id":14,"type":{"def":{"composite":{"fields":[{"type":6,"typeName":"[u8; 32]"}]}},"path":["ink_env","types","AccountId"]}},{"id":15,"type":{"def":{"variant":{"variants":[{"fields":[{"type":16}],"index":0,"name":"Ok"},{"fields":[{"type":17}],"index":1,"name":"Err"}]}},"params":[{"name":"T","type":16},{"name":"E","type":17}],"path":["Result"]}},{"id":16,"type":{"def":{"tuple":[]}}},{"id":17,"type":{"def":{"variant":{"variants":[{"fields":[{"type":7,"typeName":"String"}],"index":0,"name":"Other"},{"fields":[{"type":18,"typeName":"Error"}],"index":1,"name":"SystemError"},{"index":2,"name":"BadOrigin"}]}},"path":["pink_extension","system","DriverError"]}},{"id":18,"type":{"def":{"variant":{"variants":[{"index":0,"name":"PermisionDenied"},{"index":1,"name":"DriverNotFound"}]}},"path":["pink_extension","system","Error"]}}]}} \ No newline at end of file diff --git a/e2e/res/log_server.contract b/e2e/res/log_server.contract index 09b174e229..41a3ddb214 100644 --- a/e2e/res/log_server.contract +++ b/e2e/res/log_server.contract @@ -1 +1 @@ -{"source":{"hash":"0x59d87a109a250e61e6c00568ff8ecf70c290fe21923316ed9119689ddab7cb90","language":"ink! 3.4.0","compiler":"rustc 1.66.0-nightly","wasm":"0x0061736d0100000001590d60027f7f017f60037f7f7f017f60027f7f0060037f7f7f0060000060017f0060047f7f7f7f0060087f7f7e7f7f7f7f7f017f60057f7f7f7f7f017f6000017f60037f7e7e017f60067f7e7f7f7f7f017f60057f7f7f7f7f00027605057365616c31097365616c5f63616c6c0007057365616c30197365616c5f63616c6c5f636861696e5f657874656e73696f6e0008057365616c300a7365616c5f696e7075740002057365616c30167365616c5f76616c75655f7472616e73666572726564000203656e76066d656d6f727902010210032625010000090204050602000a02030b0202040000030105010300000103060300030c02000102040501700108080608017f01418080040b071102066465706c6f7900090463616c6c0014090d010041010b07051522191a1c1d0a933d252b01017f037f2002200346047f200005200020036a200120036a2d00003a0000200341016a21030c010b0b0bc809010d7f20002802082107200028020021050240024002402001280208220a410147200128021022034101477145044020034101470d01200520076a210c200141146a28020041016a21082005210003402000200c460d02027f024020002c0000220441004e0440200041016a2106200441ff017121090c010b20002d0001413f7121032004411f71210b2004415f4d0440200b4106742003722109200041026a21060c010b20002d0002413f712003410674722109200441704904402009200b410c74722109200041036a21060c010b200041046a210620022104418080c400200b411274418080f0007120002d0003413f71200941067472722209418080c400460d011a0b200620006b2203200c20006b4b0d04200220036a22042002490d0420090b2103200841016b2208044020062100200421022003418080c400470d010c030b0b2003418080c400460d01024002402002450d00200220074f04404100210020022007460d010c020b41002100200220056a2c00004140480d010b200521000b2002200720001b21072000200520001b21050c010b0c020b200a450d012001410c6a280200210e02400240024020074110490d002007200541036a417c7120056b2204490d004101210041042102034020002002200268762202200020024b1b22032000200220002002491b22006b220220034b0d0420020d000b2000450d03200720046b22022002417c712200490d032002410449200441044b720d0020052004100622032000200420056a22006a200241037110066a22042003490d03200241027621020340200021092002220a450d030240200a41c001200a41c001491b220d41fc0171220b450440410021060c010b2009200b4102746a210c410021062009210303402003450d01200341106a410021022006210003402000200220036a2802002206417f734107762006410676724181828408716a22062000490d0720062100200241046a22024110470d000b2203200c470d000b0b20042004200641087641ff81fc0771200641ff81fc07716a418180046c4110766a22044b0d04200a200d6b21022009200d4102746a2100200d410371450d000b2009200b4102746a2100200a41c001200a41c001491b41037141027421084100210203402000450440200221030c030b200220002802002203417f734107762003410676724181828408716a22032002490d04200041046a210020032102200841046b22080d000b0c010b20052007100621040c010b20042004200341087641ff81fc0771200341ff81fc07716a418180046c4110766a22044b0d010b2004200e4f0d01200e20046b22032108024002400240410020012d0020220020004103461b410371220041016b0e03010001020b200341016a2200450d0220004101762108200341017621000c010b41002108200321000b200041016a21002001411c6a2802002102200128020421032001280218210102400340200041016b2200450d01200120032002280210110000450d000b41010f0b4101210002402003418080c400460d00200120052007200228020c1101000d0041002100027f0340200820002008460d011a200041016a2100200120032002280210110000450d000b200041016b0b20084921000b20000f0b000b2001280218200520072001411c6a28020028020c1101000b3a01017f200145044041000f0b024003402002200220002c000041bf7f4a6a22024b0d01200041016a2100200141016b22010d000b20020f0b000b6c02027f027e230041206b22002400200041086a220142003703002000420037030020004110360214200020003602102000411036021c20002000411c6a1003200041106a200028021c10082001290300210220002903002103200041206a2400410541042002200384501b0b3301017f230041106b22022400200241086a4100200120002802002000280204102420002002290308370200200241106a24000bab0b02067f027e230041e0026b2200240002400240100741ff01714105470d00200041808001360284022000419483043602800220004180026a100a2000280284024104490d0020002802800228000041ed97f5dc01470d00100741ff01714105470d002000418080013602840220004194830436028002410f41948304410020004180026a100b200028028402411f4d0d00200041386a2201200028028002220241086a290000370300200041406b2203200241106a290000370300200041c8006a2204200241186a29000037030020002002290000370330200041086a410f100c200028020c21052000280208220241c08204290000370000200241076a41c78204290000370000200041b0026a2004290300370300200041a8026a2003290300370300200041a0026a200129030037030020004188026a420037030020004190026a220142003703002000200029033037039802200042003703800220004190016a220320004180026a2204413810041a20042003413810041a200041c0026a428f808080f084d0e70a370300200041bc026a2005360200200020023602b802200041003602c802200041d0016a2203418080013602002000419483043602cc01200041003602c8012000290380022106200041c8016a220520004198026a100d210420052000290388022001290300100e210520002902cc01210720034100360200200041b882043602cc01200041003602e801200020073703e001200041c4026a200041e0016a2201100f2002410f2001101020002802e401220320002802e8012201490d0020002802e00121022000200320016b3602dc012000200120026a3602d8010240027f20042006200520022001200041d8016a10112201410d71450440024020002802dc012204450d000240024020002802d80122012d000022030e020100020b200441016b4120490d01200041e8016a2001410a6a290000370300200041f0016a200141126a290000370300200041f7016a200141196a290000370000200020012900023703e00120012d000121020b20004187016a200041f7016a29000037000020004180016a200041f0016a290300370300200041f8006a200041e8016a290300370300200020002903e0013703700c030b41000c010b200141ce82046a2d00000b2102410221030b20034102460d00200041e7006a220120004187016a290000370000200041e0006a220420004180016a290300370300200041d8006a2205200041f8006a290300370300200020002903703703502003450d00200041276a22032001290000370000200041206a22012004290300370300200041186a2005290300220637030020002000290350220737031020004190026a420037030020004188026a4200370300200041a1026a2006370000200041a9026a2001290300370000200041b0026a2003290000370000200041c0026a220141808004290300370300200041c8026a41888004290300370300200041d0026a41908004290300370300200041d8026a419880042903003703002000420037038002200020023a0098022000200737009902200041a985edaf7a3602bc02200041003602b802200041386a4180800136020020004194830436023420004100360230200041306a220220004198026a100d200242004200100e21042000290234210620004100360298012000200637039001200041bc026a20004190016a2202100f20012002101220002802940122052000280298012202490d0020002802900121012000200520026b3602742000200120026a3602704200200420012002200041f0006a1011410d710d0020002802742202450d000240200028027022012d00000e020200010b20024101460d002000200241026b22023602e4012000200141026a22033602e0010240024020012d00010e020100020b2002450d0120032d00001a0c010b20004190016a200041e0016a10132000280290011a0b000b200041e0026a24000b3301017f230041106b220124002001200028020436020c20002802002001410c6a10022000200128020c1008200141106a24000b3a01017f230041106b220424002004200328020436020c20002001200220032802002004410c6a10011a2003200428020c1008200441106a24000b3701017f230041106b22022400200241086a200141001021200228020c21012000200228020836020020002001360204200241106a24000b4402017f017e230041106b2202240020002902042103200241003602082002200337030020012002101220002002290300370204200020022802081026200241106a24000b5702017f017e230041206b2203240020002902042104200341003602082003200437030020032002370318200320013703102003200341106a4110101720002003290300370204200020032802081026200341206a24000b0a0020012000410410170b7c01017f230041106b2203240002402001413f4d04402002200141027410250c010b200141ffff004d0440200320014102744101723b010e20022003410e6a410210170c010b200141ffffffff034d04402001410274410272200210280c010b2002410310252001200210280b2002200020011017200341106a24000b5e01017f230041106b220624002006200528020436020c41002000200120022003200420052802002006410c6a100021002005200628020c1008410c21052000410b4d0440200041027441dc82046a28020021050b200641106a240020050b0a0020012000412010170b820801097f230041206b22042400200441086a220520012802042202047f2001200241016b36020420012001280200220341016a36020020032d00000520010b3a000120052002453a00000240024020042d00084101710d00024020042d0009220241037122054103470440024002400240200541016b0e020102000b200241fc017141027621020c030b200420023a0015200441013a001420042001360210200441003b011c200441106a2004411c6a410210270d0320042f011c220241ff014d0d03200241027621020c020b200420023a0015200441013a0014200420013602102004410036021c200441106a2004411c6a410410270d02200428021c220241808004490d02200241027621020c010b200241044f0d01200128020422054104490d012001280200220328000021022001200541046b3602042001200341046a3602002002418080808004490d010b200128020422032002490d0020042002410110212004280204210a2004280200200128020022062002100421052001200320026b3602042001200220066a360200024002402002450d004100200241076b2201200120024b1b2108200541036a417c7120056b210941002101034002400240024002400240200120056a2d00002206411874411875220741004e0440200920016b4103712009417f46720d020240200120084f0d000340200120056a2203280200200341046a28020072418081828478710d012001200141086a22014b0d0320012008490d000b0b200120024f0d050340200120056a2c00004100480d062002200141016a2201470d000b0c070b02400240200641b880046a2d000041026b0e03040100090b200141016a220320024f0d08200320056a2c000021030240024002400240200641f0016b0e050100000002000b2007410f6a41ff017141024b200341004e720d0b20034140490d020c0b0b200341f0006a41ff01714130490d010c0a0b2003418f7f4a0d090b200141026a220320024f0d08200320056a2c000041bf7f4a0d08200141036a220120024f0d08200120056a2c000041bf7f4c0d040c080b200141016a220320024f0d07200320056a2c00002103024002400240200641e001470440200641ed01460d012007411f6a41ff0171410c490d022007417e71416e47200341004e720d0b20034140490d030c0b0b200341607141a07f460d020c0a0b200341a07f480d010c090b200341bf7f4a0d080b200141026a220120024f0d07200120056a2c000041bf7f4c0d030c070b000b200141016a21010c020b200141016a220120024f0d04200120056a2c000041bf7f4a0d040b200141016a21010b20012002490d000b0b200020023602082000200a360204200020053602000c020b200041003602000c010b200041003602000b200441206a24000bb00401067f230041a0016b220024000240100741ff01714105470d0020004180800136026c200041948304360268200041e8006a100a200028026c22014104490d00200028026822032800002000200141046b36028c012000200341046a3602880141e59e9d857c470d00200041206a20004188016a101320002802202201450d0020002d0027210320002f002521022000280228210420002d00242105100741ff01714105470d0020002004360210200020053a000c200020013602082000200220034110747222013b000d200020014110763a000f2000410136021c2000200041086a360218200041306a4201370300200041406b4281808080203703002000413c6a200041186a360200200041b8820436022c2000410036025c2000410236025020004100360228200041b88204360224200041033602202000410236027c20002000412c6a36028401200020004184016a36027820004100100c20004100360270200020002903003703682000410136029c012000420137028c01200041b88204360288012000200041f8006a36029801200041e8006a20004188016a10160d00200028026820002802702000280220210220004280800137028c0120004194830436028801200020023a007820004188016a2202200041f8006a4101101720021010200028028c0122022000280290012201490d0020002802880121032000200220016b36028c012000200120036a36028801410a2003200120004188016a100b200041a0016a24000f0b000b5b01027f230041206b220224002001411c6a28020021032001280218200241186a2000280200220041106a290200370300200241106a200041086a290200370300200220002902003703082003200241086a1018200241206a24000b5501017f230041206b2202240020022000360204200241186a200141106a290200370300200241106a200141086a29020037030020022001290200370308200241046a41a08004200241086a1018200241206a24000b5e01037f230041106b2203240002402000280208220420026a220520044f0440200341086a20042005200028020020002802041024200328020c2002470d0120032802082001200210041a20002005360208200341106a24000f0b000b000bf50301057f230041406a22032400200341346a2001360200200341033a003820034280808080800437031820032000360230410021002003410036022820034100360220027f0240024020022802082201450440200241146a28020022004103742106200041ffffffff017121072002280210210041002101034020012006460d02200228020020016a220441046a28020022050440200328023020042802002005200328023428020c1101000d040b200141086a2101200028020020002802042105200041086a2100200341186a2005110000450d000b0c020b2002410c6a28020022074105742106200741ffffff3f71210703402006450d01200228020020006a220441046a28020022050440200328023020042802002005200328023428020c1101000d030b20032001411c6a2d00003a003820032001290204422089370318200341106a20022802102204200141146a102320032003290310370320200341086a20042001410c6a102320032003290308370328200041086a2100200641206b210620012802002105200141206a2101200420054103746a2204280200200341186a2004280204110000450d000b0c010b200228020420074b04402003280230200228020020074103746a22002802002000280204200328023428020c1101000d010b41000c010b41010b200341406b24000b0300010b0f00200028020020012002101b41000b5601017f024020022000280204200028020822036b4b0440200020032002101e418180808078470d01200028020821030b200028020020036a2001200210041a200220036a22012003490d00200020013602080f0b000bbb0201027f230041106b220224000240024002400240200028020022002002410c6a027f0240024020014180014f04402002410036020c2001418010490d012001418080044f0d0220022001413f71418001723a000e20022001410c7641e001723a000c20022001410676413f71418001723a000d41030c030b200028020822032000280204460d030c040b20022001413f71418001723a000d2002200141067641c001723a000c41020c010b20022001413f71418001723a000f20022001410676413f71418001723a000e20022001410c76413f71418001723a000d2002200141127641077141f001723a000c41040b101b0c020b200020034101101e418180808078470440000b200028020821030b200028020020036a20013a0000200341016a2201450d01200020013602080b200241106a240041000f0b000b4a01017f230041206b220224002000280200200241186a200141106a290200370300200241106a200141086a29020037030020022001290200370308200241086a1016200241206a24000b930401067f230041206b220324000240027f41002001200120026a22014b0d001a2000280204220220026a22052002490d012005200120012005491b22014108200141084b1b2201417f73411f7621040240200204402003410136021820032002360214200320002802003602100c010b200341003602180b200341106a2106230041106b220524002003027f0240027f0240200404400240200141004e044020062802080d01200520014101101f2005280204210220052802000c040b0c040b20062802042208450440200541086a2001410141001020200528020c210220052802080c030b200121024100418c8304280200220420016a22072004490d021a20062802002106419083042802002007490440200141ffff036a220741107640002202417f46200241ffff0371200247720d022002411074220420074180807c716a22022004490d02419083042002360200200121024100200120046a22072004490d031a0b418c8304200736020041002004450d021a20042006200810040c020b200320013602040c020b2001210241000b2204044020032004360204200341086a200236020041000c020b20032001360204200341086a410136020041010c010b200341086a410036020041010b360200200541106a240020032802004504402003280204210220002001360204200020023602004181808080780c010b200341086a2802000b200341206a24000f0b000b3901017f230041106b22032400200341086a2001200241001020200328020c21012000200328020836020020002001360204200341106a24000bc00201027f200120026a41016b410020026b7122052001492104418c83042802002102024002400240027f200345044020040d0241002103200220056a22042002490d0420022004419083042802004d0d011a200541ffff036a22022005490d032002411076220440002202417f46200241ffff0371200247720d032002411074220220044110746a22042002490d04419083042004360200200220056a22042002490d0420020c010b20040d0141002103200220056a22042002490d0320022004419083042802004d0d001a200541ffff036a22022005490d022002411076220440002202417f46200241ffff0371200247720d022002411074220220044110746a22042002490d03419083042004360200200220056a22042002490d0320020b2103418c830420043602000c020b000b0b20002001360204200020033602000b6a01027f230041106b2203240002402001450440410121020c010b200141004e22040440027f2002450440200341086a20012004101f20032802080c010b2003200120044101102020032802000b22020d010b000b2000200136020420002002360200200341106a24000b0e0020002802001a03400c000b000b5501027f0240027f02400240200228020041016b0e020103000b200241046a0c010b200120022802044103746a22012802044103470d0120012802000b2802002104410121030b20002004360204200020033602000b31000240200120024b200220044b720d002002200220016b2202490d00200020023602042000200120036a3602000f0b000b2d01017f2000280208220220002802044904402000200241016a360208200028020020026a20013a00000f0b000b3001017f2001200041086a28020022024b0440000b2000200220016b36020820002000280204220020016a36020420000b910101027f20002f01042103200041003a0004410121040240024020034101714504402000280200220028020422032002490d02200120002802002201200210041a0c010b200120034108763a0000200028020022002802042203200241016b2202490d01200141016a20002802002201200210041a0b2000200320026b3602042000200120026a360200410021040b20040b2601017f230041106b220224002002200036020c20012002410c6a41041017200241106a24000b0bd3020300418080040bb80110aa0cecb48e7ad3b309c96c2ca8d052ee58a88e1603961bf3fc21d56b6bc10404000000040000000400000005000000060000000700000001010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010041fa81040b330202020202020202020202020202020202020202020202020202020202020303030303030303030303030303030304040404040041b882040b51380101000000000053696465766d4f7065726174696f6e01020304050607080a010b0900000000000100000002000000030000000400000005000000060000000700000008000000090000000c0000000b"},"contract":{"name":"log_server","version":"0.1.0","authors":["[your_name] <[your_email]>"]},"V3":{"spec":{"constructors":[{"args":[],"docs":[],"label":"default","payable":false,"selector":"0xed4b9d1b"}],"docs":[],"events":[],"messages":[{"args":[{"label":"msg","type":{"displayName":["alloc","string","String"],"type":0}}],"docs":[],"label":"log_test","mutates":false,"payable":false,"returnType":null,"selector":"0x654fa7c0"}]},"storage":{"struct":{"fields":[]}},"types":[{"id":0,"type":{"def":{"primitive":"str"}}}]}} \ No newline at end of file +{"source":{"hash":"0xf3bf9454b3220eb6573d382e6a62dfdd52074819e160d33c73f228f3b314db8c","language":"ink! 3.4.0","compiler":"rustc 1.66.0-nightly","wasm":"0x0061736d0100000001590d60027f7f017f60037f7f7f017f60027f7f0060037f7f7f0060000060017f0060047f7f7f7f0060087f7f7e7f7f7f7f7f017f60057f7f7f7f7f017f6000017f60037f7e7e017f60067f7e7f7f7f7f017f60057f7f7f7f7f00027605057365616c31097365616c5f63616c6c0007057365616c30197365616c5f63616c6c5f636861696e5f657874656e73696f6e0008057365616c300a7365616c5f696e7075740002057365616c30167365616c5f76616c75655f7472616e73666572726564000203656e76066d656d6f727902010210032625010000090204050602000a02030b0202040000030105010300000103060300030c02000102040501700108080608017f01418080040b071102066465706c6f7900090463616c6c0014090d010041010b07051522191a1c1d0a933d252b01017f037f2002200346047f200005200020036a200120036a2d00003a0000200341016a21030c010b0b0bc809010d7f20002802082107200028020021050240024002402001280208220a410147200128021022034101477145044020034101470d01200520076a210c200141146a28020041016a21082005210003402000200c460d02027f024020002c0000220441004e0440200041016a2106200441ff017121090c010b20002d0001413f7121032004411f71210b2004415f4d0440200b4106742003722109200041026a21060c010b20002d0002413f712003410674722109200441704904402009200b410c74722109200041036a21060c010b200041046a210620022104418080c400200b411274418080f0007120002d0003413f71200941067472722209418080c400460d011a0b200620006b2203200c20006b4b0d04200220036a22042002490d0420090b2103200841016b2208044020062100200421022003418080c400470d010c030b0b2003418080c400460d01024002402002450d00200220074f04404100210020022007460d010c020b41002100200220056a2c00004140480d010b200521000b2002200720001b21072000200520001b21050c010b0c020b200a450d012001410c6a280200210e02400240024020074110490d002007200541036a417c7120056b2204490d004101210041042102034020002002200268762202200020024b1b22032000200220002002491b22006b220220034b0d0420020d000b2000450d03200720046b22022002417c712200490d032002410449200441044b720d0020052004100622032000200420056a22006a200241037110066a22042003490d03200241027621020340200021092002220a450d030240200a41c001200a41c001491b220d41fc0171220b450440410021060c010b2009200b4102746a210c410021062009210303402003450d01200341106a410021022006210003402000200220036a2802002206417f734107762006410676724181828408716a22062000490d0720062100200241046a22024110470d000b2203200c470d000b0b20042004200641087641ff81fc0771200641ff81fc07716a418180046c4110766a22044b0d04200a200d6b21022009200d4102746a2100200d410371450d000b2009200b4102746a2100200a41c001200a41c001491b41037141027421084100210203402000450440200221030c030b200220002802002203417f734107762003410676724181828408716a22032002490d04200041046a210020032102200841046b22080d000b0c010b20052007100621040c010b20042004200341087641ff81fc0771200341ff81fc07716a418180046c4110766a22044b0d010b2004200e4f0d01200e20046b22032108024002400240410020012d0020220020004103461b410371220041016b0e03010001020b200341016a2200450d0220004101762108200341017621000c010b41002108200321000b200041016a21002001411c6a2802002102200128020421032001280218210102400340200041016b2200450d01200120032002280210110000450d000b41010f0b4101210002402003418080c400460d00200120052007200228020c1101000d0041002100027f0340200820002008460d011a200041016a2100200120032002280210110000450d000b200041016b0b20084921000b20000f0b000b2001280218200520072001411c6a28020028020c1101000b3a01017f200145044041000f0b024003402002200220002c000041bf7f4a6a22024b0d01200041016a2100200141016b22010d000b20020f0b000b6c02027f027e230041206b22002400200041086a220142003703002000420037030020004110360214200020003602102000411036021c20002000411c6a1003200041106a200028021c10082001290300210220002903002103200041206a2400410541042002200384501b0b3301017f230041106b22022400200241086a4100200120002802002000280204102420002002290308370200200241106a24000bab0b02067f027e230041e0026b2200240002400240100741ff01714105470d00200041808001360284022000419483043602800220004180026a100a2000280284024104490d0020002802800228000041ed97f5dc01470d00100741ff01714105470d002000418080013602840220004194830436028002410f41948304410020004180026a100b200028028402411f4d0d00200041386a2201200028028002220241086a290000370300200041406b2203200241106a290000370300200041c8006a2204200241186a29000037030020002002290000370330200041086a410f100c200028020c21052000280208220241c08204290000370000200241076a41c78204290000370000200041b0026a2004290300370300200041a8026a2003290300370300200041a0026a200129030037030020004188026a420037030020004190026a220142003703002000200029033037039802200042003703800220004190016a220320004180026a2204413810041a20042003413810041a200041c0026a428f808080f084d0e70a370300200041bc026a2005360200200020023602b802200041003602c802200041d0016a2203418080013602002000419483043602cc01200041003602c8012000290380022106200041c8016a220520004198026a100d210420052000290388022001290300100e210520002902cc01210720034100360200200041b882043602cc01200041003602e801200020073703e001200041c4026a200041e0016a2201100f2002410f2001101020002802e401220320002802e8012201490d0020002802e00121022000200320016b3602dc012000200120026a3602d8010240027f20042006200520022001200041d8016a10112201410d71450440024020002802dc012204450d000240024020002802d80122012d000022030e020100020b200441016b4120490d01200041e8016a2001410a6a290000370300200041f0016a200141126a290000370300200041f7016a200141196a290000370000200020012900023703e00120012d000121020b20004187016a200041f7016a29000037000020004180016a200041f0016a290300370300200041f8006a200041e8016a290300370300200020002903e0013703700c030b41000c010b200141ce82046a2d00000b2102410221030b20034102460d00200041e7006a220120004187016a290000370000200041e0006a220420004180016a290300370300200041d8006a2205200041f8006a290300370300200020002903703703502003450d00200041276a22032001290000370000200041206a22012004290300370300200041186a2005290300220637030020002000290350220737031020004190026a420037030020004188026a4200370300200041a1026a2006370000200041a9026a2001290300370000200041b0026a2003290000370000200041c0026a220141808004290300370300200041c8026a41888004290300370300200041d0026a41908004290300370300200041d8026a419880042903003703002000420037038002200020023a0098022000200737009902200041a985edaf7a3602bc02200041003602b802200041386a4180800136020020004194830436023420004100360230200041306a220220004198026a100d200242004200100e21042000290234210620004100360298012000200637039001200041bc026a20004190016a2202100f20012002101220002802940122052000280298012202490d0020002802900121012000200520026b3602742000200120026a3602704200200420012002200041f0006a1011410d710d0020002802742202450d000240200028027022012d00000e020200010b20024101460d002000200241026b22023602e4012000200141026a22033602e0010240024020012d00010e020100020b2002450d0120032d00001a0c010b20004190016a200041e0016a10132000280290011a0b000b200041e0026a24000b3301017f230041106b220124002001200028020436020c20002802002001410c6a10022000200128020c1008200141106a24000b3a01017f230041106b220424002004200328020436020c20002001200220032802002004410c6a10011a2003200428020c1008200441106a24000b3701017f230041106b22022400200241086a200141001021200228020c21012000200228020836020020002001360204200241106a24000b4402017f017e230041106b2202240020002902042103200241003602082002200337030020012002101220002002290300370204200020022802081026200241106a24000b5702017f017e230041206b2203240020002902042104200341003602082003200437030020032002370318200320013703102003200341106a4110101720002003290300370204200020032802081026200341206a24000b0a0020012000410410170b7c01017f230041106b2203240002402001413f4d04402002200141027410250c010b200141ffff004d0440200320014102744101723b010e20022003410e6a410210170c010b200141ffffffff034d04402001410274410272200210280c010b2002410310252001200210280b2002200020011017200341106a24000b5e01017f230041106b220624002006200528020436020c41002000200120022003200420052802002006410c6a100021002005200628020c1008410c21052000410b4d0440200041027441dc82046a28020021050b200641106a240020050b0a0020012000412010170b820801097f230041206b22042400200441086a220520012802042202047f2001200241016b36020420012001280200220341016a36020020032d00000520010b3a000120052002453a00000240024020042d00084101710d00024020042d0009220241037122054103470440024002400240200541016b0e020102000b200241fc017141027621020c030b200420023a0015200441013a001420042001360210200441003b011c200441106a2004411c6a410210270d0320042f011c220241ff014d0d03200241027621020c020b200420023a0015200441013a0014200420013602102004410036021c200441106a2004411c6a410410270d02200428021c220241808004490d02200241027621020c010b200241044f0d01200128020422054104490d012001280200220328000021022001200541046b3602042001200341046a3602002002418080808004490d010b200128020422032002490d0020042002410110212004280204210a2004280200200128020022062002100421052001200320026b3602042001200220066a360200024002402002450d004100200241076b2201200120024b1b2108200541036a417c7120056b210941002101034002400240024002400240200120056a2d00002206411874411875220741004e0440200920016b4103712009417f46720d020240200120084f0d000340200120056a2203280200200341046a28020072418081828478710d012001200141086a22014b0d0320012008490d000b0b200120024f0d050340200120056a2c00004100480d062002200141016a2201470d000b0c070b02400240200641b880046a2d000041026b0e03040100090b200141016a220320024f0d08200320056a2c000021030240024002400240200641f0016b0e050100000002000b2007410f6a41ff017141024b200341004e720d0b20034140490d020c0b0b200341f0006a41ff01714130490d010c0a0b2003418f7f4a0d090b200141026a220320024f0d08200320056a2c000041bf7f4a0d08200141036a220120024f0d08200120056a2c000041bf7f4c0d040c080b200141016a220320024f0d07200320056a2c00002103024002400240200641e001470440200641ed01460d012007411f6a41ff0171410c490d022007417e71416e47200341004e720d0b20034140490d030c0b0b200341607141a07f460d020c0a0b200341a07f480d010c090b200341bf7f4a0d080b200141026a220120024f0d07200120056a2c000041bf7f4c0d030c070b000b200141016a21010c020b200141016a220120024f0d04200120056a2c000041bf7f4a0d040b200141016a21010b20012002490d000b0b200020023602082000200a360204200020053602000c020b200041003602000c010b200041003602000b200441206a24000bb00401067f230041a0016b220024000240100741ff01714105470d0020004180800136026c200041948304360268200041e8006a100a200028026c22014104490d00200028026822032800002000200141046b36028c012000200341046a3602880141e59e9d857c470d00200041206a20004188016a101320002802202201450d0020002d0027210320002f002521022000280228210420002d00242105100741ff01714105470d0020002004360210200020053a000c200020013602082000200220034110747222013b000d200020014110763a000f2000410136021c2000200041086a360218200041306a4201370300200041406b4281808080203703002000413c6a200041186a360200200041b8820436022c2000410036025c2000410236025020004100360228200041b88204360224200041033602202000410236027c20002000412c6a36028401200020004184016a36027820004100100c20004100360270200020002903003703682000410136029c012000420137028c01200041b88204360288012000200041f8006a36029801200041e8006a20004188016a10160d00200028026820002802702000280220210220004280800137028c0120004194830436028801200020023a007820004188016a2202200041f8006a4101101720021010200028028c0122022000280290012201490d0020002802880121032000200220016b36028c012000200120036a36028801410a2003200120004188016a100b200041a0016a24000f0b000b5b01027f230041206b220224002001411c6a28020021032001280218200241186a2000280200220041106a290200370300200241106a200041086a290200370300200220002902003703082003200241086a1018200241206a24000b5501017f230041206b2202240020022000360204200241186a200141106a290200370300200241106a200141086a29020037030020022001290200370308200241046a41a08004200241086a1018200241206a24000b5e01037f230041106b2203240002402000280208220420026a220520044f0440200341086a20042005200028020020002802041024200328020c2002470d0120032802082001200210041a20002005360208200341106a24000f0b000b000bf50301057f230041406a22032400200341346a2001360200200341033a003820034280808080800437031820032000360230410021002003410036022820034100360220027f0240024020022802082201450440200241146a28020022004103742106200041ffffffff017121072002280210210041002101034020012006460d02200228020020016a220441046a28020022050440200328023020042802002005200328023428020c1101000d040b200141086a2101200028020020002802042105200041086a2100200341186a2005110000450d000b0c020b2002410c6a28020022074105742106200741ffffff3f71210703402006450d01200228020020006a220441046a28020022050440200328023020042802002005200328023428020c1101000d030b20032001411c6a2d00003a003820032001290204422089370318200341106a20022802102204200141146a102320032003290310370320200341086a20042001410c6a102320032003290308370328200041086a2100200641206b210620012802002105200141206a2101200420054103746a2204280200200341186a2004280204110000450d000b0c010b200228020420074b04402003280230200228020020074103746a22002802002000280204200328023428020c1101000d010b41000c010b41010b200341406b24000b0300010b0f00200028020020012002101b41000b5601017f024020022000280204200028020822036b4b0440200020032002101e418180808078470d01200028020821030b200028020020036a2001200210041a200220036a22012003490d00200020013602080f0b000bbb0201027f230041106b220224000240024002400240200028020022002002410c6a027f0240024020014180014f04402002410036020c2001418010490d012001418080044f0d0220022001413f71418001723a000e20022001410c7641e001723a000c20022001410676413f71418001723a000d41030c030b200028020822032000280204460d030c040b20022001413f71418001723a000d2002200141067641c001723a000c41020c010b20022001413f71418001723a000f20022001410676413f71418001723a000e20022001410c76413f71418001723a000d2002200141127641077141f001723a000c41040b101b0c020b200020034101101e418180808078470440000b200028020821030b200028020020036a20013a0000200341016a2201450d01200020013602080b200241106a240041000f0b000b4a01017f230041206b220224002000280200200241186a200141106a290200370300200241106a200141086a29020037030020022001290200370308200241086a1016200241206a24000b930401067f230041206b220324000240027f41002001200120026a22014b0d001a2000280204220220026a22052002490d012005200120012005491b22014108200141084b1b2201417f73411f7621040240200204402003410136021820032002360214200320002802003602100c010b200341003602180b200341106a2106230041106b220524002003027f0240027f0240200404400240200141004e044020062802080d01200520014101101f2005280204210220052802000c040b0c040b20062802042208450440200541086a2001410141001020200528020c210220052802080c030b200121024100418c8304280200220420016a22072004490d021a20062802002106419083042802002007490440200141ffff036a220741107640002202417f46200241ffff0371200247720d022002411074220420074180807c716a22022004490d02419083042002360200200121024100200120046a22072004490d031a0b418c8304200736020041002004450d021a20042006200810040c020b200320013602040c020b2001210241000b2204044020032004360204200341086a200236020041000c020b20032001360204200341086a410136020041010c010b200341086a410036020041010b360200200541106a240020032802004504402003280204210220002001360204200020023602004181808080780c010b200341086a2802000b200341206a24000f0b000b3901017f230041106b22032400200341086a2001200241001020200328020c21012000200328020836020020002001360204200341106a24000bc00201027f200120026a41016b410020026b7122052001492104418c83042802002102024002400240027f200345044020040d0241002103200220056a22042002490d0420022004419083042802004d0d011a200541ffff036a22022005490d032002411076220440002202417f46200241ffff0371200247720d032002411074220220044110746a22042002490d04419083042004360200200220056a22042002490d0420020c010b20040d0141002103200220056a22042002490d0320022004419083042802004d0d001a200541ffff036a22022005490d022002411076220440002202417f46200241ffff0371200247720d022002411074220220044110746a22042002490d03419083042004360200200220056a22042002490d0320020b2103418c830420043602000c020b000b0b20002001360204200020033602000b6a01027f230041106b2203240002402001450440410121020c010b200141004e22040440027f2002450440200341086a20012004101f20032802080c010b2003200120044101102020032802000b22020d010b000b2000200136020420002002360200200341106a24000b0e0020002802001a03400c000b000b5501027f0240027f02400240200228020041016b0e020103000b200241046a0c010b200120022802044103746a22012802044103470d0120012802000b2802002104410121030b20002004360204200020033602000b31000240200120024b200220044b720d002002200220016b2202490d00200020023602042000200120036a3602000f0b000b2d01017f2000280208220220002802044904402000200241016a360208200028020020026a20013a00000f0b000b3001017f2001200041086a28020022024b0440000b2000200220016b36020820002000280204220020016a36020420000b910101027f20002f01042103200041003a0004410121040240024020034101714504402000280200220028020422032002490d02200120002802002201200210041a0c010b200120034108763a0000200028020022002802042203200241016b2202490d01200141016a20002802002201200210041a0b2000200320026b3602042000200120026a360200410021040b20040b2601017f230041106b220224002002200036020c20012002410c6a41041017200241106a24000b0bd3020300418080040bb801ae85085deaaea414541d675f4f5f7237deb384d3d4704e25d9843aee48e4e39b04000000040000000400000005000000060000000700000001010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010041fa81040b330202020202020202020202020202020202020202020202020202020202020303030303030303030303030303030304040404040041b882040b51380101000000000053696465766d4f7065726174696f6e01020304050607080a010b0900000000000100000002000000030000000400000005000000060000000700000008000000090000000c0000000b"},"contract":{"name":"log_server","version":"0.1.0","authors":["[your_name] <[your_email]>"]},"V3":{"spec":{"constructors":[{"args":[],"docs":[],"label":"default","payable":false,"selector":"0xed4b9d1b"}],"docs":[],"events":[],"messages":[{"args":[{"label":"msg","type":{"displayName":["alloc","string","String"],"type":0}}],"docs":[],"label":"log_test","mutates":false,"payable":false,"returnType":null,"selector":"0x654fa7c0"}]},"storage":{"struct":{"fields":[]}},"types":[{"id":0,"type":{"def":{"primitive":"str"}}}]}} \ No newline at end of file diff --git a/e2e/res/log_server.sidevm.wasm b/e2e/res/log_server.sidevm.wasm index f1473071dbb6d51268d2026a5383c7ba53bd1a10..b2059537037c1373c45e67aed3d329c4fc44b4ff 100755 GIT binary patch delta 935 zcmY+AZA?>F7{~Ab>1}T*?N$^~Te4MW+>FGbnL;&D3-N`wqA{_WEFfe?xTM2r)Gw%& zP~OD1JaacOFvcQ=1f8wNa1CYw;hPfupc11_m>=B87K0eY856uMRp(9a|J-wb=lq`M zoZdlu@1Q**ppXqjCW(7ds958VlO43nBuOL=&~d=W7I|JuPLo_%FBhD_w({J-&a&^; za<-gqj^Z*d@pk$1q!Ij$$M_SYd_;De8mU3F%Zo_6n}XAvX)EK_q!%1fHu6*JZ@l$( z0~af0y!uX)a3v3V1eWxW_+#+`5_;x@neExnlR878kmQk^oow~)<TmO&}R5`KC9DLmG78N^YS~0;j6)W(HMa6t0hvWHQMY?w~c9Qvu!|bv6vQ^&{_lG2(#q)^| zs`L5BEc|1PSq(PNVC=6<$4jn?XJci|+Fj{>?~|u}ANKsumtbviU#!+ws`CX;Rk{tI zTaB4ks~MQ&D%I_M*8`?~7vg)A=^maX`b)6Oah7DTY}GlzeQFlQ#iV*_F4{#?-EyE= z^o0v#{34Q@Yhts;qwErE&#!|BMz0$8-c?JyD>BZTBWWUh;UVZBnX9AwxJ`U5uASQi z+~gTu`?>7mI0vF>=2|o4!+fG^k7yGP687$Ipl9SG6XJePb&)p5j9Yr1jGv(yc~W1m z;7N}DZ2{^M%ku2M~?0&2B5w2W0sz>3C8;S+O_~P@IVg-&~KxbNo_+p zzN9xV_1)#TVbc}{@u^n27Zz<*5UvI_2we@*xm;SlOrH^@e1*JA^^z-;V~c(KIzap5 ze_Yq8im*(tAEJy@V-%xw%aXcPk|a6t28_{P{ryh;r@!ba44qa#Mhoz-);&f=G5hN= H>d$%$iugf3 delta 936 zcmY+9TTE0}6o${gX3rcLP!9@PXGk3_Q5%V3qQLl|4#W$?HEB}tMUbe4Lq;*C^o7Qe z0D>CRx|*J}skat21|>r`;UGpqF)^_kA2eu`3i_b(pb;;FZB6W%ORMf=ueI0yvcA1` z|4?%OP;y8@brOga8~39~)e@qMr_fh6QWW_O9ROCdL(EOdZx=EJ9^N~8^oN%hj@Z9JisXL7H-=fYLiFA=Oi8hHug2n?lSmv-cYI%BmH!1hohG*l;Rq1<&QTtA4TLxOAWjR!P}iRGyIQy9bL$b) zN<9;AxK4L_|C<3Z-Kj2lO1gl#}}RvvE|mH!lbF%Yl|c zfg>_$Z)2ot+s7`st1Ap#=Y~*&oPDa9WJAv~&=B$NuCLj3W;tIu@ss@R^a$jkP6wzt z25z5R!uhBDJkmW=R-HTt`Kr5#%upe+An*2WFE&51<1owufl8QbRXoazL29z`=%RGf z@5fe{V?~$+UHx1t-n= zYW(3e$^vj1^8=V>RPKahj~;-j2k1mTE%TbwyUDLouGieyM|sZ3;nz#l5WR6-r8>e= zv-KKfrdnB!(G5px$@XnqzEl)N#CN%s%^x4rGgvyKb(}Kr)aV?i;)wn4aT?6|7h>2- AVgLXD diff --git a/e2e/res/sidevm_deployer.contract b/e2e/res/sidevm_deployer.contract index 54009f35d9..6a60bafdb4 100644 --- a/e2e/res/sidevm_deployer.contract +++ b/e2e/res/sidevm_deployer.contract @@ -1 +1 @@ -{"source":{"hash":"0xb523848bec9a25f29c30094768770305ba98cd3c1d8e24582382afb3ecbef9d3","language":"ink! 3.4.0","compiler":"rustc 1.66.0-nightly","wasm":"0x0061736d0100000001460b60027f7f0060037f7f7f0060037f7f7f017f60017f0060000060017f017f60087f7f7e7f7f7f7f7f017f60057f7f7f7f7f017f60027f7f017f6000017f60057f7f7f7f7f00028b020b057365616c30157365616c5f636f6e7461696e735f73746f726167650005057365616c31097365616c5f63616c6c0006057365616c30107365616c5f7365745f73746f726167650001057365616c30107365616c5f6765745f73746f726167650002057365616c30197365616c5f63616c6c5f636861696e5f657874656e73696f6e0007057365616c300a7365616c5f696e7075740000057365616c300b7365616c5f72657475726e0001057365616c30147365616c5f686173685f626c616b65325f3235360001057365616c300b7365616c5f63616c6c65720000057365616c30167365616c5f76616c75655f7472616e73666572726564000003656e76066d656d6f72790201021003131202080000010100010001030009040304000a0608017f01418080040b071102066465706c6f7900170463616c6c00190ac820122b01017f037f2002200346047f200005200020036a200120036a2d00003a0000200341016a21030c010b0b0bb40101047f230041406a22022400200241386a22034200370300200241306a22044200370300200241286a2205420037030020024200370320200242808001370204200241d0800436020020002002100c20012002100c2002280208220020022802044b0440000b20022802002000200241206a1007200241186a2003290300370300200241106a2004290300370300200241086a20052903003703002002200229032037030020021000200241406b2400417f470b0a00200120004120100f0b8d0101017f230041406a22022400200241286a200141186a290000370300200241206a200141106a290000370300200241186a200141086a2900003703002002420137030820022001290000370310200241386a41808001360200200241d08004360234200241003602302002200241306a2000100e200241106a200228020020022802041002200241406b24000b5602017f017e230041206b220324002001290204210420034100360218200320043703102002200341106a100c20012003290310370204200341086a20012003280218101320002003290308370300200341206a24000b5e01037f230041106b2203240002402000280208220420026a220520044f0440200341086a2004200520002802002000280204101b200328020c2002470d01200328020820012002100a1a20002005360208200341106a24000f0b000b000bde0301077f230041206b22052400200541186a41808001360200200541d0800436021420054100360210200541086a2108230041206b22022400200541106a220628020421032002200641086a28020022043602142002200336021002400240027f20012d0000220741034604402004450d02200341003a000041010c010b2004450d01200341013a000002400240024002400240200741016b0e020102000b200441014d0d05200341003a000120024102360218200128020421072001410c6a2802002201413f4d0440200441024d0d06200320014102743a0002200241033602180c040b200141ffff004d0440200220014102744101723b011e200241106a2002411e6a4102100f0c040b200141ffffffff034b0d022001410274410272200241106a10120c030b200441014d0d04200341013a000120044102460d04200320012d00013a000241030c030b200441014d0d03200341023a000141020c020b200441024d0d02200341033a0002200241033602182001200241106a10120b200241106a20072001100f200228021421042002280210210320022802180b21012006200436020820062003360204200241086a20062001101320082002290308370300200241206a24000c010b000b20002005280208200528020c1011000b0b002000200120021006000b2601017f230041106b220224002002200036020c20012002410c6a4104100f200241106a24000b3c01017f2002200141086a28020022034b0440000b2001200320026b36020820012001280204220120026a36020420002002360204200020013602000b6001017f230041106b2201240020004200370000200041186a4200370000200041106a4200370000200041086a420037000020014120360204200120003602002001412036020c20002001410c6a10082001200128020c1015200141106a24000b3301017f230041106b22022400200241086a4100200120002802002000280204101b20002002290308370200200241106a24000b6c02027f027e230041206b22002400200041086a220142003703002000420037030020004110360214200020003602102000411036021c20002000411c6a1009200041106a200028021c10152001290300210220002903002103200041206a2400410541042002200384501b0bf40101057f23004180016b220024000240101641ff01714105470d00200041808001360244200041d08004360240200041406b101820002802444104490d00200028024028000041ed97f5dc01470d00101641ff01714105470d00200041d8006a22014200370300200041d0006a22024200370300200041c8006a22034200370300200041e8006a4200370300200041f0006a4200370300200041f8006a42003703002000420037034020004201370360200041406b220410142000200441c000100a2100200142003703002002420037030020034200370300200042003703402000200041406b100d20004180016a24000f0b000b3301017f230041106b220124002001200028020436020c20002802002001410c6a10052000200128020c1015200141106a24000bad1202087f037e23004180036b220024000240024002400240101641ff01714105470d002000418080013602d401200041d080043602d001200041d0016a101820002802d40122014104490d00200141046b210220002802d001220328000022014118762104200141107621052001410876210602400240200141ff0171220141a901470440200141bc01460d01200141ae0147200641ff017141f3014772200541ff017141be0147200441fe014772720d0341002101200241204f0d020c030b200641ff017141c20047200541ff017141fb014772200441a50147720d0241012101200241204f0d010c020b200641ff017141ff0147200541ff017141294772200441a50147720d014102210120024120490d010b200041206a2003410d6a290000370300200041286a200341156a2900003703002000412f6a2003411c6a2900003700002000200329000537031820032d00042104200041e0016a4200370300200041e8016a4200370300200041f0016a4200370300200042003703d801200042013703d00120004180800136029c01200041d0800436029801200041808001360238200041d8016a220341d08004200041386a1003210220004198016a200028023810152002410c4f0d00200241027441a080046a2802000d00200028029c014120490d00200041c1006a200028029801220241096a290000370000200041c9006a200241116a290000370000200041d0006a200241186a2900003700002000200229000137003920022d0000210220002903d0012108200042013703d0012000200820002903d80122097c22083703d801200020002903e001220a2008200954ad7c22083703e001200020002903e80122092008200a54ad7c22083703e801200020002903f0012008200954ad7c3703f001200041e8006a200341106a290000370300200041e0006a200341086a290000370300200041f0006a200341186a29000037030020002003290000370358200020023a0038200041d8006a210302400240024002400240200141016b0e020100020b101641ff01714105470d04200041d9016a200041206a290300370000200041e1016a200041286a290300370000200041e8016a2000412f6a290000370000200020043a00d001200020002903183700d1012003200041d0016a100b2102230041206b22012400200141186a41808001360200200141d0800436021420014100360210230041206b22002400200141106a220329020421082000410036021820002008370310200020023a001f200041106a2000411f6a4101100f20032000290310370204200041086a200320002802181013200141086a2000290308370300200041206a240041002001280208200128020c1011000b101641ff01714105470d03200041f8006a2201101420032001100b450d01200041d8016a220341808001360200200041d080043602d401200041003602d001200041106a200041d0016a101a200028021421012000280210210220002003280200220536029c01200020002802d401220636029801200020053602f002410f200220012006200041f0026a10041a20004198016a20002802f0021015200028029c01411f4d0d03200028029801210120034200370300200041e0016a2203420037030020004180026a200141186a290000370300200041f8016a200141106a290000370300200041f0016a200141086a290000370300200042003703d001200020012900003703e80120004198016a2201200041d0016a22024138100a1a200220014138100a1a20004190026a220220043a000020004191026a200029031837000020004199026a200041206a290300370000200041a1026a200041286a290300370000200041a8026a2000412f6a290000370000200041b0026a22042000290378370300200041b8026a20004180016a290300370300200041c0026a20004188016a290300370300200041c8026a20004190016a29030037030020004280808080e0ec8ba5a47f37038802200041d8026a41808001360200200041d080043602d402200041003602d00220002903d0012108200041086a200041d0026a200041e8016a100e2000280208210520002902d4022109200041003602e802200020093703e002200020032903003703f802200020002903d8013703f002200041e0026a200041f0026a4110100f20002802e402220620002802e8022201490d0320002802e0022103200041003602f8022000200620016b3602f4022000200120036a3602f002200041f0026a22012000418c026a4104100f20042001100c20022001100c20002802f402220420002802f8022201490d0320002802f00221022000200420016b22043602e4022000200120026a22063602e002200020043602f0024100200520082003200220012006200041f0026a10012101200041e0026a20002802f00210152001417d712001410b4b720d0320002802e4022201450d030240024020002802e00222032d00000e020100050b20014101460d0420032d0001220141024f0d04200041013a00f002200020014100473a00f1020c070b200041033a00f0020c050b101641ff01714105460d010c020b200041023a00f0020c040b200041d0016a22021014027f200041386a210141202105034041002005450d011a200541016b210520012d0000210620022d00002107200241016a2102200141016a210120062007460d000b200720066b0b0d0120004181016a200041206a29030037000020004189016a200041286a29030037000020004190016a2000412f6a290000370000200020043a007820002000290318370079200041e8016a22044200370300200041e0016a22054200370300200041d8016a22024200370300200042003703d00120004280800137029c01200041d0800436029801200320004198016a2201100c200041f8006a2001100c20002802a0012201200028029c014b0d002000280298012001200041d0016a22011007200041b0016a2004290300370300200041a8016a2005290300370300200041a0016a2002290300370300200020002903d00137039801200241808001360200200041d080043602d401200041003602d00120002001101a20004198016a200028020020002802041002200041033a00f0022001200041386a41c000100a1a200141808004100d0c020b000b200041023a00f0020c010b4100200041f0026a1010000b4101200041f0026a1010000b3701017f230041106b22022400200241086a200141001013200228020c21012000200228020836020020002001360204200241106a24000b31000240200120024b200220044b720d002002200220016b2202490d00200020023602042000200120036a3602000f0b000b0b31010041a480040b290100000002000000030000000400000005000000060000000700000008000000090000000c0000000b"},"contract":{"name":"sidevm_deployer","version":"0.1.0","authors":["[your_name] <[your_email]>"],"description":"This is a demo describes how to write a pink driver contract"},"V3":{"spec":{"constructors":[{"args":[],"docs":[],"label":"default","payable":false,"selector":"0xed4b9d1b"}],"docs":[],"events":[],"messages":[{"args":[{"label":"contract","type":{"displayName":["AccountId"],"type":0}}],"docs":[],"label":"allow","mutates":true,"payable":false,"returnType":{"displayName":["Result"],"type":6},"selector":"0xaef3befe"},{"args":[{"label":"code_hash","type":{"displayName":["pink","Hash"],"type":1}}],"docs":[],"label":"SidevmOperation::deploy","mutates":false,"payable":false,"returnType":{"displayName":["Result"],"type":6},"selector":"0xa942fba5"},{"args":[{"label":"contract","type":{"displayName":["AccountId"],"type":0}}],"docs":[],"label":"SidevmOperation::can_deploy","mutates":false,"payable":false,"returnType":{"displayName":["bool"],"type":10},"selector":"0xbcff29a5"}]},"storage":{"struct":{"fields":[{"layout":{"cell":{"key":"0x0000000000000000000000000000000000000000000000000000000000000000","ty":0}},"name":"owner"},{"layout":{"cell":{"key":"0x0100000000000000000000000000000000000000000000000000000000000000","ty":3}},"name":"whitelist"}]}},"types":[{"id":0,"type":{"def":{"composite":{"fields":[{"type":1,"typeName":"[u8; 32]"}]}},"path":["ink_env","types","AccountId"]}},{"id":1,"type":{"def":{"array":{"len":32,"type":2}}}},{"id":2,"type":{"def":{"primitive":"u8"}}},{"id":3,"type":{"def":{"composite":{"fields":[{"name":"offset_key","type":5,"typeName":"Key"}]}},"params":[{"name":"K","type":0},{"name":"V","type":4}],"path":["ink_storage","lazy","mapping","Mapping"]}},{"id":4,"type":{"def":{"tuple":[]}}},{"id":5,"type":{"def":{"composite":{"fields":[{"type":1,"typeName":"[u8; 32]"}]}},"path":["ink_primitives","Key"]}},{"id":6,"type":{"def":{"variant":{"variants":[{"fields":[{"type":4}],"index":0,"name":"Ok"},{"fields":[{"type":7}],"index":1,"name":"Err"}]}},"params":[{"name":"T","type":4},{"name":"E","type":7}],"path":["Result"]}},{"id":7,"type":{"def":{"variant":{"variants":[{"fields":[{"type":8,"typeName":"String"}],"index":0,"name":"Other"},{"fields":[{"type":9,"typeName":"Error"}],"index":1,"name":"SystemError"},{"index":2,"name":"BadOrigin"}]}},"path":["pink_extension","system","DriverError"]}},{"id":8,"type":{"def":{"primitive":"str"}}},{"id":9,"type":{"def":{"variant":{"variants":[{"index":0,"name":"PermisionDenied"},{"index":1,"name":"DriverNotFound"}]}},"path":["pink_extension","system","Error"]}},{"id":10,"type":{"def":{"primitive":"bool"}}}]}} \ No newline at end of file +{"source":{"hash":"0x09ff48ffc8201bf2fe33709fe0da01fa76657d580399531a491a0f04f3cba61a","language":"ink! 3.4.0","compiler":"rustc 1.66.0-nightly","wasm":"0x0061736d0100000001460b60027f7f0060037f7f7f0060037f7f7f017f60017f0060000060017f017f60087f7f7e7f7f7f7f7f017f60057f7f7f7f7f017f60027f7f017f6000017f60057f7f7f7f7f00028b020b057365616c30157365616c5f636f6e7461696e735f73746f726167650005057365616c31097365616c5f63616c6c0006057365616c30107365616c5f7365745f73746f726167650001057365616c30107365616c5f6765745f73746f726167650002057365616c30197365616c5f63616c6c5f636861696e5f657874656e73696f6e0007057365616c300a7365616c5f696e7075740000057365616c300b7365616c5f72657475726e0001057365616c30147365616c5f686173685f626c616b65325f3235360001057365616c300b7365616c5f63616c6c65720000057365616c30167365616c5f76616c75655f7472616e73666572726564000003656e76066d656d6f72790201021003131202080000010100010100030009040304000a0608017f01418080040b071102066465706c6f7900170463616c6c00190ac820122b01017f037f2002200346047f200005200020036a200120036a2d00003a0000200341016a21030c010b0b0bb40101047f230041406a22022400200241386a22034200370300200241306a22044200370300200241286a2205420037030020024200370320200242808001370204200241d0800436020020002002100c20012002100c2002280208220020022802044b0440000b20022802002000200241206a1007200241186a2003290300370300200241106a2004290300370300200241086a20052903003703002002200229032037030020021000200241406b2400417f470b0a00200120004120100f0b8d0101017f230041406a22022400200241286a200141186a290000370300200241206a200141106a290000370300200241186a200141086a2900003703002002420137030820022001290000370310200241386a41808001360200200241d08004360234200241003602302002200241306a2000100e200241106a200228020020022802041002200241406b24000b5602017f017e230041206b220324002001290204210420034100360218200320043703102002200341106a100c20012003290310370204200341086a20012003280218101220002003290308370300200341206a24000b5e01037f230041106b2203240002402000280208220420026a220520044f0440200341086a2004200520002802002000280204101b200328020c2002470d01200328020820012002100a1a20002005360208200341106a24000f0b000b000bde0301077f230041206b22052400200541186a41808001360200200541d0800436021420054100360210200541086a2108230041206b22022400200541106a220628020421032002200641086a28020022043602142002200336021002400240027f20012d0000220741034604402004450d02200341003a000041010c010b2004450d01200341013a000002400240024002400240200741016b0e020102000b200441014d0d05200341003a000120024102360218200128020421072001410c6a2802002201413f4d0440200441024d0d06200320014102743a0002200241033602180c040b200141ffff004d0440200220014102744101723b011e200241106a2002411e6a4102100f0c040b200141ffffffff034b0d022001410274410272200241106a10130c030b200441014d0d04200341013a000120044102460d04200320012d00013a000241030c030b200441014d0d03200341023a000141020c020b200441024d0d02200341033a0002200241033602182001200241106a10130b200241106a20072001100f200228021421042002280210210320022802180b21012006200436020820062003360204200241086a20062001101220082002290308370300200241206a24000c010b000b20002005280208200528020c1011000b0b002000200120021006000b3c01017f2002200141086a28020022034b0440000b2001200320026b36020820012001280204220120026a36020420002002360204200020013602000b2601017f230041106b220224002002200036020c20012002410c6a4104100f200241106a24000b6001017f230041106b2201240020004200370000200041186a4200370000200041106a4200370000200041086a420037000020014120360204200120003602002001412036020c20002001410c6a10082001200128020c1015200141106a24000b3301017f230041106b22022400200241086a4100200120002802002000280204101b20002002290308370200200241106a24000b6c02027f027e230041206b22002400200041086a220142003703002000420037030020004110360214200020003602102000411036021c20002000411c6a1009200041106a200028021c10152001290300210220002903002103200041206a2400410541042002200384501b0bf40101057f23004180016b220024000240101641ff01714105470d00200041808001360244200041d08004360240200041406b101820002802444104490d00200028024028000041ed97f5dc01470d00101641ff01714105470d00200041d8006a22014200370300200041d0006a22024200370300200041c8006a22034200370300200041e8006a4200370300200041f0006a4200370300200041f8006a42003703002000420037034020004201370360200041406b220410142000200441c000100a2100200142003703002002420037030020034200370300200042003703402000200041406b100d20004180016a24000f0b000b3301017f230041106b220124002001200028020436020c20002802002001410c6a10052000200128020c1015200141106a24000bad1202087f037e23004180036b220024000240024002400240101641ff01714105470d002000418080013602d401200041d080043602d001200041d0016a101820002802d40122014104490d00200141046b210220002802d001220328000022014118762104200141107621052001410876210602400240200141ff0171220141a901470440200141bc01460d01200141ae0147200641ff017141f3014772200541ff017141be0147200441fe014772720d0341002101200241204f0d020c030b200641ff017141c20047200541ff017141fb014772200441a50147720d0241012101200241204f0d010c020b200641ff017141ff0147200541ff017141294772200441a50147720d014102210120024120490d010b200041206a2003410d6a290000370300200041286a200341156a2900003703002000412f6a2003411c6a2900003700002000200329000537031820032d00042104200041e0016a4200370300200041e8016a4200370300200041f0016a4200370300200042003703d801200042013703d00120004180800136029c01200041d0800436029801200041808001360238200041d8016a220341d08004200041386a1003210220004198016a200028023810152002410c4f0d00200241027441a080046a2802000d00200028029c014120490d00200041c1006a200028029801220241096a290000370000200041c9006a200241116a290000370000200041d0006a200241186a2900003700002000200229000137003920022d0000210220002903d0012108200042013703d0012000200820002903d80122097c22083703d801200020002903e001220a2008200954ad7c22083703e001200020002903e80122092008200a54ad7c22083703e801200020002903f0012008200954ad7c3703f001200041e8006a200341106a290000370300200041e0006a200341086a290000370300200041f0006a200341186a29000037030020002003290000370358200020023a0038200041d8006a210302400240024002400240200141016b0e020100020b101641ff01714105470d04200041d9016a200041206a290300370000200041e1016a200041286a290300370000200041e8016a2000412f6a290000370000200020043a00d001200020002903183700d1012003200041d0016a100b2102230041206b22012400200141186a41808001360200200141d0800436021420014100360210230041206b22002400200141106a220329020421082000410036021820002008370310200020023a001f200041106a2000411f6a4101100f20032000290310370204200041086a200320002802181012200141086a2000290308370300200041206a240041002001280208200128020c1011000b101641ff01714105470d03200041f8006a2201101420032001100b450d01200041d8016a220341808001360200200041d080043602d401200041003602d001200041106a200041d0016a101a200028021421012000280210210220002003280200220536029c01200020002802d401220636029801200020053602f002410f200220012006200041f0026a10041a20004198016a20002802f0021015200028029c01411f4d0d03200028029801210120034200370300200041e0016a2203420037030020004180026a200141186a290000370300200041f8016a200141106a290000370300200041f0016a200141086a290000370300200042003703d001200020012900003703e80120004198016a2201200041d0016a22024138100a1a200220014138100a1a20004190026a220220043a000020004191026a200029031837000020004199026a200041206a290300370000200041a1026a200041286a290300370000200041a8026a2000412f6a290000370000200041b0026a22042000290378370300200041b8026a20004180016a290300370300200041c0026a20004188016a290300370300200041c8026a20004190016a29030037030020004280808080e0ec8ba5a47f37038802200041d8026a41808001360200200041d080043602d402200041003602d00220002903d0012108200041086a200041d0026a200041e8016a100e2000280208210520002902d4022109200041003602e802200020093703e002200020032903003703f802200020002903d8013703f002200041e0026a200041f0026a4110100f20002802e402220620002802e8022201490d0320002802e0022103200041003602f8022000200620016b3602f4022000200120036a3602f002200041f0026a22012000418c026a4104100f20042001100c20022001100c20002802f402220420002802f8022201490d0320002802f00221022000200420016b22043602e4022000200120026a22063602e002200020043602f0024100200520082003200220012006200041f0026a10012101200041e0026a20002802f00210152001417d712001410b4b720d0320002802e4022201450d030240024020002802e00222032d00000e020100050b20014101460d0420032d0001220141024f0d04200041013a00f002200020014100473a00f1020c070b200041033a00f0020c050b101641ff01714105460d010c020b200041023a00f0020c040b200041d0016a22021014027f200041386a210141202105034041002005450d011a200541016b210520012d0000210620022d00002107200241016a2102200141016a210120062007460d000b200720066b0b0d0120004181016a200041206a29030037000020004189016a200041286a29030037000020004190016a2000412f6a290000370000200020043a007820002000290318370079200041e8016a22044200370300200041e0016a22054200370300200041d8016a22024200370300200042003703d00120004280800137029c01200041d0800436029801200320004198016a2201100c200041f8006a2001100c20002802a0012201200028029c014b0d002000280298012001200041d0016a22011007200041b0016a2004290300370300200041a8016a2005290300370300200041a0016a2002290300370300200020002903d00137039801200241808001360200200041d080043602d401200041003602d00120002001101a20004198016a200028020020002802041002200041033a00f0022001200041386a41c000100a1a200141808004100d0c020b000b200041023a00f0020c010b4100200041f0026a1010000b4101200041f0026a1010000b3701017f230041106b22022400200241086a200141001012200228020c21012000200228020836020020002001360204200241106a24000b31000240200120024b200220044b720d002002200220016b2202490d00200020023602042000200120036a3602000f0b000b0b31010041a480040b290100000002000000030000000400000005000000060000000700000008000000090000000c0000000b"},"contract":{"name":"sidevm_deployer","version":"0.1.0","authors":["[your_name] <[your_email]>"],"description":"This is a demo describes how to write a pink driver contract"},"V3":{"spec":{"constructors":[{"args":[],"docs":[],"label":"default","payable":false,"selector":"0xed4b9d1b"}],"docs":[],"events":[],"messages":[{"args":[{"label":"contract","type":{"displayName":["AccountId"],"type":0}}],"docs":[],"label":"allow","mutates":true,"payable":false,"returnType":{"displayName":["Result"],"type":6},"selector":"0xaef3befe"},{"args":[{"label":"code_hash","type":{"displayName":["pink","Hash"],"type":1}}],"docs":[],"label":"SidevmOperation::deploy","mutates":false,"payable":false,"returnType":{"displayName":["Result"],"type":6},"selector":"0xa942fba5"},{"args":[{"label":"contract","type":{"displayName":["AccountId"],"type":0}}],"docs":[],"label":"SidevmOperation::can_deploy","mutates":false,"payable":false,"returnType":{"displayName":["bool"],"type":10},"selector":"0xbcff29a5"}]},"storage":{"struct":{"fields":[{"layout":{"cell":{"key":"0x0000000000000000000000000000000000000000000000000000000000000000","ty":0}},"name":"owner"},{"layout":{"cell":{"key":"0x0100000000000000000000000000000000000000000000000000000000000000","ty":3}},"name":"whitelist"}]}},"types":[{"id":0,"type":{"def":{"composite":{"fields":[{"type":1,"typeName":"[u8; 32]"}]}},"path":["ink_env","types","AccountId"]}},{"id":1,"type":{"def":{"array":{"len":32,"type":2}}}},{"id":2,"type":{"def":{"primitive":"u8"}}},{"id":3,"type":{"def":{"composite":{"fields":[{"name":"offset_key","type":5,"typeName":"Key"}]}},"params":[{"name":"K","type":0},{"name":"V","type":4}],"path":["ink_storage","lazy","mapping","Mapping"]}},{"id":4,"type":{"def":{"tuple":[]}}},{"id":5,"type":{"def":{"composite":{"fields":[{"type":1,"typeName":"[u8; 32]"}]}},"path":["ink_primitives","Key"]}},{"id":6,"type":{"def":{"variant":{"variants":[{"fields":[{"type":4}],"index":0,"name":"Ok"},{"fields":[{"type":7}],"index":1,"name":"Err"}]}},"params":[{"name":"T","type":4},{"name":"E","type":7}],"path":["Result"]}},{"id":7,"type":{"def":{"variant":{"variants":[{"fields":[{"type":8,"typeName":"String"}],"index":0,"name":"Other"},{"fields":[{"type":9,"typeName":"Error"}],"index":1,"name":"SystemError"},{"index":2,"name":"BadOrigin"}]}},"path":["pink_extension","system","DriverError"]}},{"id":8,"type":{"def":{"primitive":"str"}}},{"id":9,"type":{"def":{"variant":{"variants":[{"index":0,"name":"PermisionDenied"},{"index":1,"name":"DriverNotFound"}]}},"path":["pink_extension","system","Error"]}},{"id":10,"type":{"def":{"primitive":"bool"}}}]}} \ No newline at end of file diff --git a/e2e/res/system.contract b/e2e/res/system.contract index 9d6c94ec9b..54982b173d 100644 --- a/e2e/res/system.contract +++ b/e2e/res/system.contract @@ -1 +1 @@ -{"source":{"hash":"0xaa74282b6e8772b26e4833b1f9cb1f72a9f214426183be42c6561749e63202cb","language":"ink! 3.4.0","compiler":"rustc 1.66.0-nightly","wasm":"0x0061736d01000000016e1160027f7f0060037f7f7f0060037f7f7f017f60017f0060047f7f7f7f0060027f7f017f60000060017f017f60087f7f7e7f7f7f7f7f017f60057f7f7f7f7f017f60027e7e0060047f7f7e7e006000017f60067f7e7f7f7f7f017f60037e7e7f0060057f7f7f7f7f0060027e7f0002bb020d057365616c30157365616c5f636f6e7461696e735f73746f726167650007057365616c31097365616c5f63616c6c0008057365616c30127365616c5f6465706f7369745f6576656e740004057365616c30107365616c5f7365745f73746f726167650001057365616c30107365616c5f6765745f73746f726167650002057365616c30197365616c5f63616c6c5f636861696e5f657874656e73696f6e0009057365616c300a7365616c5f696e7075740000057365616c300b7365616c5f72657475726e0001057365616c30147365616c5f686173685f626c616b65325f3235360001057365616c300b7365616c5f63616c6c65720000057365616c300c7365616c5f616464726573730000057365616c30167365616c5f76616c75655f7472616e73666572726564000003656e76066d656d6f727902010210032b2a0202050000010000040105000a000000010b010100030c060306000001000d0000030e0f0002000010000608017f01418080040b071102066465706c6f7900230463616c6c00250ad26f2a2b01017f037f2002200346047f200005200020036a200120036a2d00003a0000200341016a21030c010b0b0b3f01027f0340200245044041000f0b200241016b210220012d0000210320002d00002104200041016a2100200141016a210120032004460d000b200420036b0bb40101047f230041406a22022400200241386a22034200370300200241306a22044200370300200241286a220542003703002002420037032020024280800137020420024190830436020020002002100f20012002100f2002280208220020022802044b0440000b20022802002000200241206a1008200241186a2003290300370300200241106a2004290300370300200241086a20052903003703002002200229032037030020021000200241406b2400417f470b0a0020012000412010150b4c01017f230041206b22022400200241186a4180800136020020024190830436021420024100360210200241086a200241106a2000101120012002280208200228020c1003200241206a24000b5602017f017e230041206b220324002001290204210420034100360218200320043703102002200341106a100f20012003290310370204200341086a20012003280218101f20002003290308370300200341206a24000b5e01017f230041306b22022400200241286a200141186a290000370300200241206a200141106a290000370300200241186a200141086a29000037030020024201370308200220012900003703102000200241106a1010200241306a24000bbc0102027f037e230041206b22022400200241106a4180800136020020024190830436020c200241003602082002200241086a2001101120022802042101200228020021032002200229020c370318411020032001200241186a1014200228021c220141104f200141707141104771450440000b2002280218220141186a2900002104200141086a290000210520012900002106200020012900103703102000200537030820002006370300200041186a2004370300200241206a24000b3a01017f230041106b220424002004200328020436020c20002001200220032802002004410c6a10051a2003200428020c101b200441106a24000b5e01037f230041106b2203240002402000280208220420026a220520044f0440200341086a2004200520002802002000280204102f200328020c2002470d01200328020820012002100c1a20002005360208200341106a24000f0b000b000b0b00200020014120100d450bd50101067f230041206b22022400200241186a4180800136020020024190830436021420024100360210200241086a2107230041106b22032400200241106a220541086a28020021062005280204210402400240027f200141ff017141024604402006450d02200441003a000041010c010b2006450d01200441013a000020064101460d01200420013a000141020b210120052004360204200341086a20052001101f200328020c21012007200328020836020020072001360204200341106a24000c010b000b20002002280208200228020c101c000b4801017f230041206b22022400200241186a4180800136020020024190830436021420024100360210200241086a200241106a20002001101d41002002280208200228020c101c000bd20201077f230041206b22052400200541186a4180800136020020054190830436021420054100360210200541086a2107230041206b22022400200541106a220628020421032002200641086a28020022043602142002200336021002400240027f20012d0000220841034604402004450d02200341003a000041010c010b2004450d01200341013a0000024002400240200841016b0e020102000b200441014d0d03200341003a000120024102360218200141046a2802002001410c6a280200200241106a101e200228021421042002280210210320022802180c020b200441014d0d02200341013a000120044102460d02200320012d00013a000241030c010b200441014d0d01200341023a000141020b21012006200436020820062003360204200241086a20062001101f20072002290308370300200241206a24000c010b000b20002005280208200528020c101c000bd40101027f230041106b2202240020024180800136020420024190830436020020024180800136020c2001419083042002410c6a100421012002200228020c101b02400240024002402001410c4f0d00200141027441d882046a2802000e0401000002000b000b200228020441204f0440200041013a0000200020022802002201290000370001200041096a200141086a290000370000200041116a200141106a290000370000200041196a200141186a2900003700000c020b200041003a0001410221030b200020033a00000b200241106a24000b3301017f230041106b22022400200241086a4100200120002802002000280204102f20002002290308370200200241106a24000b0b002000200120021007000b5802017f017e230041206b2204240020012902042105200441003602182004200537031020022003200441106a102e20012004290310370204200441086a20012004280218101f20002004290308370300200441206a24000b2c01017f230041106b220324002003200136020c2003410c6a200210332002200020011015200341106a24000b3c01017f2002200141086a28020022034b0440000b2001200320026b36020820012001280204220120026a36020420002002360204200020013602000b2601017f230041106b22022400200220003b010e20012002410e6a41021015200241106a24000b6001017f230041106b2201240020004200370000200041186a4200370000200041106a4200370000200041086a420037000020014120360204200120003602002001412036020c20002001410c6a10092001200128020c101b200141106a24000b6c02027f027e230041206b22002400200041086a220142003703002000420037030020004110360214200020003602102000411036021c20002000411c6a100b200041106a200028021c101b2001290300210220002903002103200041206a2400410541042002200384501b0ba10201057f230041c0016b220024000240102241ff01714105470d00200041808001360264200041908304360260200041e0006a102420002802644104490d00200028026028000041ed97f5dc01470d00102241ff01714105470d00200041f8006a22014200370300200041f0006a22024200370300200041e8006a2203420037030020004188016a420037030020004190016a420037030020004198016a4200370300200041a8016a4200370300200041b0016a4200370300200041b8016a4200370300200042003703602000420137038001200042023703a001200041e0006a220410212000200441e000100c2100200142003703002002420037030020034200370300200042003703602000200041e0006a1012200041c0016a24000f0b000b3301017f230041106b220124002001200028020436020c20002802002001410c6a10062000200128020c101b200141106a24000bd73e020c7f067e230041f0046b2200240002400240024002400240102241ff01714105470d002000418080013602e4022000419083043602e002200041e0026a1024200020002802e40222053602bc03200020002802e00222013602b80320054104490d00200128000021082000200541046b22033602bc032000200141046a22063602b803200841187621072008411076210420084108762102027f024002400240024002400240024002400240024002400240200841ff0171220841e6006b0e020401000b0240024020084187016b0e04010e0e0a000b20084127460d0320084135460d06200841c500460d07200841d200460d05200841da00460d08200841a201460d0b200841aa01460d02200841af01460d0a200841f00147200241ff017141ef004772200441ff01714105472007410a4772722003412049720d0d200041a8016a2001411b6a290000370300200041b0016a200141236a2d00003a00002000200541246b3602bc032000200141246a3602b803200020012900133703a001200128000b22024108762104200128000f21062001280007210320012f0005210920012d0004210a410a0c0c0b200241ff017141c90147200441ff0171418a0147722007418d0147720d0c41000c0b0b200241ff017141e10047200441ff017141204772200741e10047200341204972720d0b200041a8016a2001411b6a290000370300200041b0016a200141236a2d00003a0000200020012900133703a001200128000b22024108762104200128000f21062001280007210320012f0005210920012d0004210a41010c0a0b200241ff0171411e47200441ff0171412047722007413047720d0a200041d8036a200041b8036a102620002802d8032203450d0a20002802bc034120490d0a20002802e003210620002802dc03210220002802b8032201290018210c2001280014210b200041a8016a200141086a290000370300200041b0016a200141106a280000360200200020012900003703a0012002410876210441020c090b200241ff017141c00047200441ff017141cf0147722007410a47720d09200041d8036a200041b8036a102620002802d8032203450d0920002f00dd0320002d00df0341107472210420002802e003210620002d00dc03210241030c080b200241ff0171412f47200441ff017141ca004772200741a4014720034120497272200541246b412049720d08200128000f2106200128000b21022001280007210320012f0005210920012d0004210a200041eb036a200141266a2d00003a000020004188036a200141c3006a2d00003a0000200041e0036a2001411b6a290000220d370300200041e8036a2204200141236a2d00003a00002000200141c4006a3602b803200020012f00243b00e9032000200129003b3703800320002001290013220e3703d803200141336a290000210f200129002b210c2001280027210b200041a8016a200d370300200041b0016a20042802003602002000200e3703a0012002410876210441040c070b200241ff017141a00147200441ff017141fd014772200741ea0047200341204972720d07200041a8016a2001411b6a290000370300200041b0016a200141236a2d00003a00002000200141246a3602b803200020012900133703a001200128000b22024108762104200128000f21062001280007210320012f0005210920012d0004210a41050c060b200241ff0171412c47200441ff017141eb004772200345200741dc004772720d062000200541056b22023602bc0320062d0000200241204972200541256b410c49720d06200041a8016a200141116a290000370300200041b0016a200141196a280000360200200128000521062000200541316b3602bc032000200141316a3602b803200020012900093703a0012001280025220241087621042001350021210c2001290029210f200128001d210b41060c050b200241ff017141ec0147200441ff0171419b0147722007411847200341204972722005417c71412446720d05200128000c21062001280008210220012800042103200041a8016a200141186a290000370300200041b0016a200141206a2800003602002000200541286b3602bc032000200141286a3602b803200020012900103703a001200241087621042001280024210b41070c040b200241ff017141980147200441ff017141f20147722007412647200341204972720d04200041a8016a2001411b6a290000370300200041b0016a200141236a2d00003a00002000200541246b3602bc032000200141246a3602b803200020012900133703a001200128000b22024108762104200128000f21062001280007210320012f0005210920012d0004210a41080c030b200241ff0171410d47200441ff017141c0004772200741d70147200341204972720d03200041a8016a2001411b6a290000370300200041b0016a200141236a2d00003a00002000200541246b3602bc032000200141246a3602b803200020012900133703a001200128000b22024108762104200128000f21062001280007210320012f0005210920012d0004210a41090c020b200241ff017141e90047200441ff017141ca0147722007410347720d02410b0c010b200241ff017141cb0047200441ff017141cb014772200741c4004720034120497272200541246b411049720d012001280020210b2001280008210620012800042102200041a8016a200141146a290000370300200041b0016a2001411c6a2800003602002000200541346b3602bc032000200141346a3602b8032000200129000c3703a001200241087621042001412c6a290000210f2001290024210c410c0b210720004198016a200041b0016a220128020036020020004190016a200041a8016a220529030037030020004180016a20004188036a22082903003c0000200020002903a00137038801200020002903800337037820014200370300200041b8016a4200370300200041c0016a4200370300200042003703a801200042013703a001200041d8036a2005101a20002d00d80322014102460d0020004198036a200041f1036a29000037030020004190036a200041e9036a2900003703002008200041e1036a290000370300200020002900d903370380032001450d00200241ff01712004410874722101200041f0036a20004198036a290300370300200041e8036a20004190036a290300370300200041e0036a20004188036a29030037030020002000290380033703d803200020002903a801220d20002903a0017c22103703a801200020002903b001220e200d201056ad7c220d3703b001200020002903b8012211200d200e54ad7c220e3703b801200020002903c001200e201154ad7c22113703c00120004188046a200541106a220229000037030020004180046a200541086a220429000037030020004190046a200541186a2208290000370300200020052900003703f803200042013703a0012000201042017c22103703a8012000200d201050ad7c22103703b0012000200e200d201056ad7c220d3703b80120002011200d200e54ad7c3703c001200041a8046a2002290000370300200041a0046a2004290000370300200041b0046a20082900003703002000200529000037039804200041a0016a200041d8036a41e000100c1a0240024002400240024002400240024002400240024002400240024002400240024002400240200741016b0e0c0b0a090807060504030201000c0b102241ff01714105470d1220004180036a22031021200041f0036a4200370300200041e8036a4200370300200041e0036a22044200370300200042003703d803200041203602a4022000200041d8036a22023602a002200041203602b8032002200041b8036a100a200041a0026a20002802b803101b200320021016450d0d2004418080013602002000419083043602dc03200041003602d803200041f0006a200041d8036a10272000280274210220002802702103200020002902dc0337038003410f2003200220004180036a1014200028028403411f4d0d12200041a8026a2204200028028003220241086a290000370300200041b0026a2205200241106a290000370300200041b8026a2207200241186a290000370300200020022900003703a002200041e8006a410f41001028200028026c21022000280268220341ba8204290000370000200341076a41c1820429000037000020004188046a200729030037030020004180046a2005290300370300200041f8036a2004290300370300200041e0036a4200370300200041e8036a22044200370300200020002903a0023703f003200042003703d80320004180036a2205200041d8036a22074138100c1a200720054138100c1a20004198046a428f808080f084d0e70a37030020004194046a20023602002000200336029004200041808080083602a004200041d8046a418080013602002000419083043602d404200041003602d00420002903d803210d200041e0006a200041d0046a2202200041f0036a10112000280260200041d8006a200220002903e0032004290300101d2000280258210220002902d404210e200041003602c0032000200e3703b8032000419c046a200041b8036a220410292003410f2004101e20002802bc03220720002802c0032203490d1220002802b80321042000200720036b3602ec042000200320046a3602e804200d200220042003200041e8046a102a2203410d710d0c024020002802ec042205450d000240024020002802e80422032d000022040e020100020b200541016b4120490d01200041c0036a2003410a6a290000370300200041c8036a200341126a290000370300200041cf036a200341196a290000370000200020032900023703b80320032d000121020b200041f7026a200041cf036a290000370000200041f0026a200041c8036a290300370300200041e8026a200041c0036a290300370300200020002903b8033703e0020c120b410021020c100b102241ff01714105470d11200041d8036a200041a0016a102b20002d00d8030d1420004197036a2201200041f1036a29000037000020004190036a2202200041ea036a29010037030020004188036a200041e2036a290100220c370300200020002901da03220f3703800320002d00d9032103200041e1036a200c370000200041e9036a2002290300370000200041f0036a2001290000370000200020033a00d8032000200f3700d903230041d0006b22012400200141216a200041d8036a220041186a290000370000200141196a200041106a290000370000200141116a200041086a2900003700002001410a3a000820012000290000370009200141086a102d200141d0006a24000c130b102241ff01714105470d10200041ef036a20004190016a290300370000200041f7036a20004198016a2d00003a0000200020063600e303200020013600df03200020033600db03200020093b00d9032000200a3a00d80320002000290388013700e703200041c0016a200041d8036a100e2103230041206b22012400200141186a4180800136020020014190830436021420014100360210230041206b22002400200141106a2202290204210c200041003602182000200c370310200020033a001f200041106a2000411f6a410110150c140b102241ff01714105470d0f200041ef036a20004190016a290300370000200041f7036a20004198016a2d00003a0000200020063600e303200020013600df03200020033600db03200020093b00d9032000200a3a00d80320002000290388013700e703200041286a200041d8036a10132000290338200041406b2903001018000b102241ff01714105470d0e200041ef036a20004190016a290300370000200041f7036a20004198016a2d00003a0000200020063600e303200020013600df03200020033600db03200020093b00d9032000200a3a00d80320002000290388013700e703200041086a200041d8036a10132000290308200041106a2903001018000b102241ff01714105470d0d200041d8036a200041a0016a102c20002d00d8030d10200041ec036a20004190016a290300370200200041f4036a20004198016a280200360200200020063602e003200020013602dc03200020033602d80320002000290388013702e403230041d0006b22012400200141216a200041d8036a220041186a290000370000200141196a200041106a290000370000200041086a290000210c200141093a0008200141116a200c3700002001200b36022c20012000290000370009200141086a102d200141d0006a24000c0f0b102241ff01714105470d0c200041d8036a200041a0016a102c20002d00d8030d0f200041e4036a20004190016a290300370200200041ec036a20004198016a280200360200200020063602d80320002000290388013702dc032000200c3e02f4032000200b3602f003230041d0006b22022400200241216a200041d8036a220341186a290000370000200241196a200341106a290000370000200241116a200341086a2900003700002002200f3703302002200136022c200241023a000820022003290000370009200241086a102d200241d0006a24002003200041a0016a41e000100c1a20034180800410120c0e0b102241ff01714105470d0b200041d8036a200041a0016a102c20002d00d8030d0e200041ef036a20004190016a290300370000200041f7036a20004198016a2d00003a0000200020063600e303200020013600df03200020033600db03200020093b00d9032000200a3a00d80320002000290388013700e703230041d0006b22012400200141216a200041d8036a220041186a290000370000200141196a200041106a290000370000200141116a200041086a290000370000200141073a000820012000290000370009200141086a102d200141d0006a24000c0d0b102241ff01714105470d0a200041b0026a20004198016a2202280200360200200041a8026a20004190016a220429030037030020002000290388013703a002200041d8036a200041a0016a102c20002d00d8030d0d20004197036a20042903003700002000419f036a20022d00003a00002000200636008b0320002001360087032000200336008303200020093b0081032000200a3a008003200020002903880137008f03200041e7036a200f370000200041da036a200041b3026a2d00003a00002000200c3700df03200020002f00b1023b01d8032000200b3600db03200041f7036a20004180016a2d00003a0000200020002903783700ef03230041d0006b22012400200141216a20004180036a220241186a290000370000200141196a200241106a290000370000200141116a200241086a290000370000200141316a200041d8036a220041086a290000370000200141396a200041106a290000370000200141c1006a200041186a290000370000200141033a00082001200229000037000920012000290000370029200141086a102d200141d0006a24000c0c0b102241ff01714105470d09200041f0036a22014200370300200041e8036a22024200370300200041e0036a22044200370300200042003703d8032000428080013702840320004190830436028003200041e0016a20004180036a2205100f200320062005101e20002802880322032000280284034b0d092000280280032003200041d8036a22031008200041b8026a2001290300370300200041b0026a2002290300370300200041a8026a2004290300370300200020002903d8033703a0022003200041a0026a101a20002d00d80322014102460d0920004198036a2202200041f1036a220329000037030020004190036a2204200041e9036a220629000037030020004188036a2205200041e1036a2207290000370300200020002900d9033703800320002001047f20032002290300370000200620042903003700002007200529030037000020002000290380033700d90341010541000b3a00d803230041206b22022400200241186a4180800136020020024190830436021420024100360210200241086a2105230041206b22012400200241106a220428020421032001200441086a28020022063602142001200336021002400240027f200041d8036a22002d00004504402006450d02200341003a000041010c010b2006450d01200341013a000020014101360218200041016a200141106a100f200128021421062001280210210320012802180b21002004200636020820042003360204200141086a20042000101f20052001290308370300200141206a24000c010b000b41002002280208200228020c101c000b102241ff01714105470d08200041b0026a20004198016a280200360200200041a8026a20004190016a29030037030020002000290388013703a0022000200c3703b8022000200b3602b402200041d8036a200041a0016a102b20002d00d803044020004180036a200041a0016a102c20002d0080030d050b02402006410a470d00200341a08004410a100d0d00200041f1036a200041b8026a290300370000200041e9036a200041b0026a290300370000200041083a00d803200041e1036a200041a8026a290300370000200020002903a0023700d903200041d8036a102d0b200041f0036a22024200370300200041e8036a22044200370300200041e0036a22054200370300200042003703d8032000428080013702840320004190830436028003200041e0016a20004180036a2201100f200320062001101e20002802880322012000280284034b0d082000280280032001200041d8036a2201100820004198036a200229030037030020004190036a200429030037030020004188036a2005290300370300200020002903d80337038003200041a0026a20004180036a10102001200041a0016a41e000100c1a20014180800410120c0a0b102241ff01714105470d07200041d8036a200041a0016a102b20002d00d8030d0a200041b7026a20004190016a290300370000200041bf026a20004198016a2d00003a0000200020063600ab02200020013600a702200020033600a302200020093b00a1022000200a3a00a00220002000290388013700af02200041f0036a22034200370300200041e8036a22044200370300200041e0036a22024200370300200042003703d8032000428080013702840320004190830436028003200041c0016a20004180036a2201100f200041a0026a2001100f20002802880322012000280284034b0d072000280280032001200041d8036a2201100820004198036a200329030037030020004190036a200429030037030020004188036a2002290300370300200020002903d803370380032002418080013602002000419083043602dc03200041003602d80320002001102720004180036a2000280200200028020410032001200041a0016a41e000100c1a20014180800410120c090b102241ff01714105460d030c060b200341c882046a2d000021020c030b200041013b0180030c050b410120002d0081031017000b230041206b22012400200141186a4180800136020020014190830436021420014100360210230041206b22002400200141106a2202290204210c200041003602182000200c3703104100200041106a220310204101200310200c060b410221040b20044102460d00200041d7026a2203200041f7026a290000370000200041d0026a2205200041f0026a290300370300200041c8026a2207200041e8026a290300370300200020002903e0023703c00202402004450440200041033a0080030c010b20004197026a2204200329000037000020004190026a2203200529030037030020004188026a2007290300220d370300200020002903c002220e3703800220004198046a200f370300200041e8036a4200370300200041e0036a4200370300200041f9036a200d37000020004181046a200329030037000020004188046a2004290000370000200041a4046a2006360200200041a0046a220420013602002000200c37039004200042003703d803200020023a00f0032000200e3700f103200041a8046a200029038801370300200041b0046a20004190016a290300370300200041b8046a20004198016a280200360200200041c0046a220141a297ada604360200200041bc046a200b360200200041808080083602c804200041d8046a418080013602002000419083043602d404200041003602d004200041d0006a200041d0046a2202200041f0036a101120002802502103200041c8006a200242004200101d2000280248210620002902d404210d20004100360288032000200d37038003200120004180036a2201102920042001100f200c200f2001102e20002802840322042000280288032201490d0120002802800321022000200420016b3602e4042000200120026a3602e00420034200200620022001200041e0046a102a410d710d0120002802e4042204450d01410321020240024020002802e00422012d00000e020100030b20044101460d022000200441026b22063602ec042000200141026a3602e80402400240024020012d000122020e03000102050b200041e0026a200041e8046a102620002802e002450d042000418a036a200041e8026a280200360000200020002903e0023700820320002000290080033703a002200020004186036a2900003701a6020c010b2006450d032000200441036b3602ec042000200141036a3602e80420012d0002220341014b0d030b200020002901a6023701be03200020002903a0023703b8030b20004188036a20002901be03370100200020002903b80337018203200020033a008103200020023a00800320024103470d020b200041d8036a2201200041a0016a41e000100c1a2001418080041012410020004180036a1019000b000b410120004180036a1019000b410041021017000b410120002d00d9031017000b20022000290310370204200041086a20022000280218101f200141086a2000290308370300200041206a240041002001280208200128020c101c000bae0801097f230041306b22032400200341186a220520012802042202047f2001200241016b36020420012001280200220441016a36020020042d00000520010b3a000120052002453a00000240024020032d00184101710d00024020032d0019220241037122054103470440024002400240200541016b0e020102000b200241fc017141027621020c030b200320023a0025200341013a002420032001360220200341003b012c200341206a2003412c6a410210310d0320032f012c220241ff014d0d03200241027621020c020b200320023a0025200341013a0024200320013602202003410036022c200341206a2003412c6a410410310d02200328022c220241808004490d02200241027621020c010b200241044f0d01200341106a210520012802042202410449047f4101052001200241046b36020420012001280200220241046a3602002002280000210241000b2104200520023602042005200436020020032802100d0120032802142202418080808004490d010b200128020422042002490d00200341086a200241011028200328020c210a2003280208200128020022062002100c21052001200420026b3602042001200220066a360200024002402002450d004100200241076b2201200120024b1b2108200541036a417c7120056b210941002101034002400240024002400240200120056a2d00002206411874411875220741004e0440200920016b4103712009417f46720d020240200120084f0d000340200120056a2204280200200441046a28020072418081828478710d012001200141086a22014b0d0320012008490d000b0b200120024f0d050340200120056a2c00004100480d062002200141016a2201470d000b0c070b02400240200641aa80046a2d000041026b0e03040100090b200141016a220420024f0d08200420056a2c000021040240024002400240200641f0016b0e050100000002000b2007410f6a41ff017141024b200441004e720d0b20044140490d020c0b0b200441f0006a41ff01714130490d010c0a0b2004418f7f4a0d090b200141026a220420024f0d08200420056a2c000041bf7f4a0d08200141036a220120024f0d08200120056a2c000041bf7f4c0d040c080b200141016a220420024f0d07200420056a2c00002104024002400240200641e001470440200641ed01460d012007411f6a41ff0171410c490d022007417e71416e47200441004e720d0b20044140490d030c0b0b200441607141a07f460d020c0a0b200441a07f480d010c090b200441bf7f4a0d080b200141026a220120024f0d07200120056a2c000041bf7f4c0d030c070b000b200141016a21010c020b200141016a220120024f0d04200120056a2c000041bf7f4a0d040b200141016a21010b20012002490d000b0b200020023602082000200a360204200020053602000c020b200041003602000c010b200041003602000b200341306a24000b3701017f230041106b22022400200241086a20014100101f200228020c21012000200228020836020020002001360204200241106a24000b8b0301067f230041106b2206240002402001450440410121020c010b200141004e0440200641086a21082001417f73411f76220420016a41016b410020046b712204200149210541888304280200210302400240027f200245044020050d0241002105200320046a22022003490d0320032002418c83042802004d0d011a200441ffff036a22022004490d032002411076220740002202417f46200241ffff0371200247720d032002411074220320074110746a22022003490d03418c83042002360200200320046a22022003490d0320030c010b20050d0141002105200320046a22022003490d0220032002418c83042802004d0d001a200441ffff036a22022004490d022002411076220740002202417f46200241ffff0371200247720d022002411074220320074110746a22022003490d02418c83042002360200200320046a22022003490d0220030b21054188830420023602000c010b000b2008200136020420082005360200200628020822020d010b000b2000200136020420002002360200200641106a24000b0a0020012000410410150b5e01017f230041106b220624002006200528020436020c41082000200120022003200420052802002006410c6a100121002005200628020c101b410c21052000410b4d0440200041027441d882046a28020021050b200641106a240020050b7101017f230041206b22022400200210212000027f200220011016450440200041003a000141010c010b20002002290300370001200041196a200241186a290300370000200041116a200241106a290300370000200041096a200241086a29030037000041000b3a0000200241206a24000b7201017f230041206b22022400200210210240200141206a2002100e450440200041013b00000c010b20002002290300370001200041003a0000200041196a200241186a290300370000200041116a200241106a290300370000200041096a200241086a2903003700000b200241206a24000b9b0a010a7f23004190016b22012400200141086a200041c800100c1a20014101360250200142808001370274200141908304360270200141d0006a200141f0006a1033024020012802782200418180014f0d002001410036027820014180800120006b220436027420012000419083046a220536027041aa82044110200141f0006a101e2001280278220220012802744b0d0020012802702103200141e8006a22064200370300200141e0006a4200370300200141d8006a22074200370300200142003703500240200241214f044020014188016a2208420037030020014180016a22094200370300200141f8006a220a42003703002001420037037020032002200141f0006a100820062008290300370300200141e0006a20092903003703002007200a290300370300200120012903703703500c010b200141d0006a20032002100c1a0b200141003602782001200436027420012005360270200141d0006a200141f0006a100f2000200020012802786a22004b2000418180014f720d0020014180800120006b36027420012000419083046a220236027002400240024002400240024002400240024002400240024020012d0008220341016b0e0a0102030405060708090a000b200041808001460d0b200241003a000020014101360278200141086a410472200141f0006a10350c0a0b200041808001460d0a200241013a000020014101360278200141086a410472200141f0006a1035200141246a2d00004504402001280278220220012802744f0d0b200128027020026a41003a00002001200241016a3602780c0a0b2001280278220220012802744f0d0a200128027020026a41013a00002001200241016a360278200141256a200141f0006a100f0c090b200041808001460d092000419083046a41023a0000200041ffff004f0d09200241003a000120014102360278200141086a410172200141f0006a2202100f200128022c200210322001290330200210340c080b200041808001460d08200241033a000020014101360278200141086a410172200141f0006a2202100f200141296a2002100f0c070b200041808001460d07200241043a000020014101360278200128020c200141146a280200200141f0006a101e0c060b200041808001460d06200241053a0000024002400240200128021041016b0e020102000b200041ffff004f0d08200241003a000120014102360278200141146a2802002001411c6a280200200141f0006a2202101e200141206a280200200141286a2802002002101e0c070b200041ffff004f0d07200241013a000120014102360278200141146a2802002001411c6a280200200141f0006a2202101e200141206a290300200210340c060b200041ffff004f0d06200241023a000120014102360278200141146a2802002001411c6a280200200141f0006a101e0c050b200041808001460d05200241063a0000200141013602780c040b200041808001460d04200241073a000020014101360278200141086a410172200141f0006a100f0c030b200041808001460d03200241083a000020014101360278200141086a410172200141f0006a100f0c020b200041808001460d02200241093a000020014101360278200141086a410172200141f0006a2202100f200128022c200210320c010b200041808001460d012002410a3a000020014101360278200141086a410172200141f0006a100f0b2001280278220220012802744b0d004190830420002001280270200210022003410546044020012802101a0b20014190016a24000f0b000b2a01017f230041106b2203240020032001370308200320003703002002200341101015200341106a24000b31000240200120024b200220044b720d002002200220016b2202490d00200020023602042000200120036a3602000f0b000b2d01017f2000280208220220002802044904402000200241016a360208200028020020026a20013a00000f0b000b910101027f20002f01042103200041003a0004410121040240024020034101714504402000280200220028020422032002490d022001200028020022012002100c1a0c010b200120034108763a0000200028020022002802042203200241016b2202490d01200141016a200028020022012002100c1a0b2000200320026b3602042000200120026a360200410021040b20040b2601017f230041106b220224002002200036020c20012002410c6a41041015200241106a24000b550020002802002200413f4d04402001200041027410300f0b200041ffff004d04402000410274410172200110200f0b200041ffffffff034d04402000410274410272200110320f0b2001410310302000200110320b2601017f230041106b22022400200220003703082001200241086a41081015200241106a24000b27002000280200200041086a2802002001101e2000410c6a280200200041146a2802002001101e0b0baf02030041a080040b8a0150696e6b4c6f6767657201010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010041ec81040b330202020202020202020202020202020202020202020202020202020202020303030303030303030303030303030304040404040041aa82040b5b7068616c612e70696e6b2e6576656e74436f6e74726163744465706f73697401020304050607080a010b09000000000000000100000002000000030000000400000005000000060000000700000008000000090000000c0000000b"},"contract":{"name":"pink-system","version":"0.1.0","authors":["[your_name] <[your_email]>"]},"V3":{"spec":{"constructors":[{"args":[],"docs":[],"label":"default","payable":false,"selector":"0xed4b9d1b"}],"docs":[],"events":[],"messages":[{"args":[],"docs":[],"label":"System::version","mutates":false,"payable":false,"returnType":{"displayName":[],"type":8},"selector":"0x87c98a8d"},{"args":[{"label":"contract_id","type":{"displayName":["AccountId"],"type":0}}],"docs":[],"label":"System::grant_admin","mutates":true,"payable":false,"returnType":{"displayName":["Result"],"type":10},"selector":"0x67612061"},{"args":[{"label":"name","type":{"displayName":["String"],"type":7}},{"label":"contract_id","type":{"displayName":["AccountId"],"type":0}}],"docs":[],"label":"System::set_driver","mutates":true,"payable":false,"returnType":{"displayName":["Result"],"type":10},"selector":"0xaa1e2030"},{"args":[{"label":"name","type":{"displayName":["String"],"type":7}}],"docs":[],"label":"System::get_driver","mutates":false,"payable":false,"returnType":{"displayName":["Option"],"type":12},"selector":"0x2740cf0a"},{"args":[{"label":"contract_id","type":{"displayName":["AccountId"],"type":0}},{"label":"code_hash","type":{"displayName":["pink","Hash"],"type":1}}],"docs":[],"label":"System::deploy_sidevm_to","mutates":false,"payable":false,"returnType":{"displayName":["Result"],"type":10},"selector":"0x662f4aa4"},{"args":[{"label":"contract_id","type":{"displayName":["AccountId"],"type":0}}],"docs":[],"label":"System::stop_sidevm_at","mutates":false,"payable":false,"returnType":{"displayName":["Result"],"type":10},"selector":"0x52a0fd6a"},{"args":[{"label":"hook","type":{"displayName":["HookPoint"],"type":13}},{"label":"contract","type":{"displayName":["AccountId"],"type":0}},{"label":"selector","type":{"displayName":["u32"],"type":14}},{"label":"gas_limit","type":{"displayName":["u64"],"type":15}}],"docs":[],"label":"System::set_hook","mutates":true,"payable":false,"returnType":{"displayName":["Result"],"type":10},"selector":"0x352c6b5c"},{"args":[{"label":"contract_id","type":{"displayName":["AccountId"],"type":0}},{"label":"weight","type":{"displayName":["u32"],"type":14}}],"docs":[],"label":"System::set_contract_weight","mutates":false,"payable":false,"returnType":{"displayName":["Result"],"type":10},"selector":"0x45ec9b18"},{"args":[{"label":"account","type":{"displayName":["AccountId"],"type":0}}],"docs":[],"label":"System::total_balance_of","mutates":false,"payable":false,"returnType":{"displayName":["Balance"],"type":16},"selector":"0x5a98f226"},{"args":[{"label":"account","type":{"displayName":["AccountId"],"type":0}}],"docs":[],"label":"System::free_balance_of","mutates":false,"payable":false,"returnType":{"displayName":["Balance"],"type":16},"selector":"0x8a0d40d7"},{"args":[{"label":"contract_id","type":{"displayName":["AccountId"],"type":0}}],"docs":[],"label":"System::is_admin","mutates":false,"payable":false,"returnType":{"displayName":["bool"],"type":17},"selector":"0xf06f050a"},{"args":[],"docs":[],"label":"System::upgrade_system_contract","mutates":false,"payable":false,"returnType":{"displayName":["Result"],"type":10},"selector":"0xaf69ca03"},{"args":[{"label":"contract_id","type":{"displayName":["AccountId"],"type":0}},{"label":"deposit","type":{"displayName":["Balance"],"type":16}}],"docs":[],"label":"ContractDeposit::change_deposit","mutates":true,"payable":false,"returnType":{"displayName":["Result"],"type":18},"selector":"0xa24bcb44"}]},"storage":{"struct":{"fields":[{"layout":{"cell":{"key":"0x0000000000000000000000000000000000000000000000000000000000000000","ty":0}},"name":"owner"},{"layout":{"cell":{"key":"0x0100000000000000000000000000000000000000000000000000000000000000","ty":3}},"name":"administrators"},{"layout":{"cell":{"key":"0x0200000000000000000000000000000000000000000000000000000000000000","ty":6}},"name":"drivers"}]}},"types":[{"id":0,"type":{"def":{"composite":{"fields":[{"type":1,"typeName":"[u8; 32]"}]}},"path":["ink_env","types","AccountId"]}},{"id":1,"type":{"def":{"array":{"len":32,"type":2}}}},{"id":2,"type":{"def":{"primitive":"u8"}}},{"id":3,"type":{"def":{"composite":{"fields":[{"name":"offset_key","type":5,"typeName":"Key"}]}},"params":[{"name":"K","type":0},{"name":"V","type":4}],"path":["ink_storage","lazy","mapping","Mapping"]}},{"id":4,"type":{"def":{"tuple":[]}}},{"id":5,"type":{"def":{"composite":{"fields":[{"type":1,"typeName":"[u8; 32]"}]}},"path":["ink_primitives","Key"]}},{"id":6,"type":{"def":{"composite":{"fields":[{"name":"offset_key","type":5,"typeName":"Key"}]}},"params":[{"name":"K","type":7},{"name":"V","type":0}],"path":["ink_storage","lazy","mapping","Mapping"]}},{"id":7,"type":{"def":{"primitive":"str"}}},{"id":8,"type":{"def":{"tuple":[9,9]}}},{"id":9,"type":{"def":{"primitive":"u16"}}},{"id":10,"type":{"def":{"variant":{"variants":[{"fields":[{"type":4}],"index":0,"name":"Ok"},{"fields":[{"type":11}],"index":1,"name":"Err"}]}},"params":[{"name":"T","type":4},{"name":"E","type":11}],"path":["Result"]}},{"id":11,"type":{"def":{"variant":{"variants":[{"index":0,"name":"PermisionDenied"},{"index":1,"name":"DriverNotFound"}]}},"path":["pink_extension","system","Error"]}},{"id":12,"type":{"def":{"variant":{"variants":[{"index":0,"name":"None"},{"fields":[{"type":0}],"index":1,"name":"Some"}]}},"params":[{"name":"T","type":0}],"path":["Option"]}},{"id":13,"type":{"def":{"variant":{"variants":[{"index":0,"name":"OnBlockEnd"}]}},"path":["pink_extension","HookPoint"]}},{"id":14,"type":{"def":{"primitive":"u32"}}},{"id":15,"type":{"def":{"primitive":"u64"}}},{"id":16,"type":{"def":{"primitive":"u128"}}},{"id":17,"type":{"def":{"primitive":"bool"}}},{"id":18,"type":{"def":{"variant":{"variants":[{"fields":[{"type":4}],"index":0,"name":"Ok"},{"fields":[{"type":19}],"index":1,"name":"Err"}]}},"params":[{"name":"T","type":4},{"name":"E","type":19}],"path":["Result"]}},{"id":19,"type":{"def":{"variant":{"variants":[{"fields":[{"type":7,"typeName":"String"}],"index":0,"name":"Other"},{"fields":[{"type":11,"typeName":"Error"}],"index":1,"name":"SystemError"},{"index":2,"name":"BadOrigin"}]}},"path":["pink_extension","system","DriverError"]}}]}} \ No newline at end of file +{"source":{"hash":"0x89b2b554d75f6f7cd839b2792feca6db3b32d48d0d445ede1834f09658ed332a","language":"ink! 3.4.0","compiler":"rustc 1.66.0-nightly","wasm":"0x0061736d01000000016e1160027f7f0060037f7f7f0060037f7f7f017f60017f0060047f7f7f7f0060027f7f017f60000060017f017f60087f7f7e7f7f7f7f7f017f60057f7f7f7f7f017f60027e7e0060047f7f7e7e006000017f60067f7e7f7f7f7f017f60037e7e7f0060057f7f7f7f7f0060027e7f0002bb020d057365616c30157365616c5f636f6e7461696e735f73746f726167650007057365616c31097365616c5f63616c6c0008057365616c30127365616c5f6465706f7369745f6576656e740004057365616c30107365616c5f7365745f73746f726167650001057365616c30107365616c5f6765745f73746f726167650002057365616c30197365616c5f63616c6c5f636861696e5f657874656e73696f6e0009057365616c300a7365616c5f696e7075740000057365616c300b7365616c5f72657475726e0001057365616c30147365616c5f686173685f626c616b65325f3235360001057365616c300b7365616c5f63616c6c65720000057365616c300c7365616c5f616464726573730000057365616c30167365616c5f76616c75655f7472616e73666572726564000003656e76066d656d6f727902010210032b2a0202050000010000040105000a000000010b010001030c060306000001000d0000030e0f0002000010000608017f01418080040b071102066465706c6f7900230463616c6c00250ad26f2a2b01017f037f2002200346047f200005200020036a200120036a2d00003a0000200341016a21030c010b0b0b3f01027f0340200245044041000f0b200241016b210220012d0000210320002d00002104200041016a2100200141016a210120032004460d000b200420036b0bb40101047f230041406a22022400200241386a22034200370300200241306a22044200370300200241286a220542003703002002420037032020024280800137020420024190830436020020002002100f20012002100f2002280208220020022802044b0440000b20022802002000200241206a1008200241186a2003290300370300200241106a2004290300370300200241086a20052903003703002002200229032037030020021000200241406b2400417f470b0a0020012000412010150b4c01017f230041206b22022400200241186a4180800136020020024190830436021420024100360210200241086a200241106a2000101120012002280208200228020c1003200241206a24000b5602017f017e230041206b220324002001290204210420034100360218200320043703102002200341106a100f20012003290310370204200341086a20012003280218101e20002003290308370300200341206a24000b5e01017f230041306b22022400200241286a200141186a290000370300200241206a200141106a290000370300200241186a200141086a29000037030020024201370308200220012900003703102000200241106a1010200241306a24000bbc0102027f037e230041206b22022400200241106a4180800136020020024190830436020c200241003602082002200241086a2001101120022802042101200228020021032002200229020c370318411020032001200241186a1014200228021c220141104f200141707141104771450440000b2002280218220141186a2900002104200141086a290000210520012900002106200020012900103703102000200537030820002006370300200041186a2004370300200241206a24000b3a01017f230041106b220424002004200328020436020c20002001200220032802002004410c6a10051a2003200428020c101b200441106a24000b5e01037f230041106b2203240002402000280208220420026a220520044f0440200341086a2004200520002802002000280204102f200328020c2002470d01200328020820012002100c1a20002005360208200341106a24000f0b000b000b0b00200020014120100d450bd20201077f230041206b22052400200541186a4180800136020020054190830436021420054100360210200541086a2107230041206b22022400200541106a220628020421032002200641086a28020022043602142002200336021002400240027f20012d0000220841034604402004450d02200341003a000041010c010b2004450d01200341013a0000024002400240200841016b0e020102000b200441014d0d03200341003a000120024102360218200141046a2802002001410c6a280200200241106a1020200228021421042002280210210320022802180c020b200441014d0d02200341013a000120044102460d02200320012d00013a000241030c010b200441014d0d01200341023a000141020b21012006200436020820062003360204200241086a20062001101e20072002290308370300200241206a24000c010b000b20002005280208200528020c101c000b4801017f230041206b22022400200241186a4180800136020020024190830436021420024100360210200241086a200241106a20002001101d41002002280208200228020c101c000bd50101067f230041206b22022400200241186a4180800136020020024190830436021420024100360210200241086a2107230041106b22032400200241106a220541086a28020021062005280204210402400240027f200141ff017141024604402006450d02200441003a000041010c010b2006450d01200441013a000020064101460d01200420013a000141020b210120052004360204200341086a20052001101e200328020c21012007200328020836020020072001360204200341106a24000c010b000b20002002280208200228020c101c000bd40101027f230041106b2202240020024180800136020420024190830436020020024180800136020c2001419083042002410c6a100421012002200228020c101b02400240024002402001410c4f0d00200141027441cc82046a2802000e0401000002000b000b200228020441204f0440200041013a0000200020022802002201290000370001200041096a200141086a290000370000200041116a200141106a290000370000200041196a200141186a2900003700000c020b200041003a0001410221030b200020033a00000b200241106a24000b3301017f230041106b22022400200241086a4100200120002802002000280204102f20002002290308370200200241106a24000b0b002000200120021007000b5802017f017e230041206b2204240020012902042105200441003602182004200537031020022003200441106a102e20012004290310370204200441086a20012004280218101e20002004290308370300200441206a24000b3c01017f2002200141086a28020022034b0440000b2001200320026b36020820012001280204220120026a36020420002002360204200020013602000b2601017f230041106b22022400200220003b010e20012002410e6a41021015200241106a24000b2c01017f230041106b220324002003200136020c2003410c6a200210332002200020011015200341106a24000b6001017f230041106b2201240020004200370000200041186a4200370000200041106a4200370000200041086a420037000020014120360204200120003602002001412036020c20002001410c6a10092001200128020c101b200141106a24000b6c02027f027e230041206b22002400200041086a220142003703002000420037030020004110360214200020003602102000411036021c20002000411c6a100b200041106a200028021c101b2001290300210220002903002103200041206a2400410541042002200384501b0ba10201057f230041c0016b220024000240102241ff01714105470d00200041808001360264200041908304360260200041e0006a102420002802644104490d00200028026028000041ed97f5dc01470d00102241ff01714105470d00200041f8006a22014200370300200041f0006a22024200370300200041e8006a2203420037030020004188016a420037030020004190016a420037030020004198016a4200370300200041a8016a4200370300200041b0016a4200370300200041b8016a4200370300200042003703602000420137038001200042023703a001200041e0006a220410212000200441e000100c2100200142003703002002420037030020034200370300200042003703602000200041e0006a1012200041c0016a24000f0b000b3301017f230041106b220124002001200028020436020c20002802002001410c6a10062000200128020c101b200141106a24000bd73e020c7f067e230041f0046b2200240002400240024002400240102241ff01714105470d002000418080013602e4022000419083043602e002200041e0026a1024200020002802e40222053602bc03200020002802e00222013602b80320054104490d00200128000021082000200541046b22033602bc032000200141046a22063602b803200841187621072008411076210420084108762102027f024002400240024002400240024002400240024002400240200841ff0171220841e6006b0e020401000b0240024020084187016b0e04010e0e0a000b20084127460d0320084135460d06200841c500460d07200841d200460d05200841da00460d08200841a201460d0b200841aa01460d02200841af01460d0a200841f00147200241ff017141ef004772200441ff01714105472007410a4772722003412049720d0d200041a8016a2001411b6a290000370300200041b0016a200141236a2d00003a00002000200541246b3602bc032000200141246a3602b803200020012900133703a001200128000b22024108762104200128000f21062001280007210320012f0005210920012d0004210a410a0c0c0b200241ff017141c90147200441ff0171418a0147722007418d0147720d0c41000c0b0b200241ff017141e10047200441ff017141204772200741e10047200341204972720d0b200041a8016a2001411b6a290000370300200041b0016a200141236a2d00003a0000200020012900133703a001200128000b22024108762104200128000f21062001280007210320012f0005210920012d0004210a41010c0a0b200241ff0171411e47200441ff0171412047722007413047720d0a200041d8036a200041b8036a102620002802d8032203450d0a20002802bc034120490d0a20002802e003210620002802dc03210220002802b8032201290018210c2001280014210b200041a8016a200141086a290000370300200041b0016a200141106a280000360200200020012900003703a0012002410876210441020c090b200241ff017141c00047200441ff017141cf0147722007410a47720d09200041d8036a200041b8036a102620002802d8032203450d0920002f00dd0320002d00df0341107472210420002802e003210620002d00dc03210241030c080b200241ff0171412f47200441ff017141ca004772200741a4014720034120497272200541246b412049720d08200128000f2106200128000b21022001280007210320012f0005210920012d0004210a200041eb036a200141266a2d00003a000020004188036a200141c3006a2d00003a0000200041e0036a2001411b6a290000220d370300200041e8036a2204200141236a2d00003a00002000200141c4006a3602b803200020012f00243b00e9032000200129003b3703800320002001290013220e3703d803200141336a290000210f200129002b210c2001280027210b200041a8016a200d370300200041b0016a20042802003602002000200e3703a0012002410876210441040c070b200241ff017141a00147200441ff017141fd014772200741ea0047200341204972720d07200041a8016a2001411b6a290000370300200041b0016a200141236a2d00003a00002000200141246a3602b803200020012900133703a001200128000b22024108762104200128000f21062001280007210320012f0005210920012d0004210a41050c060b200241ff0171412c47200441ff017141eb004772200345200741dc004772720d062000200541056b22023602bc0320062d0000200241204972200541256b410c49720d06200041a8016a200141116a290000370300200041b0016a200141196a280000360200200128000521062000200541316b3602bc032000200141316a3602b803200020012900093703a0012001280025220241087621042001350021210c2001290029210f200128001d210b41060c050b200241ff017141ec0147200441ff0171419b0147722007411847200341204972722005417c71412446720d05200128000c21062001280008210220012800042103200041a8016a200141186a290000370300200041b0016a200141206a2800003602002000200541286b3602bc032000200141286a3602b803200020012900103703a001200241087621042001280024210b41070c040b200241ff017141980147200441ff017141f20147722007412647200341204972720d04200041a8016a2001411b6a290000370300200041b0016a200141236a2d00003a00002000200541246b3602bc032000200141246a3602b803200020012900133703a001200128000b22024108762104200128000f21062001280007210320012f0005210920012d0004210a41080c030b200241ff0171410d47200441ff017141c0004772200741d70147200341204972720d03200041a8016a2001411b6a290000370300200041b0016a200141236a2d00003a00002000200541246b3602bc032000200141246a3602b803200020012900133703a001200128000b22024108762104200128000f21062001280007210320012f0005210920012d0004210a41090c020b200241ff017141e90047200441ff017141ca0147722007410347720d02410b0c010b200241ff017141cb0047200441ff017141cb014772200741c4004720034120497272200541246b411049720d012001280020210b2001280008210620012800042102200041a8016a200141146a290000370300200041b0016a2001411c6a2800003602002000200541346b3602bc032000200141346a3602b8032000200129000c3703a001200241087621042001412c6a290000210f2001290024210c410c0b210720004198016a200041b0016a220128020036020020004190016a200041a8016a220529030037030020004180016a20004188036a22082903003c0000200020002903a00137038801200020002903800337037820014200370300200041b8016a4200370300200041c0016a4200370300200042003703a801200042013703a001200041d8036a2005101a20002d00d80322014102460d0020004198036a200041f1036a29000037030020004190036a200041e9036a2900003703002008200041e1036a290000370300200020002900d903370380032001450d00200241ff01712004410874722101200041f0036a20004198036a290300370300200041e8036a20004190036a290300370300200041e0036a20004188036a29030037030020002000290380033703d803200020002903a801220d20002903a0017c22103703a801200020002903b001220e200d201056ad7c220d3703b001200020002903b8012211200d200e54ad7c220e3703b801200020002903c001200e201154ad7c22113703c00120004188046a200541106a220229000037030020004180046a200541086a220429000037030020004190046a200541186a2208290000370300200020052900003703f803200042013703a0012000201042017c22103703a8012000200d201050ad7c22103703b0012000200e200d201056ad7c220d3703b80120002011200d200e54ad7c3703c001200041a8046a2002290000370300200041a0046a2004290000370300200041b0046a20082900003703002000200529000037039804200041a0016a200041d8036a41e000100c1a0240024002400240024002400240024002400240024002400240024002400240024002400240200741016b0e0c0b0a090807060504030201000c0b102241ff01714105470d1220004180036a22031021200041f0036a4200370300200041e8036a4200370300200041e0036a22044200370300200042003703d803200041203602a4022000200041d8036a22023602a002200041203602b8032002200041b8036a100a200041a0026a20002802b803101b200320021016450d0d2004418080013602002000419083043602dc03200041003602d803200041f0006a200041d8036a10272000280274210220002802702103200020002902dc0337038003410f2003200220004180036a1014200028028403411f4d0d12200041a8026a2204200028028003220241086a290000370300200041b0026a2205200241106a290000370300200041b8026a2207200241186a290000370300200020022900003703a002200041e8006a410f41001028200028026c21022000280268220341ba8204290000370000200341076a41c1820429000037000020004188046a200729030037030020004180046a2005290300370300200041f8036a2004290300370300200041e0036a4200370300200041e8036a22044200370300200020002903a0023703f003200042003703d80320004180036a2205200041d8036a22074138100c1a200720054138100c1a20004198046a428f808080f084d0e70a37030020004194046a20023602002000200336029004200041808080083602a004200041d8046a418080013602002000419083043602d404200041003602d00420002903d803210d200041e0006a200041d0046a2202200041f0036a10112000280260200041d8006a200220002903e0032004290300101d2000280258210220002902d404210e200041003602c0032000200e3703b8032000419c046a200041b8036a220410292003410f2004102020002802bc03220720002802c0032203490d1220002802b80321042000200720036b3602ec042000200320046a3602e804200d200220042003200041e8046a102a2203410d710d0c024020002802ec042205450d000240024020002802e80422032d000022040e020100020b200541016b4120490d01200041c0036a2003410a6a290000370300200041c8036a200341126a290000370300200041cf036a200341196a290000370000200020032900023703b80320032d000121020b200041f7026a200041cf036a290000370000200041f0026a200041c8036a290300370300200041e8026a200041c0036a290300370300200020002903b8033703e0020c120b410021020c100b102241ff01714105470d11200041d8036a200041a0016a102b20002d00d8030d1420004197036a2201200041f1036a29000037000020004190036a2202200041ea036a29010037030020004188036a200041e2036a290100220c370300200020002901da03220f3703800320002d00d9032103200041e1036a200c370000200041e9036a2002290300370000200041f0036a2001290000370000200020033a00d8032000200f3700d903230041d0006b22012400200141216a200041d8036a220041186a290000370000200141196a200041106a290000370000200141116a200041086a2900003700002001410a3a000820012000290000370009200141086a102d200141d0006a24000c130b102241ff01714105470d10200041ef036a20004190016a290300370000200041f7036a20004198016a2d00003a0000200020063600e303200020013600df03200020033600db03200020093b00d9032000200a3a00d80320002000290388013700e703200041c0016a200041d8036a100e2103230041206b22012400200141186a4180800136020020014190830436021420014100360210230041206b22002400200141106a2202290204210c200041003602182000200c370310200020033a001f200041106a2000411f6a410110150c140b102241ff01714105470d0f200041ef036a20004190016a290300370000200041f7036a20004198016a2d00003a0000200020063600e303200020013600df03200020033600db03200020093b00d9032000200a3a00d80320002000290388013700e703200041286a200041d8036a10132000290338200041406b2903001018000b102241ff01714105470d0e200041ef036a20004190016a290300370000200041f7036a20004198016a2d00003a0000200020063600e303200020013600df03200020033600db03200020093b00d9032000200a3a00d80320002000290388013700e703200041086a200041d8036a10132000290308200041106a2903001018000b102241ff01714105470d0d200041d8036a200041a0016a102c20002d00d8030d10200041ec036a20004190016a290300370200200041f4036a20004198016a280200360200200020063602e003200020013602dc03200020033602d80320002000290388013702e403230041d0006b22012400200141216a200041d8036a220041186a290000370000200141196a200041106a290000370000200041086a290000210c200141093a0008200141116a200c3700002001200b36022c20012000290000370009200141086a102d200141d0006a24000c0f0b102241ff01714105470d0c200041d8036a200041a0016a102c20002d00d8030d0f200041e4036a20004190016a290300370200200041ec036a20004198016a280200360200200020063602d80320002000290388013702dc032000200c3e02f4032000200b3602f003230041d0006b22022400200241216a200041d8036a220341186a290000370000200241196a200341106a290000370000200241116a200341086a2900003700002002200f3703302002200136022c200241023a000820022003290000370009200241086a102d200241d0006a24002003200041a0016a41e000100c1a20034180800410120c0e0b102241ff01714105470d0b200041d8036a200041a0016a102c20002d00d8030d0e200041ef036a20004190016a290300370000200041f7036a20004198016a2d00003a0000200020063600e303200020013600df03200020033600db03200020093b00d9032000200a3a00d80320002000290388013700e703230041d0006b22012400200141216a200041d8036a220041186a290000370000200141196a200041106a290000370000200141116a200041086a290000370000200141073a000820012000290000370009200141086a102d200141d0006a24000c0d0b102241ff01714105470d0a200041b0026a20004198016a2202280200360200200041a8026a20004190016a220429030037030020002000290388013703a002200041d8036a200041a0016a102c20002d00d8030d0d20004197036a20042903003700002000419f036a20022d00003a00002000200636008b0320002001360087032000200336008303200020093b0081032000200a3a008003200020002903880137008f03200041e7036a200f370000200041da036a200041b3026a2d00003a00002000200c3700df03200020002f00b1023b01d8032000200b3600db03200041f7036a20004180016a2d00003a0000200020002903783700ef03230041d0006b22012400200141216a20004180036a220241186a290000370000200141196a200241106a290000370000200141116a200241086a290000370000200141316a200041d8036a220041086a290000370000200141396a200041106a290000370000200141c1006a200041186a290000370000200141033a00082001200229000037000920012000290000370029200141086a102d200141d0006a24000c0c0b102241ff01714105470d09200041f0036a22014200370300200041e8036a22024200370300200041e0036a22044200370300200042003703d8032000428080013702840320004190830436028003200041e0016a20004180036a2205100f200320062005102020002802880322032000280284034b0d092000280280032003200041d8036a22031008200041b8026a2001290300370300200041b0026a2002290300370300200041a8026a2004290300370300200020002903d8033703a0022003200041a0026a101a20002d00d80322014102460d0920004198036a2202200041f1036a220329000037030020004190036a2204200041e9036a220629000037030020004188036a2205200041e1036a2207290000370300200020002900d9033703800320002001047f20032002290300370000200620042903003700002007200529030037000020002000290380033700d90341010541000b3a00d803230041206b22022400200241186a4180800136020020024190830436021420024100360210200241086a2105230041206b22012400200241106a220428020421032001200441086a28020022063602142001200336021002400240027f200041d8036a22002d00004504402006450d02200341003a000041010c010b2006450d01200341013a000020014101360218200041016a200141106a100f200128021421062001280210210320012802180b21002004200636020820042003360204200141086a20042000101e20052001290308370300200141206a24000c010b000b41002002280208200228020c101c000b102241ff01714105470d08200041b0026a20004198016a280200360200200041a8026a20004190016a29030037030020002000290388013703a0022000200c3703b8022000200b3602b402200041d8036a200041a0016a102b20002d00d803044020004180036a200041a0016a102c20002d0080030d050b02402006410a470d00200341a08004410a100d0d00200041f1036a200041b8026a290300370000200041e9036a200041b0026a290300370000200041083a00d803200041e1036a200041a8026a290300370000200020002903a0023700d903200041d8036a102d0b200041f0036a22024200370300200041e8036a22044200370300200041e0036a22054200370300200042003703d8032000428080013702840320004190830436028003200041e0016a20004180036a2201100f200320062001102020002802880322012000280284034b0d082000280280032001200041d8036a2201100820004198036a200229030037030020004190036a200429030037030020004188036a2005290300370300200020002903d80337038003200041a0026a20004180036a10102001200041a0016a41e000100c1a20014180800410120c0a0b102241ff01714105470d07200041d8036a200041a0016a102b20002d00d8030d0a200041b7026a20004190016a290300370000200041bf026a20004198016a2d00003a0000200020063600ab02200020013600a702200020033600a302200020093b00a1022000200a3a00a00220002000290388013700af02200041f0036a22034200370300200041e8036a22044200370300200041e0036a22024200370300200042003703d8032000428080013702840320004190830436028003200041c0016a20004180036a2201100f200041a0026a2001100f20002802880322012000280284034b0d072000280280032001200041d8036a2201100820004198036a200329030037030020004190036a200429030037030020004188036a2002290300370300200020002903d803370380032002418080013602002000419083043602dc03200041003602d80320002001102720004180036a2000280200200028020410032001200041a0016a41e000100c1a20014180800410120c090b102241ff01714105460d030c060b200341fb82046a2d000021020c030b200041013b0180030c050b410120002d0081031019000b230041206b22012400200141186a4180800136020020014190830436021420014100360210230041206b22002400200141106a2202290204210c200041003602182000200c3703104100200041106a2203101f41012003101f0c060b410221040b20044102460d00200041d7026a2203200041f7026a290000370000200041d0026a2205200041f0026a290300370300200041c8026a2207200041e8026a290300370300200020002903e0023703c00202402004450440200041033a0080030c010b20004197026a2204200329000037000020004190026a2203200529030037030020004188026a2007290300220d370300200020002903c002220e3703800220004198046a200f370300200041e8036a4200370300200041e0036a4200370300200041f9036a200d37000020004181046a200329030037000020004188046a2004290000370000200041a4046a2006360200200041a0046a220420013602002000200c37039004200042003703d803200020023a00f0032000200e3700f103200041a8046a200029038801370300200041b0046a20004190016a290300370300200041b8046a20004198016a280200360200200041c0046a220141a297ada604360200200041bc046a200b360200200041808080083602c804200041d8046a418080013602002000419083043602d404200041003602d004200041d0006a200041d0046a2202200041f0036a101120002802502103200041c8006a200242004200101d2000280248210620002902d404210d20004100360288032000200d37038003200120004180036a2201102920042001100f200c200f2001102e20002802840322042000280288032201490d0120002802800321022000200420016b3602e4042000200120026a3602e00420034200200620022001200041e0046a102a410d710d0120002802e4042204450d01410321020240024020002802e00422012d00000e020100030b20044101460d022000200441026b22063602ec042000200141026a3602e80402400240024020012d000122020e03000102050b200041e0026a200041e8046a102620002802e002450d042000418a036a200041e8026a280200360000200020002903e0023700820320002000290080033703a002200020004186036a2900003701a6020c010b2006450d032000200441036b3602ec042000200141036a3602e80420012d0002220341014b0d030b200020002901a6023701be03200020002903a0023703b8030b20004188036a20002901be03370100200020002903b80337018203200020033a008103200020023a00800320024103470d020b200041d8036a2201200041a0016a41e000100c1a2001418080041012410020004180036a1017000b000b410120004180036a1017000b410041021019000b410120002d00d9031019000b20022000290310370204200041086a20022000280218101e200141086a2000290308370300200041206a240041002001280208200128020c101c000bae0801097f230041306b22032400200341186a220520012802042202047f2001200241016b36020420012001280200220441016a36020020042d00000520010b3a000120052002453a00000240024020032d00184101710d00024020032d0019220241037122054103470440024002400240200541016b0e020102000b200241fc017141027621020c030b200320023a0025200341013a002420032001360220200341003b012c200341206a2003412c6a410210310d0320032f012c220241ff014d0d03200241027621020c020b200320023a0025200341013a0024200320013602202003410036022c200341206a2003412c6a410410310d02200328022c220241808004490d02200241027621020c010b200241044f0d01200341106a210520012802042202410449047f4101052001200241046b36020420012001280200220241046a3602002002280000210241000b2104200520023602042005200436020020032802100d0120032802142202418080808004490d010b200128020422042002490d00200341086a200241011028200328020c210a2003280208200128020022062002100c21052001200420026b3602042001200220066a360200024002402002450d004100200241076b2201200120024b1b2108200541036a417c7120056b210941002101034002400240024002400240200120056a2d00002206411874411875220741004e0440200920016b4103712009417f46720d020240200120084f0d000340200120056a2204280200200441046a28020072418081828478710d012001200141086a22014b0d0320012008490d000b0b200120024f0d050340200120056a2c00004100480d062002200141016a2201470d000b0c070b02400240200641aa80046a2d000041026b0e03040100090b200141016a220420024f0d08200420056a2c000021040240024002400240200641f0016b0e050100000002000b2007410f6a41ff017141024b200441004e720d0b20044140490d020c0b0b200441f0006a41ff01714130490d010c0a0b2004418f7f4a0d090b200141026a220420024f0d08200420056a2c000041bf7f4a0d08200141036a220120024f0d08200120056a2c000041bf7f4c0d040c080b200141016a220420024f0d07200420056a2c00002104024002400240200641e001470440200641ed01460d012007411f6a41ff0171410c490d022007417e71416e47200441004e720d0b20044140490d030c0b0b200441607141a07f460d020c0a0b200441a07f480d010c090b200441bf7f4a0d080b200141026a220120024f0d07200120056a2c000041bf7f4c0d030c070b000b200141016a21010c020b200141016a220120024f0d04200120056a2c000041bf7f4a0d040b200141016a21010b20012002490d000b0b200020023602082000200a360204200020053602000c020b200041003602000c010b200041003602000b200341306a24000b3701017f230041106b22022400200241086a20014100101e200228020c21012000200228020836020020002001360204200241106a24000b8b0301067f230041106b2206240002402001450440410121020c010b200141004e0440200641086a21082001417f73411f76220420016a41016b410020046b712204200149210541888304280200210302400240027f200245044020050d0241002105200320046a22022003490d0320032002418c83042802004d0d011a200441ffff036a22022004490d032002411076220740002202417f46200241ffff0371200247720d032002411074220320074110746a22022003490d03418c83042002360200200320046a22022003490d0320030c010b20050d0141002105200320046a22022003490d0220032002418c83042802004d0d001a200441ffff036a22022004490d022002411076220740002202417f46200241ffff0371200247720d022002411074220320074110746a22022003490d02418c83042002360200200320046a22022003490d0220030b21054188830420023602000c010b000b2008200136020420082005360200200628020822020d010b000b2000200136020420002002360200200641106a24000b0a0020012000410410150b5e01017f230041106b220624002006200528020436020c41082000200120022003200420052802002006410c6a100121002005200628020c101b410c21052000410b4d0440200041027441cc82046a28020021050b200641106a240020050b7101017f230041206b22022400200210212000027f200220011016450440200041003a000141010c010b20002002290300370001200041196a200241186a290300370000200041116a200241106a290300370000200041096a200241086a29030037000041000b3a0000200241206a24000b7201017f230041206b22022400200210210240200141206a2002100e450440200041013b00000c010b20002002290300370001200041003a0000200041196a200241186a290300370000200041116a200241106a290300370000200041096a200241086a2903003700000b200241206a24000b9b0a010a7f23004190016b22012400200141086a200041c800100c1a20014101360250200142808001370274200141908304360270200141d0006a200141f0006a1033024020012802782200418180014f0d002001410036027820014180800120006b220436027420012000419083046a220536027041aa82044110200141f0006a10202001280278220220012802744b0d0020012802702103200141e8006a22064200370300200141e0006a4200370300200141d8006a22074200370300200142003703500240200241214f044020014188016a2208420037030020014180016a22094200370300200141f8006a220a42003703002001420037037020032002200141f0006a100820062008290300370300200141e0006a20092903003703002007200a290300370300200120012903703703500c010b200141d0006a20032002100c1a0b200141003602782001200436027420012005360270200141d0006a200141f0006a100f2000200020012802786a22004b2000418180014f720d0020014180800120006b36027420012000419083046a220236027002400240024002400240024002400240024002400240024020012d0008220341016b0e0a0102030405060708090a000b200041808001460d0b200241003a000020014101360278200141086a410472200141f0006a10350c0a0b200041808001460d0a200241013a000020014101360278200141086a410472200141f0006a1035200141246a2d00004504402001280278220220012802744f0d0b200128027020026a41003a00002001200241016a3602780c0a0b2001280278220220012802744f0d0a200128027020026a41013a00002001200241016a360278200141256a200141f0006a100f0c090b200041808001460d092000419083046a41023a0000200041ffff004f0d09200241003a000120014102360278200141086a410172200141f0006a2202100f200128022c200210322001290330200210340c080b200041808001460d08200241033a000020014101360278200141086a410172200141f0006a2202100f200141296a2002100f0c070b200041808001460d07200241043a000020014101360278200128020c200141146a280200200141f0006a10200c060b200041808001460d06200241053a0000024002400240200128021041016b0e020102000b200041ffff004f0d08200241003a000120014102360278200141146a2802002001411c6a280200200141f0006a22021020200141206a280200200141286a280200200210200c070b200041ffff004f0d07200241013a000120014102360278200141146a2802002001411c6a280200200141f0006a22021020200141206a290300200210340c060b200041ffff004f0d06200241023a000120014102360278200141146a2802002001411c6a280200200141f0006a10200c050b200041808001460d05200241063a0000200141013602780c040b200041808001460d04200241073a000020014101360278200141086a410172200141f0006a100f0c030b200041808001460d03200241083a000020014101360278200141086a410172200141f0006a100f0c020b200041808001460d02200241093a000020014101360278200141086a410172200141f0006a2202100f200128022c200210320c010b200041808001460d012002410a3a000020014101360278200141086a410172200141f0006a100f0b2001280278220220012802744b0d004190830420002001280270200210022003410546044020012802101a0b20014190016a24000f0b000b2a01017f230041106b2203240020032001370308200320003703002002200341101015200341106a24000b31000240200120024b200220044b720d002002200220016b2202490d00200020023602042000200120036a3602000f0b000b2d01017f2000280208220220002802044904402000200241016a360208200028020020026a20013a00000f0b000b910101027f20002f01042103200041003a0004410121040240024020034101714504402000280200220028020422032002490d022001200028020022012002100c1a0c010b200120034108763a0000200028020022002802042203200241016b2202490d01200141016a200028020022012002100c1a0b2000200320026b3602042000200120026a360200410021040b20040b2601017f230041106b220224002002200036020c20012002410c6a41041015200241106a24000b550020002802002200413f4d04402001200041027410300f0b200041ffff004d044020004102744101722001101f0f0b200041ffffffff034d04402000410274410272200110320f0b2001410310302000200110320b2601017f230041106b22022400200220003703082001200241086a41081015200241106a24000b27002000280200200041086a280200200110202000410c6a280200200041146a280200200110200b0bb202030041a080040b8a0150696e6b4c6f6767657201010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010041ec81040b330202020202020202020202020202020202020202020202020202020202020303030303030303030303030303030304040404040041aa82040b5e7068616c612e70696e6b2e6576656e74436f6e74726163744465706f736974000000000000000100000002000000030000000400000005000000060000000700000008000000090000000c0000000b00000001020304050607080a010b09"},"contract":{"name":"pink-system","version":"0.1.0","authors":["[your_name] <[your_email]>"]},"V3":{"spec":{"constructors":[{"args":[],"docs":[],"label":"default","payable":false,"selector":"0xed4b9d1b"}],"docs":[],"events":[],"messages":[{"args":[],"docs":[],"label":"System::version","mutates":false,"payable":false,"returnType":{"displayName":[],"type":8},"selector":"0x87c98a8d"},{"args":[{"label":"contract_id","type":{"displayName":["AccountId"],"type":0}}],"docs":[],"label":"System::grant_admin","mutates":true,"payable":false,"returnType":{"displayName":["Result"],"type":10},"selector":"0x67612061"},{"args":[{"label":"name","type":{"displayName":["String"],"type":7}},{"label":"contract_id","type":{"displayName":["AccountId"],"type":0}}],"docs":[],"label":"System::set_driver","mutates":true,"payable":false,"returnType":{"displayName":["Result"],"type":10},"selector":"0xaa1e2030"},{"args":[{"label":"name","type":{"displayName":["String"],"type":7}}],"docs":[],"label":"System::get_driver","mutates":false,"payable":false,"returnType":{"displayName":["Option"],"type":12},"selector":"0x2740cf0a"},{"args":[{"label":"contract_id","type":{"displayName":["AccountId"],"type":0}},{"label":"code_hash","type":{"displayName":["pink","Hash"],"type":1}}],"docs":[],"label":"System::deploy_sidevm_to","mutates":false,"payable":false,"returnType":{"displayName":["Result"],"type":10},"selector":"0x662f4aa4"},{"args":[{"label":"contract_id","type":{"displayName":["AccountId"],"type":0}}],"docs":[],"label":"System::stop_sidevm_at","mutates":false,"payable":false,"returnType":{"displayName":["Result"],"type":10},"selector":"0x52a0fd6a"},{"args":[{"label":"hook","type":{"displayName":["HookPoint"],"type":13}},{"label":"contract","type":{"displayName":["AccountId"],"type":0}},{"label":"selector","type":{"displayName":["u32"],"type":14}},{"label":"gas_limit","type":{"displayName":["u64"],"type":15}}],"docs":[],"label":"System::set_hook","mutates":true,"payable":false,"returnType":{"displayName":["Result"],"type":10},"selector":"0x352c6b5c"},{"args":[{"label":"contract_id","type":{"displayName":["AccountId"],"type":0}},{"label":"weight","type":{"displayName":["u32"],"type":14}}],"docs":[],"label":"System::set_contract_weight","mutates":false,"payable":false,"returnType":{"displayName":["Result"],"type":10},"selector":"0x45ec9b18"},{"args":[{"label":"account","type":{"displayName":["AccountId"],"type":0}}],"docs":[],"label":"System::total_balance_of","mutates":false,"payable":false,"returnType":{"displayName":["Balance"],"type":16},"selector":"0x5a98f226"},{"args":[{"label":"account","type":{"displayName":["AccountId"],"type":0}}],"docs":[],"label":"System::free_balance_of","mutates":false,"payable":false,"returnType":{"displayName":["Balance"],"type":16},"selector":"0x8a0d40d7"},{"args":[{"label":"contract_id","type":{"displayName":["AccountId"],"type":0}}],"docs":[],"label":"System::is_admin","mutates":false,"payable":false,"returnType":{"displayName":["bool"],"type":17},"selector":"0xf06f050a"},{"args":[],"docs":[],"label":"System::upgrade_system_contract","mutates":false,"payable":false,"returnType":{"displayName":["Result"],"type":10},"selector":"0xaf69ca03"},{"args":[{"label":"contract_id","type":{"displayName":["AccountId"],"type":0}},{"label":"deposit","type":{"displayName":["Balance"],"type":16}}],"docs":[],"label":"ContractDeposit::change_deposit","mutates":true,"payable":false,"returnType":{"displayName":["Result"],"type":18},"selector":"0xa24bcb44"}]},"storage":{"struct":{"fields":[{"layout":{"cell":{"key":"0x0000000000000000000000000000000000000000000000000000000000000000","ty":0}},"name":"owner"},{"layout":{"cell":{"key":"0x0100000000000000000000000000000000000000000000000000000000000000","ty":3}},"name":"administrators"},{"layout":{"cell":{"key":"0x0200000000000000000000000000000000000000000000000000000000000000","ty":6}},"name":"drivers"}]}},"types":[{"id":0,"type":{"def":{"composite":{"fields":[{"type":1,"typeName":"[u8; 32]"}]}},"path":["ink_env","types","AccountId"]}},{"id":1,"type":{"def":{"array":{"len":32,"type":2}}}},{"id":2,"type":{"def":{"primitive":"u8"}}},{"id":3,"type":{"def":{"composite":{"fields":[{"name":"offset_key","type":5,"typeName":"Key"}]}},"params":[{"name":"K","type":0},{"name":"V","type":4}],"path":["ink_storage","lazy","mapping","Mapping"]}},{"id":4,"type":{"def":{"tuple":[]}}},{"id":5,"type":{"def":{"composite":{"fields":[{"type":1,"typeName":"[u8; 32]"}]}},"path":["ink_primitives","Key"]}},{"id":6,"type":{"def":{"composite":{"fields":[{"name":"offset_key","type":5,"typeName":"Key"}]}},"params":[{"name":"K","type":7},{"name":"V","type":0}],"path":["ink_storage","lazy","mapping","Mapping"]}},{"id":7,"type":{"def":{"primitive":"str"}}},{"id":8,"type":{"def":{"tuple":[9,9]}}},{"id":9,"type":{"def":{"primitive":"u16"}}},{"id":10,"type":{"def":{"variant":{"variants":[{"fields":[{"type":4}],"index":0,"name":"Ok"},{"fields":[{"type":11}],"index":1,"name":"Err"}]}},"params":[{"name":"T","type":4},{"name":"E","type":11}],"path":["Result"]}},{"id":11,"type":{"def":{"variant":{"variants":[{"index":0,"name":"PermisionDenied"},{"index":1,"name":"DriverNotFound"}]}},"path":["pink_extension","system","Error"]}},{"id":12,"type":{"def":{"variant":{"variants":[{"index":0,"name":"None"},{"fields":[{"type":0}],"index":1,"name":"Some"}]}},"params":[{"name":"T","type":0}],"path":["Option"]}},{"id":13,"type":{"def":{"variant":{"variants":[{"index":0,"name":"OnBlockEnd"}]}},"path":["pink_extension","HookPoint"]}},{"id":14,"type":{"def":{"primitive":"u32"}}},{"id":15,"type":{"def":{"primitive":"u64"}}},{"id":16,"type":{"def":{"primitive":"u128"}}},{"id":17,"type":{"def":{"primitive":"bool"}}},{"id":18,"type":{"def":{"variant":{"variants":[{"fields":[{"type":4}],"index":0,"name":"Ok"},{"fields":[{"type":19}],"index":1,"name":"Err"}]}},"params":[{"name":"T","type":4},{"name":"E","type":19}],"path":["Result"]}},{"id":19,"type":{"def":{"variant":{"variants":[{"fields":[{"type":7,"typeName":"String"}],"index":0,"name":"Other"},{"fields":[{"type":11,"typeName":"Error"}],"index":1,"name":"SystemError"},{"index":2,"name":"BadOrigin"}]}},"path":["pink_extension","system","DriverError"]}}]}} \ No newline at end of file diff --git a/e2e/src/fullstack.js b/e2e/src/fullstack.js index 8801ff8c07..91cef66660 100644 --- a/e2e/src/fullstack.js +++ b/e2e/src/fullstack.js @@ -1206,6 +1206,7 @@ function newNode(wsPort, tmpPath, name = 'node') { '--base-path=' + path.resolve(tmpPath, 'phala-node'), `--ws-port=${wsPort}`, '--rpc-methods=Unsafe', + '--pruning=archive', ] ]; const cmd = cli.flat().join(' '); diff --git a/standalone/pherry/src/endpoint.rs b/standalone/pherry/src/endpoint.rs index b5e2ad5210..0ef8af3dea 100644 --- a/standalone/pherry/src/endpoint.rs +++ b/standalone/pherry/src/endpoint.rs @@ -18,7 +18,8 @@ async fn update_worker_endpoint( let tx = phaxt::dynamic::tx::update_worker_endpoint(encoded_endpoint_payload, signature); let ret = para_api .tx() - .sign_and_submit_then_watch(&tx, signer, params) + .create_signed_with_nonce(&tx, &signer.signer, signer.nonce(), params)? + .submit_and_watch() .await; if ret.is_err() { error!("FailedToCallBindWorkerEndpoint: {:?}", ret); diff --git a/standalone/pherry/src/headers_cache.rs b/standalone/pherry/src/headers_cache.rs index f93a898160..8b79c043e3 100644 --- a/standalone/pherry/src/headers_cache.rs +++ b/standalone/pherry/src/headers_cache.rs @@ -1,9 +1,10 @@ -use crate::GRANDPA_ENGINE_ID; +use crate::types::ConvertTo; +use crate::{types::Header, GRANDPA_ENGINE_ID}; use anyhow::{anyhow, Result}; use codec::{Decode, Encode}; use phaxt::{ - subxt::{self, rpc::NumberOrHex}, - BlockNumber, Header, ParachainApi, RelaychainApi, + subxt::{self, rpc::types::NumberOrHex}, + BlockNumber, ParachainApi, RelaychainApi, }; use std::io::{Read, Write}; @@ -224,14 +225,14 @@ pub async fn grab_headers( header.number, last_set, set_id, ); if justifications.is_none() { - justifications = Some( - api.rpc() - .block(Some(hash)) - .await? - .ok_or_else(|| anyhow!("Failed to fetch block"))? - .justifications - .ok_or_else(|| anyhow!("No justification for block changing set_id"))?, - ); + let just_data = api + .rpc() + .block(Some(hash)) + .await? + .ok_or_else(|| anyhow!("Failed to fetch block"))? + .justifications + .ok_or_else(|| anyhow!("No justification for block changing set_id"))?; + justifications = Some(just_data.convert_to()); } Some(crate::get_authority_with_proof_at(api, hash).await?) } else { @@ -333,9 +334,9 @@ pub async fn fetch_genesis_info( .block; let hash = api .rpc() - .block_hash(Some(subxt::rpc::BlockNumber::from(NumberOrHex::Number( - genesis_block_number as _, - )))) + .block_hash(Some(subxt::rpc::types::BlockNumber::from( + NumberOrHex::Number(genesis_block_number as _), + ))) .await? .expect("No genesis block?"); let set_proof = crate::get_authority_with_proof_at(api, hash).await?; diff --git a/standalone/pherry/src/lib.rs b/standalone/pherry/src/lib.rs index ee51f646ff..ba23a92c1e 100644 --- a/standalone/pherry/src/lib.rs +++ b/standalone/pherry/src/lib.rs @@ -1,7 +1,6 @@ use anyhow::{anyhow, Context, Result}; use log::{debug, error, info, warn}; use sp_core::crypto::AccountId32; -use sp_runtime::generic::Era; use std::cmp; use std::str::FromStr; use std::time::Duration; @@ -9,10 +8,13 @@ use tokio::time::sleep; use codec::{Decode, Encode}; use phala_pallets::pallet_registry::Attestation; -use phaxt::rpc::ExtraRpcExt as _; -use phaxt::{subxt, RpcClient}; -use sp_core::{crypto::Pair, sr25519}; +use phaxt::{ + rpc::ExtraRpcExt as _, + sp_core::{crypto::Pair, sr25519}, + subxt, RpcClient, +}; use sp_finality_grandpa::{AuthorityList, SetId, VersionedAuthorityList, GRANDPA_AUTHORITIES_KEY}; +use subxt::config::{substrate::Era, Header as _}; mod endpoint; mod error; @@ -26,8 +28,8 @@ pub mod types; use crate::error::Error; use crate::types::{ - Block, BlockNumber, Hash, Header, NotifyReq, NumberOrHex, ParachainApi, PrClient, - RelaychainApi, SignedBlock, SrSigner, + Block, BlockNumber, ConvertTo, Hash, Header, NotifyReq, NumberOrHex, ParachainApi, PrClient, + RelaychainApi, SrSigner, }; use phactory_api::blocks::{ self, AuthoritySet, AuthoritySetChange, BlockHeader, BlockHeaderWithChanges, HeaderToSync, @@ -218,7 +220,10 @@ pub struct Args { attestation_provider: RaOption, /// Use IAS RA method, this is compatible with Pherry 1.x - #[arg(short = 'r', help = "Use IAS as RA method, enable this will override attestation-provider")] + #[arg( + short = 'r', + help = "Use IAS as RA method, enable this will override attestation-provider" + )] use_ias: bool, /// Try to load chain state from the latest block that the worker haven't registered at. @@ -257,11 +262,8 @@ struct BlockSyncState { authory_set_state: Option<(BlockNumber, SetId)>, } -async fn get_header_hash( - client: &phaxt::Client, - h: Option, -) -> Result { - let pos = h.map(|h| subxt::rpc::BlockNumber::from(NumberOrHex::Number(h.into()))); +async fn get_header_hash(client: &phaxt::RpcClient, h: Option) -> Result { + let pos = h.map(|h| subxt::rpc::types::BlockNumber::from(NumberOrHex::Number(h.into()))); let hash = match pos { Some(_) => client .rpc() @@ -273,10 +275,7 @@ async fn get_header_hash( Ok(hash) } -async fn get_block_at( - client: &phaxt::Client, - h: Option, -) -> Result<(SignedBlock, T::Hash)> { +async fn get_block_at(client: &phaxt::RpcClient, h: Option) -> Result<(Block, Hash)> { let hash = get_header_hash(client, h).await?; let block = client .rpc() @@ -284,13 +283,10 @@ async fn get_block_at( .await? .ok_or(Error::BlockNotFound)?; - Ok((block, hash)) + Ok((block.convert_to(), hash)) } -pub async fn get_header_at( - client: &phaxt::Client, - h: Option, -) -> Result<(T::Header, T::Hash)> { +pub async fn get_header_at(client: &phaxt::RpcClient, h: Option) -> Result<(Header, Hash)> { let hash = get_header_hash(client, h).await?; let header = client .rpc() @@ -298,7 +294,7 @@ pub async fn get_header_at( .await? .ok_or(Error::BlockNotFound)?; - Ok((header, hash)) + Ok((header.convert_to(), hash)) } async fn get_block_without_storage_changes(api: &RelaychainApi, h: Option) -> Result { @@ -795,7 +791,7 @@ async fn sync_parachain_header( info!("parachain headers not found in cache"); for b in next_headernum..=para_fin_block_number { info!("fetching parachain header {}", b); - let num = subxt::rpc::BlockNumber::from(NumberOrHex::Number(b.into())); + let num = subxt::rpc::types::BlockNumber::from(NumberOrHex::Number(b.into())); let hash = para_api.rpc().block_hash(Some(num)).await?; let hash = match hash { Some(hash) => hash, @@ -809,7 +805,7 @@ async fn sync_parachain_header( .header(Some(hash)) .await? .ok_or(Error::BlockNotFound)?; - para_headers.push(header); + para_headers.push(header.convert_to()); } } else { info!("Got {} parachain headers from cache", para_headers.len()); @@ -863,14 +859,14 @@ async fn init_runtime( let genesis_block = get_block_at(api, Some(start_header)).await?.0.block; let hash = api .rpc() - .block_hash(Some(subxt::rpc::BlockNumber::from(NumberOrHex::Number( - start_header as _, - )))) + .block_hash(Some(subxt::rpc::types::BlockNumber::from( + NumberOrHex::Number(start_header as _), + ))) .await? .expect("No genesis block?"); let set_proof = get_authority_with_proof_at(api, hash).await?; blocks::GenesisBlockInfo { - block_header: genesis_block.header, + block_header: genesis_block.header.clone(), authority_set: set_proof.authority_set, proof: set_proof.authority_proof, } @@ -926,7 +922,8 @@ async fn register_worker( let tx = phaxt::dynamic::tx::register_worker(encoded_runtime_info, attestation, v2); let ret = para_api .tx() - .sign_and_submit_then_watch(&tx, signer, params) + .create_signed_with_nonce(&tx, &signer.signer, signer.nonce(), params)? + .submit_and_watch() .await; if ret.is_err() { error!("FailedToCallRegisterWorker: {:?}", ret); @@ -988,7 +985,7 @@ async fn try_load_chain_state(pr: &PrClient, para_api: &ParachainApi, args: &Arg const DEV_KEY: &str = "0000000000000000000000000000000000000000000000000000000000000001"; -async fn wait_until_synced(client: &phaxt::Client) -> Result<()> { +async fn wait_until_synced(client: &phaxt::RpcClient) -> Result<()> { loop { let state = client.extra_rpc().system_sync_state().await?; info!( @@ -1265,7 +1262,7 @@ async fn bridge( if block.justifications.is_some() { debug!("block with justification at: {}", block.block.header.number); } - sync_state.blocks.push(block.clone()); + sync_state.blocks.push(block); } // send the blocks to pRuntime in batch @@ -1410,12 +1407,8 @@ async fn mk_params( let phase = number % period; let era = Era::Mortal(period, phase); info!( - "update era: block={}, period={}, phase={}, birth={}, death={}", - number, - period, - phase, - era.birth(number), - era.death(number) + "update era: block={}, period={}, phase={}", + number, period, phase ); Some((era, header.hash())) } else { diff --git a/standalone/pherry/src/msg_sync.rs b/standalone/pherry/src/msg_sync.rs index cb6fa89980..f21e73b582 100644 --- a/standalone/pherry/src/msg_sync.rs +++ b/standalone/pherry/src/msg_sync.rs @@ -6,7 +6,6 @@ use crate::{ chain_client::{mq_next_sequence, update_signer_nonce}, types::{ParachainApi, PrClient, SrSigner}, }; -use phaxt::subxt::tx::Signer as _; pub use tokio::sync::mpsc::{channel, Receiver, Sender}; @@ -64,7 +63,9 @@ pub async fn maybe_sync_mq_egress( let params = crate::mk_params(api, longevity, tip).await?; let tx = phaxt::dynamic::tx::sync_offchain_message(message); - let extrinsic = api.tx().create_signed(&tx, signer, params).await; + let extrinsic = + api.tx() + .create_signed_with_nonce(&tx, &signer.signer, signer.nonce(), params); signer.increment_nonce(); match extrinsic { Ok(extrinsic) => { @@ -84,8 +85,8 @@ pub async fn maybe_sync_mq_egress( error!("Error submitting message {}: {:?}", msg_info, err); use phaxt::subxt::{error::RpcError, Error as SubxtError}; let report = match err { - SubxtError::Rpc(RpcError(err)) => { - if err.contains("bad signature") { + SubxtError::Rpc(RpcError::ClientError(err)) => { + if err.to_string().contains("bad signature") { Error::BadSignature } else { Error::OtherRpcError diff --git a/standalone/pherry/src/types.rs b/standalone/pherry/src/types.rs index 0d67e6fd29..587264b463 100644 --- a/standalone/pherry/src/types.rs +++ b/standalone/pherry/src/types.rs @@ -1,18 +1,28 @@ -use phactory_api::{blocks::StorageProof, pruntime_client}; +use phactory_api::{ + blocks::{BlockHeader, StorageProof}, + pruntime_client, +}; use serde::{Deserialize, Serialize}; -use sp_core::sr25519; -use sp_runtime::{generic::SignedBlock as SpSignedBlock, OpaqueExtrinsic}; +use sp_runtime::{generic::SignedBlock as SpSignedBlock, Justifications, OpaqueExtrinsic}; -pub use sp_core::storage::{StorageData, StorageKey}; +use phaxt::{subxt::rpc::types::Justification, Config}; -pub use phaxt::{self, *}; -pub use subxt::rpc::NumberOrHex; +pub use phaxt::rpc::{self, StorageData, StorageKey}; +pub use phaxt::{self, subxt, ParachainApi, RelaychainApi}; +pub use subxt::rpc::types::NumberOrHex; + +use subxt::rpc::types::ChainBlockResponse; + +use codec::{Decode, Encode}; pub type PrClient = pruntime_client::PRuntimeClient; -pub type SrSigner = subxt::tx::PairSigner; +pub type SrSigner = phaxt::PairSigner; pub type SignedBlock = SpSignedBlock>; +pub type BlockNumber = u32; +pub type Hash = sp_core::H256; +pub type Header = sp_runtime::generic::Header; pub type Block = SignedBlock; // API: notify @@ -27,8 +37,43 @@ pub struct NotifyReq { pub mod utils { use super::StorageProof; - use phaxt::subxt::rpc::ReadProof; + use phaxt::subxt::rpc::types::ReadProof; pub fn raw_proof(read_proof: ReadProof) -> StorageProof { read_proof.proof.into_iter().map(|p| p.0).collect() } } + +pub trait ConvertTo { + fn convert_to(&self) -> T; +} + +fn recode(f: &F) -> Result { + Decode::decode(&mut &f.encode()[..]) +} + +impl ConvertTo for H +where + H: subxt::config::Header, +{ + fn convert_to(&self) -> BlockHeader { + recode(self).expect("Failed to convert subxt header to block header") + } +} + +impl ConvertTo for ChainBlockResponse { + fn convert_to(&self) -> Block { + Block { + block: sp_runtime::generic::Block { + header: self.block.header.convert_to(), + extrinsics: vec![], + }, + justifications: self.justifications.as_ref().map(|x| x.convert_to()), + } + } +} + +impl ConvertTo for Vec { + fn convert_to(&self) -> Justifications { + recode(self).expect("Failed to convert ChainBlockResponse to Block") + } +} diff --git a/standalone/replay/Cargo.toml b/standalone/replay/Cargo.toml index 584bc6e5b9..7406ce3a62 100644 --- a/standalone/replay/Cargo.toml +++ b/standalone/replay/Cargo.toml @@ -11,6 +11,7 @@ phactory = { path = "../../crates/phactory", features = ["gk-stat"] } phactory-api = { path = "../../crates/phactory/api" } pherry = { path = "../pherry" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } log = "0.4.14" anyhow = "1.0.43" diff --git a/standalone/replay/src/replay_gk.rs b/standalone/replay/src/replay_gk.rs index 4159164337..b5297103a7 100644 --- a/standalone/replay/src/replay_gk.rs +++ b/standalone/replay/src/replay_gk.rs @@ -189,7 +189,7 @@ pub async fn fetch_genesis_storage( api: &ParachainApi, pos: BlockNumber, ) -> Result, Vec)>> { - let pos = subxt::rpc::BlockNumber::from(NumberOrHex::Number(pos.into())); + let pos = subxt::rpc::types::BlockNumber::from(NumberOrHex::Number(pos.into())); let hash = api.rpc().block_hash(Some(pos)).await?; let response = api .extra_rpc() diff --git a/standalone/replay/src/replay_gk/httpserver.rs b/standalone/replay/src/replay_gk/httpserver.rs index f543c93835..e55bbe0b88 100644 --- a/standalone/replay/src/replay_gk/httpserver.rs +++ b/standalone/replay/src/replay_gk/httpserver.rs @@ -2,7 +2,7 @@ use std::str::FromStr; use super::*; use actix_web::{get, web, App, HttpResponse, HttpServer}; -use subxt::ext::sp_runtime::AccountId32; +use sp_runtime::AccountId32; struct AppState { factory: Arc>, diff --git a/subxt b/subxt index 2ef82db9ff..977f2a3333 160000 --- a/subxt +++ b/subxt @@ -1 +1 @@ -Subproject commit 2ef82db9ffccc3e58b1ab80a393035392d8905f7 +Subproject commit 977f2a3333922b2b833ab526469ec63c4abef847 From a6d26833f3aaf220e0c9afdc01101751e477d602 Mon Sep 17 00:00:00 2001 From: Kevin Wang Date: Thu, 19 Jan 2023 11:59:10 +0000 Subject: [PATCH 4/6] Add backRc optimizing in memdb --- crates/phala-trie-storage/src/memdb.rs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/crates/phala-trie-storage/src/memdb.rs b/crates/phala-trie-storage/src/memdb.rs index d9fad75f7b..7e8a553c70 100644 --- a/crates/phala-trie-storage/src/memdb.rs +++ b/crates/phala-trie-storage/src/memdb.rs @@ -308,6 +308,9 @@ impl MemoryDB } entry.get_mut().1 += rc; + if entry.get().1 == 0 { + _ = entry.remove(); + } }, Entry::Vacant(entry) => { entry.insert((value, rc)); @@ -354,6 +357,9 @@ impl PlainDB for MemoryDB *old_value = value; } *rc += 1; + if *rc == 0 { + _ = entry.remove(); + } }, Entry::Vacant(entry) => { entry.insert((value, 1)); @@ -366,6 +372,9 @@ impl PlainDB for MemoryDB Entry::Occupied(mut entry) => { let &mut (_, ref mut rc) = entry.get_mut(); *rc -= 1; + if *rc == 0 { + _ = entry.remove(); + } }, Entry::Vacant(entry) => { let value = T::default(); @@ -433,6 +442,9 @@ impl HashDB for MemoryDB *old_value = value; } *rc += 1; + if *rc == 0 { + _ = entry.remove(); + } }, Entry::Vacant(entry) => { entry.insert((value, 1)); @@ -460,6 +472,9 @@ impl HashDB for MemoryDB Entry::Occupied(mut entry) => { let &mut (_, ref mut rc) = entry.get_mut(); *rc -= 1; + if *rc == 0 { + _ = entry.remove(); + } }, Entry::Vacant(entry) => { let value = T::default(); From ec88c0319031ece00a18821e5a5af54360ccefe6 Mon Sep 17 00:00:00 2001 From: Kevin Wang Date: Thu, 19 Jan 2023 12:39:17 +0000 Subject: [PATCH 5/6] Fix prouter compile error --- standalone/prouter/Cargo.lock | 986 ++++++++++++++++++--------- standalone/prouter/src/main.rs | 4 +- standalone/prouter/src/translator.rs | 2 +- 3 files changed, 670 insertions(+), 322 deletions(-) diff --git a/standalone/prouter/Cargo.lock b/standalone/prouter/Cargo.lock index 58495e6bb0..dc7cafcdf1 100644 --- a/standalone/prouter/Cargo.lock +++ b/standalone/prouter/Cargo.lock @@ -1137,13 +1137,13 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto", - "sp-core", - "sp-io", - "sp-runtime", - "sp-runtime-interface", - "sp-std", - "sp-storage", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-runtime-interface 7.0.0", + "sp-std 5.0.0", + "sp-storage 7.0.0", ] [[package]] @@ -1167,11 +1167,11 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-arithmetic", - "sp-core", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", "sp-npos-elections", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -1183,11 +1183,11 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "sp-tracing", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", + "sp-tracing 6.0.0", ] [[package]] @@ -1220,17 +1220,17 @@ dependencies = [ "serde", "smallvec", "sp-api", - "sp-arithmetic", - "sp-core", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", "sp-core-hashing-proc-macro", "sp-inherents", - "sp-io", - "sp-runtime", + "sp-io 7.0.0", + "sp-runtime 7.0.0", "sp-staking", - "sp-state-machine", - "sp-std", - "sp-tracing", - "sp-weights", + "sp-state-machine 0.13.0", + "sp-std 5.0.0", + "sp-tracing 6.0.0", + "sp-weights 4.0.0", "tt-call", ] @@ -1280,12 +1280,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "sp-version", - "sp-weights", + "sp-weights 4.0.0", ] [[package]] @@ -1298,9 +1298,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -1320,8 +1320,8 @@ dependencies = [ "frame-support", "parity-scale-codec", "sp-api", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -2327,9 +2327,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-application-crypto", - "sp-core", - "sp-runtime", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", + "sp-runtime 7.0.0", ] [[package]] @@ -2515,9 +2515,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -2530,10 +2530,10 @@ dependencies = [ "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto", + "sp-application-crypto 7.0.0", "sp-authority-discovery", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -2547,8 +2547,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-authorship", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -2565,14 +2565,14 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto", + "sp-application-crypto 7.0.0", "sp-consensus-babe", "sp-consensus-vrf", - "sp-io", - "sp-runtime", + "sp-io 7.0.0", + "sp-runtime 7.0.0", "sp-session", "sp-staking", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -2588,11 +2588,11 @@ dependencies = [ "pallet-balances", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "sp-tracing", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", + "sp-tracing 6.0.0", ] [[package]] @@ -2606,8 +2606,8 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -2622,10 +2622,10 @@ dependencies = [ "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -2641,10 +2641,10 @@ dependencies = [ "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -2658,10 +2658,10 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -2676,10 +2676,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -2696,12 +2696,12 @@ dependencies = [ "parity-scale-codec", "rand 0.7.3", "scale-info", - "sp-arithmetic", - "sp-core", - "sp-io", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", "sp-npos-elections", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "static_assertions", "strum", ] @@ -2716,7 +2716,7 @@ dependencies = [ "frame-system", "parity-scale-codec", "sp-npos-elections", - "sp-runtime", + "sp-runtime 7.0.0", ] [[package]] @@ -2730,11 +2730,11 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", + "sp-core 7.0.0", + "sp-io 7.0.0", "sp-npos-elections", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -2749,10 +2749,10 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", + "sp-io 7.0.0", + "sp-runtime 7.0.0", "sp-staking", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -2768,14 +2768,14 @@ dependencies = [ "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto", - "sp-core", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", "sp-finality-grandpa", - "sp-io", - "sp-runtime", + "sp-io 7.0.0", + "sp-runtime 7.0.0", "sp-session", "sp-staking", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -2789,9 +2789,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -2806,12 +2806,12 @@ dependencies = [ "pallet-authorship", "parity-scale-codec", "scale-info", - "sp-application-crypto", - "sp-core", - "sp-io", - "sp-runtime", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", "sp-staking", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -2824,11 +2824,11 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", + "sp-core 7.0.0", + "sp-io 7.0.0", "sp-keyring", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -2841,8 +2841,8 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -2856,10 +2856,10 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -2881,9 +2881,9 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -2896,11 +2896,11 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", "sp-staking", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -2917,10 +2917,10 @@ dependencies = [ "pallet-staking", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-runtime-interface", + "sp-runtime 7.0.0", + "sp-runtime-interface 7.0.0", "sp-staking", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -2930,7 +2930,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb dependencies = [ "parity-scale-codec", "sp-api", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -2945,9 +2945,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-runtime", + "sp-runtime 7.0.0", "sp-staking", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -2968,9 +2968,9 @@ dependencies = [ "pallet-staking", "parity-scale-codec", "scale-info", - "sp-runtime", + "sp-runtime 7.0.0", "sp-staking", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -2984,10 +2984,10 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -3000,9 +3000,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -3015,8 +3015,8 @@ dependencies = [ "parity-scale-codec", "safe-mix", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -3029,9 +3029,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -3048,8 +3048,8 @@ dependencies = [ "rmrk-traits", "scale-info", "serde", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -3063,10 +3063,10 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", - "sp-weights", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", + "sp-weights 4.0.0", ] [[package]] @@ -3081,13 +3081,13 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", "sp-session", "sp-staking", - "sp-std", - "sp-trie", + "sp-std 5.0.0", + "sp-trie 7.0.0", ] [[package]] @@ -3101,9 +3101,9 @@ dependencies = [ "pallet-session", "pallet-staking", "rand 0.7.3", - "sp-runtime", + "sp-runtime 7.0.0", "sp-session", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -3116,8 +3116,8 @@ dependencies = [ "parity-scale-codec", "rand_chacha 0.2.2", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -3135,11 +3135,11 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-application-crypto", - "sp-io", - "sp-runtime", + "sp-application-crypto 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", "sp-staking", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -3162,9 +3162,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -3179,9 +3179,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-inherents", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "sp-timestamp", ] @@ -3198,10 +3198,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -3214,10 +3214,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -3228,8 +3228,8 @@ dependencies = [ "pallet-transaction-payment", "parity-scale-codec", "sp-api", - "sp-runtime", - "sp-weights", + "sp-runtime 7.0.0", + "sp-weights 4.0.0", ] [[package]] @@ -3245,8 +3245,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -3260,8 +3260,8 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -3274,10 +3274,10 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -3291,8 +3291,8 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -3496,10 +3496,10 @@ dependencies = [ "reqwest", "scale-info", "serde", - "sp-application-crypto", - "sp-core", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", "sp-finality-grandpa", - "sp-runtime", + "sp-runtime 7.0.0", "tempdir", "tera", ] @@ -3519,8 +3519,8 @@ dependencies = [ "curve25519-dalek 2.1.3", "ring 0.16.20", "schnorrkel", - "sp-application-crypto", - "sp-core", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", ] [[package]] @@ -3535,7 +3535,7 @@ dependencies = [ "phala-serde-more", "scale-info", "serde", - "sp-core", + "sp-core 7.0.0", "spin 0.9.4", ] @@ -3620,14 +3620,14 @@ dependencies = [ "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core", + "sp-core 7.0.0", "sp-inherents", - "sp-io", + "sp-io 7.0.0", "sp-offchain", - "sp-runtime", + "sp-runtime 7.0.0", "sp-session", "sp-staking", - "sp-std", + "sp-std 5.0.0", "sp-transaction-pool", "sp-version", "static_assertions", @@ -3661,11 +3661,11 @@ dependencies = [ "rmrk-traits", "scale-info", "serde_json", - "sp-application-crypto", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "untrusted 0.9.0", "webpki 0.22.0", "webpki 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3678,7 +3678,7 @@ dependencies = [ "hex", "parity-scale-codec", "serde", - "sp-core", + "sp-core 7.0.0", ] [[package]] @@ -3690,9 +3690,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-state-machine", - "sp-trie", + "sp-core 7.0.0", + "sp-state-machine 0.13.0", + "sp-trie 7.0.0", "trie-db", ] @@ -3706,7 +3706,7 @@ dependencies = [ "prpc", "scale-info", "serde", - "sp-core", + "sp-core 7.0.0", ] [[package]] @@ -3722,11 +3722,11 @@ dependencies = [ "parity-scale-codec", "primitive-types", "scale-info", - "sp-application-crypto", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -3739,9 +3739,11 @@ dependencies = [ "phala-node-rpc-ext-types", "phala-pallets", "phala-types", + "primitive-types", "scale-info", "serde", "serde_json", + "sp-core 11.0.0", "subxt", "tokio", ] @@ -4411,8 +4413,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -4977,11 +4979,11 @@ dependencies = [ "log", "parity-scale-codec", "sp-api-proc-macro", - "sp-core", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", + "sp-std 5.0.0", + "sp-trie 7.0.0", "sp-version", "thiserror", ] @@ -5006,9 +5008,23 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-std", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-std 5.0.0", +] + +[[package]] +name = "sp-application-crypto" +version = "12.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a72575f160b1b134ee277a2ab46af4361c072a3fe661c48e474255406cb01c97" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 11.0.0", + "sp-io 12.0.0", + "sp-std 6.0.0", ] [[package]] @@ -5021,8 +5037,23 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-debug-derive", - "sp-std", + "sp-debug-derive 5.0.0", + "sp-std 5.0.0", + "static_assertions", +] + +[[package]] +name = "sp-arithmetic" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2038010f7514d50775dcbd3edb569e17fa9bda63128580a9e172abb1795f2c1d" +dependencies = [ + "integer-sqrt", + "num-traits", + "parity-scale-codec", + "scale-info", + "serde", + "sp-std 6.0.0", "static_assertions", ] @@ -5034,9 +5065,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-application-crypto", - "sp-runtime", - "sp-std", + "sp-application-crypto 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -5047,8 +5078,8 @@ dependencies = [ "async-trait", "parity-scale-codec", "sp-inherents", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -5059,8 +5090,8 @@ dependencies = [ "parity-scale-codec", "sp-api", "sp-inherents", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -5073,11 +5104,11 @@ dependencies = [ "futures-timer", "log", "parity-scale-codec", - "sp-core", + "sp-core 7.0.0", "sp-inherents", - "sp-runtime", - "sp-state-machine", - "sp-std", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", + "sp-std 5.0.0", "sp-version", "thiserror", ] @@ -5093,15 +5124,15 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto", + "sp-application-crypto 7.0.0", "sp-consensus", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core", + "sp-core 7.0.0", "sp-inherents", - "sp-keystore", - "sp-runtime", - "sp-std", + "sp-keystore 0.13.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "sp-timestamp", ] @@ -5113,9 +5144,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-runtime", - "sp-std", + "sp-arithmetic 6.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "sp-timestamp", ] @@ -5127,9 +5158,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "schnorrkel", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -5163,20 +5194,63 @@ dependencies = [ "secp256k1", "secrecy", "serde", - "sp-core-hashing", - "sp-debug-derive", - "sp-externalities", - "sp-runtime-interface", - "sp-std", - "sp-storage", + "sp-core-hashing 5.0.0", + "sp-debug-derive 5.0.0", + "sp-externalities 0.13.0", + "sp-runtime-interface 7.0.0", + "sp-std 5.0.0", + "sp-storage 7.0.0", "ss58-registry", "substrate-bip39", "thiserror", - "tiny-bip39", + "tiny-bip39 0.8.2", "wasmi", "zeroize", ] +[[package]] +name = "sp-core" +version = "11.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d99984f57c9eb858d29fbe0e4cf44092eec484b2ff72176d5afa4ab7bf1dc8b1" +dependencies = [ + "array-bytes", + "base58", + "bitflags", + "blake2", + "dyn-clonable", + "ed25519-zebra", + "futures", + "hash-db", + "hash256-std-hasher", + "impl-serde", + "lazy_static", + "libsecp256k1", + "log", + "merlin", + "parity-scale-codec", + "parking_lot", + "primitive-types", + "rand 0.8.5", + "regex", + "scale-info", + "schnorrkel", + "secp256k1", + "secrecy", + "serde", + "sp-core-hashing 6.0.0", + "sp-debug-derive 6.0.0", + "sp-externalities 0.15.0", + "sp-runtime-interface 10.0.0", + "sp-std 6.0.0", + "sp-storage 9.0.0", + "ss58-registry", + "substrate-bip39", + "thiserror", + "tiny-bip39 1.0.0", + "zeroize", +] + [[package]] name = "sp-core-hashing" version = "5.0.0" @@ -5187,7 +5261,22 @@ dependencies = [ "digest 0.10.3", "sha2 0.10.2", "sha3", - "sp-std", + "sp-std 5.0.0", + "twox-hash", +] + +[[package]] +name = "sp-core-hashing" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbc2d1947252b7a4e403b0a260f596920443742791765ec111daa2bbf98eff25" +dependencies = [ + "blake2", + "byteorder", + "digest 0.10.3", + "sha2 0.10.2", + "sha3", + "sp-std 6.0.0", "twox-hash", ] @@ -5198,7 +5287,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb dependencies = [ "proc-macro2 1.0.43", "quote 1.0.21", - "sp-core-hashing", + "sp-core-hashing 5.0.0", "syn 1.0.99", ] @@ -5212,6 +5301,17 @@ dependencies = [ "syn 1.0.99", ] +[[package]] +name = "sp-debug-derive" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fb9dc63d54de7d7bed62a505b6e0bd66c122525ea1abb348f6564717c3df2d" +dependencies = [ + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", +] + [[package]] name = "sp-externalities" version = "0.13.0" @@ -5219,8 +5319,20 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb dependencies = [ "environmental", "parity-scale-codec", - "sp-std", - "sp-storage", + "sp-std 5.0.0", + "sp-storage 7.0.0", +] + +[[package]] +name = "sp-externalities" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc754e1cec66b93df0b48a8986d019c1a2a90431c42cf2614cc35a291597c329" +dependencies = [ + "environmental", + "parity-scale-codec", + "sp-std 6.0.0", + "sp-storage 9.0.0", ] [[package]] @@ -5234,11 +5346,11 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto", - "sp-core", - "sp-keystore", - "sp-runtime", - "sp-std", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", + "sp-keystore 0.13.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -5249,9 +5361,9 @@ dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "thiserror", ] @@ -5269,15 +5381,41 @@ dependencies = [ "parity-scale-codec", "parking_lot", "secp256k1", - "sp-core", - "sp-externalities", - "sp-keystore", - "sp-runtime-interface", - "sp-state-machine", - "sp-std", - "sp-tracing", - "sp-trie", - "sp-wasm-interface", + "sp-core 7.0.0", + "sp-externalities 0.13.0", + "sp-keystore 0.13.0", + "sp-runtime-interface 7.0.0", + "sp-state-machine 0.13.0", + "sp-std 5.0.0", + "sp-tracing 6.0.0", + "sp-trie 7.0.0", + "sp-wasm-interface 7.0.0", + "tracing", + "tracing-core", +] + +[[package]] +name = "sp-io" +version = "12.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ac917b37c7733e3778e7ffc3958f1181a151ac3b14116d65fb10fe7b08db10e" +dependencies = [ + "bytes", + "ed25519", + "ed25519-dalek", + "futures", + "libsecp256k1", + "log", + "parity-scale-codec", + "secp256k1", + "sp-core 11.0.0", + "sp-externalities 0.15.0", + "sp-keystore 0.17.0", + "sp-runtime-interface 10.0.0", + "sp-state-machine 0.17.0", + "sp-std 6.0.0", + "sp-tracing 7.0.0", + "sp-trie 11.0.0", "tracing", "tracing-core", ] @@ -5288,8 +5426,8 @@ version = "7.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "lazy_static", - "sp-core", - "sp-runtime", + "sp-core 7.0.0", + "sp-runtime 7.0.0", "strum", ] @@ -5304,8 +5442,25 @@ dependencies = [ "parity-scale-codec", "parking_lot", "schnorrkel", - "sp-core", - "sp-externalities", + "sp-core 7.0.0", + "sp-externalities 0.13.0", + "thiserror", +] + +[[package]] +name = "sp-keystore" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ada8b7a72404bda58b3353830bc42f027ec764e13a28b4cd4386cf34fb1ae7c" +dependencies = [ + "async-trait", + "futures", + "merlin", + "parity-scale-codec", + "parking_lot", + "schnorrkel", + "sp-core 11.0.0", + "sp-externalities 0.15.0", "thiserror", ] @@ -5317,10 +5472,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-core", - "sp-runtime", - "sp-std", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -5329,8 +5484,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "sp-api", - "sp-core", - "sp-runtime", + "sp-core 7.0.0", + "sp-runtime 7.0.0", ] [[package]] @@ -5343,6 +5498,17 @@ dependencies = [ "regex", ] +[[package]] +name = "sp-panic-handler" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4abed79c3d5b3622f65ab065676addd9923b9b122cd257df23e2757ce487c6d2" +dependencies = [ + "backtrace", + "lazy_static", + "regex", +] + [[package]] name = "sp-runtime" version = "7.0.0" @@ -5357,12 +5523,35 @@ dependencies = [ "rand 0.7.3", "scale-info", "serde", - "sp-application-crypto", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-std", - "sp-weights", + "sp-application-crypto 7.0.0", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-std 5.0.0", + "sp-weights 4.0.0", +] + +[[package]] +name = "sp-runtime" +version = "12.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c86578c67b060a6ecab52af64f1cf18b3892fca7fba5ffc5c49934b2e76b1929" +dependencies = [ + "either", + "hash256-std-hasher", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "paste", + "rand 0.8.5", + "scale-info", + "serde", + "sp-application-crypto 12.0.0", + "sp-arithmetic 9.0.0", + "sp-core 11.0.0", + "sp-io 12.0.0", + "sp-std 6.0.0", + "sp-weights 8.0.0", ] [[package]] @@ -5374,12 +5563,31 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", - "sp-externalities", - "sp-runtime-interface-proc-macro", - "sp-std", - "sp-storage", - "sp-tracing", - "sp-wasm-interface", + "sp-externalities 0.13.0", + "sp-runtime-interface-proc-macro 6.0.0", + "sp-std 5.0.0", + "sp-storage 7.0.0", + "sp-tracing 6.0.0", + "sp-wasm-interface 7.0.0", + "static_assertions", +] + +[[package]] +name = "sp-runtime-interface" +version = "10.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3858935567385728ea45f6d159f9970b0b278eb22a8e77625bbf4a63e43a85a" +dependencies = [ + "bytes", + "impl-trait-for-tuples", + "parity-scale-codec", + "primitive-types", + "sp-externalities 0.15.0", + "sp-runtime-interface-proc-macro 7.0.0", + "sp-std 6.0.0", + "sp-storage 9.0.0", + "sp-tracing 7.0.0", + "sp-wasm-interface 8.0.0", "static_assertions", ] @@ -5395,6 +5603,19 @@ dependencies = [ "syn 1.0.99", ] +[[package]] +name = "sp-runtime-interface-proc-macro" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00083a77e938c4f35d0bde7ca0b6e5f616158ebe11af6063795aa664d92a238b" +dependencies = [ + "Inflector", + "proc-macro-crate", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", +] + [[package]] name = "sp-session" version = "4.0.0-dev" @@ -5403,10 +5624,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-core", - "sp-runtime", + "sp-core 7.0.0", + "sp-runtime 7.0.0", "sp-staking", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -5416,9 +5637,9 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb dependencies = [ "parity-scale-codec", "scale-info", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -5433,21 +5654,48 @@ dependencies = [ "parking_lot", "rand 0.7.3", "smallvec", - "sp-core", - "sp-externalities", - "sp-panic-handler", - "sp-std", - "sp-trie", + "sp-core 7.0.0", + "sp-externalities 0.13.0", + "sp-panic-handler 5.0.0", + "sp-std 5.0.0", + "sp-trie 7.0.0", "thiserror", "tracing", "trie-root", ] +[[package]] +name = "sp-state-machine" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1fd4c600df0b5abf26c19b6c61d928b64e0c2b8a709a3dbef872be0507cd1ca" +dependencies = [ + "hash-db", + "log", + "parity-scale-codec", + "parking_lot", + "rand 0.8.5", + "smallvec", + "sp-core 11.0.0", + "sp-externalities 0.15.0", + "sp-panic-handler 6.0.0", + "sp-std 6.0.0", + "sp-trie 11.0.0", + "thiserror", + "tracing", +] + [[package]] name = "sp-std" version = "5.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +[[package]] +name = "sp-std" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af0ee286f98455272f64ac5bb1384ff21ac029fbb669afbaf48477faff12760e" + [[package]] name = "sp-storage" version = "7.0.0" @@ -5457,8 +5705,22 @@ dependencies = [ "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive", - "sp-std", + "sp-debug-derive 5.0.0", + "sp-std 5.0.0", +] + +[[package]] +name = "sp-storage" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9acb4059eb0ae4fa8cf9ca9119b0178ad312a592d4c6054bd17b411034f233e9" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "ref-cast", + "serde", + "sp-debug-derive 6.0.0", + "sp-std 6.0.0", ] [[package]] @@ -5472,8 +5734,8 @@ dependencies = [ "parity-scale-codec", "sp-api", "sp-inherents", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "thiserror", ] @@ -5483,7 +5745,20 @@ version = "6.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", - "sp-std", + "sp-std 5.0.0", + "tracing", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "sp-tracing" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b22d28a0bc2365dfb86644d14f2682a79da35891d4656d4896fb09fb05ff1e6c" +dependencies = [ + "parity-scale-codec", + "sp-std 6.0.0", "tracing", "tracing-core", "tracing-subscriber", @@ -5495,7 +5770,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "sp-api", - "sp-runtime", + "sp-runtime 7.0.0", ] [[package]] @@ -5513,8 +5788,32 @@ dependencies = [ "parity-scale-codec", "parking_lot", "scale-info", - "sp-core", - "sp-std", + "sp-core 7.0.0", + "sp-std 5.0.0", + "thiserror", + "tracing", + "trie-db", + "trie-root", +] + +[[package]] +name = "sp-trie" +version = "11.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db085f134cb444e52ca569a442d12c84bd17667532613d78dd6f568942632da4" +dependencies = [ + "ahash", + "hash-db", + "hashbrown", + "lazy_static", + "lru", + "memory-db", + "nohash-hasher", + "parity-scale-codec", + "parking_lot", + "scale-info", + "sp-core 11.0.0", + "sp-std 6.0.0", "thiserror", "tracing", "trie-db", @@ -5532,8 +5831,8 @@ dependencies = [ "scale-info", "serde", "sp-core-hashing-proc-macro", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "sp-version-proc-macro", "thiserror", ] @@ -5557,7 +5856,21 @@ dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std", + "sp-std 5.0.0", + "wasmi", + "wasmtime", +] + +[[package]] +name = "sp-wasm-interface" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ebc377987d42f8fc20e3f4ec4fd1147dd098fe90bcb4269e1eddb04e920f889" +dependencies = [ + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "sp-std 6.0.0", "wasmi", "wasmtime", ] @@ -5572,10 +5885,26 @@ dependencies = [ "scale-info", "serde", "smallvec", - "sp-arithmetic", - "sp-core", - "sp-debug-derive", - "sp-std", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", + "sp-debug-derive 5.0.0", + "sp-std 5.0.0", +] + +[[package]] +name = "sp-weights" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90eca2a19f48978e9cd605e23905d0602419f7880a9360ac717b03412e9c7916" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "smallvec", + "sp-arithmetic 9.0.0", + "sp-core 11.0.0", + "sp-debug-derive 6.0.0", + "sp-std 6.0.0", ] [[package]] @@ -5739,9 +6068,9 @@ dependencies = [ "scale-value", "serde", "serde_json", - "sp-core", - "sp-core-hashing", - "sp-runtime", + "sp-core 11.0.0", + "sp-core-hashing 6.0.0", + "sp-runtime 12.0.0", "subxt-macro", "subxt-metadata", "thiserror", @@ -5784,7 +6113,7 @@ dependencies = [ "frame-metadata", "parity-scale-codec", "scale-info", - "sp-core-hashing", + "sp-core-hashing 6.0.0", ] [[package]] @@ -5983,6 +6312,25 @@ dependencies = [ "zeroize", ] +[[package]] +name = "tiny-bip39" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861" +dependencies = [ + "anyhow", + "hmac 0.12.1", + "once_cell", + "pbkdf2 0.11.0", + "rand 0.8.5", + "rustc-hash", + "sha2 0.10.2", + "thiserror", + "unicode-normalization", + "wasm-bindgen", + "zeroize", +] + [[package]] name = "tinyvec" version = "1.6.0" diff --git a/standalone/prouter/src/main.rs b/standalone/prouter/src/main.rs index 91fd53a1f7..702fb57221 100644 --- a/standalone/prouter/src/main.rs +++ b/standalone/prouter/src/main.rs @@ -16,7 +16,7 @@ use structopt::StructOpt; use tokio::time::{sleep, Duration}; use tokio::{select, signal}; -use phaxt::{subxt, ParachainApi}; +use phaxt::ParachainApi; use chrono::{DateTime, Utc}; @@ -307,7 +307,7 @@ pub async fn daemon_run(mut i2pd: I2pd, args: &Args) -> Result<()> { Ok(()) } -async fn wait_until_synced(client: &phaxt::Client) -> Result<()> { +async fn wait_until_synced(client: &phaxt::RpcClient) -> Result<()> { loop { let state = client.extra_rpc().system_sync_state().await?; info!( diff --git a/standalone/prouter/src/translator.rs b/standalone/prouter/src/translator.rs index 8f011ea2ae..b2314937ad 100644 --- a/standalone/prouter/src/translator.rs +++ b/standalone/prouter/src/translator.rs @@ -1,6 +1,6 @@ use codec::Decode; use phala_types::VersionedWorkerEndpoints; -use phaxt::subxt::ext::sp_core::sr25519::Public; +use phaxt::sp_core::sr25519::Public; use phaxt::ParachainApi; use phactory_api::endpoints::EndpointType; From e1236f476af55cc8a868da62505267f1c7b5bdaa Mon Sep 17 00:00:00 2001 From: jasl Date: Fri, 20 Jan 2023 03:51:06 +0800 Subject: [PATCH 6/6] Update Subxt --- Cargo.lock | 1481 ++++++++++++-------------------- crates/phaxt/Cargo.toml | 2 +- standalone/prouter/Cargo.lock | 988 +++++++-------------- standalone/pruntime/Cargo.lock | 2 +- subxt | 2 +- 5 files changed, 887 insertions(+), 1588 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 75860b431f..cac7747427 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -765,7 +765,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb dependencies = [ "sp-api", "sp-beefy", - "sp-runtime 7.0.0", + "sp-runtime", ] [[package]] @@ -2265,8 +2265,8 @@ dependencies = [ "phala-pallets", "phala-types", "sc-finality-grandpa", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core", + "sp-runtime", "tokio", ] @@ -3019,13 +3019,13 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-runtime-interface 7.0.0", - "sp-std 5.0.0", - "sp-storage 7.0.0", + "sp-application-crypto", + "sp-core", + "sp-io", + "sp-runtime", + "sp-runtime-interface", + "sp-std", + "sp-storage", ] [[package]] @@ -3065,16 +3065,16 @@ dependencies = [ "serde_nanos", "sp-api", "sp-blockchain", - "sp-core 7.0.0", + "sp-core", "sp-database", - "sp-externalities 0.13.0", + "sp-externalities", "sp-inherents", - "sp-keystore 0.13.0", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", - "sp-std 5.0.0", - "sp-storage 7.0.0", - "sp-trie 7.0.0", + "sp-keystore", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-storage", + "sp-trie", "tempfile", "thiserror", "thousands", @@ -3101,11 +3101,11 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-arithmetic 6.0.0", - "sp-core 7.0.0", + "sp-arithmetic", + "sp-core", "sp-npos-elections", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -3118,11 +3118,11 @@ dependencies = [ "frame-try-runtime", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", - "sp-tracing 6.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-tracing", ] [[package]] @@ -3148,9 +3148,9 @@ dependencies = [ "parity-scale-codec", "serde", "serde_json", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", + "sp-core", + "sp-io", + "sp-runtime", "sp-version", "substrate-rpc-client", "tokio", @@ -3174,17 +3174,17 @@ dependencies = [ "serde", "smallvec", "sp-api", - "sp-arithmetic 6.0.0", - "sp-core 7.0.0", + "sp-arithmetic", + "sp-core", "sp-core-hashing-proc-macro", "sp-inherents", - "sp-io 7.0.0", - "sp-runtime 7.0.0", + "sp-io", + "sp-runtime", "sp-staking", - "sp-state-machine 0.13.0", - "sp-std 5.0.0", - "sp-tracing 6.0.0", - "sp-weights 4.0.0", + "sp-state-machine", + "sp-std", + "sp-tracing", + "sp-weights", "tt-call", ] @@ -3237,12 +3237,12 @@ dependencies = [ "rustversion", "scale-info", "serde", - "sp-arithmetic 6.0.0", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", - "sp-std 5.0.0", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-state-machine", + "sp-std", "sp-version", "trybuild", ] @@ -3268,12 +3268,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "sp-version", - "sp-weights 4.0.0", + "sp-weights", ] [[package]] @@ -3286,9 +3286,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -3308,8 +3308,8 @@ dependencies = [ "frame-support", "parity-scale-codec", "sp-api", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -5815,16 +5815,16 @@ dependencies = [ "phala-node-runtime", "sc-executor", "scale-info", - "sp-application-crypto 7.0.0", + "sp-application-crypto", "sp-consensus-babe", - "sp-core 7.0.0", - "sp-externalities 0.13.0", + "sp-core", + "sp-externalities", "sp-keyring", - "sp-keystore 0.13.0", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", - "sp-tracing 6.0.0", - "sp-trie 7.0.0", + "sp-keystore", + "sp-runtime", + "sp-state-machine", + "sp-tracing", + "sp-trie", "wat", ] @@ -5840,8 +5840,8 @@ dependencies = [ "sc-executor", "sc-service", "sp-blockchain", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core", + "sp-runtime", "thiserror", ] @@ -5853,9 +5853,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-application-crypto", + "sp-core", + "sp-runtime", ] [[package]] @@ -5881,8 +5881,8 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-keystore 0.13.0", - "sp-runtime 7.0.0", + "sp-keystore", + "sp-runtime", "substrate-frame-rpc-system", ] @@ -6157,9 +6157,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -6172,10 +6172,10 @@ dependencies = [ "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto 7.0.0", + "sp-application-crypto", "sp-authority-discovery", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -6189,8 +6189,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-authorship", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -6207,14 +6207,14 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto 7.0.0", + "sp-application-crypto", "sp-consensus-babe", "sp-consensus-vrf", - "sp-io 7.0.0", - "sp-runtime 7.0.0", + "sp-io", + "sp-runtime", "sp-session", "sp-staking", - "sp-std 5.0.0", + "sp-std", ] [[package]] @@ -6230,11 +6230,11 @@ dependencies = [ "pallet-balances", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", - "sp-tracing 6.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-tracing", ] [[package]] @@ -6248,8 +6248,8 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -6264,10 +6264,10 @@ dependencies = [ "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6283,10 +6283,10 @@ dependencies = [ "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6300,10 +6300,10 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6325,10 +6325,10 @@ dependencies = [ "serde", "smallvec", "sp-api", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "wasm-instrument 0.4.0", "wasmi 0.20.0", "wasmparser-nostd", @@ -6341,9 +6341,9 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb dependencies = [ "bitflags", "parity-scale-codec", - "sp-runtime 7.0.0", - "sp-std 5.0.0", - "sp-weights 4.0.0", + "sp-runtime", + "sp-std", + "sp-weights", ] [[package]] @@ -6368,10 +6368,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6388,12 +6388,12 @@ dependencies = [ "parity-scale-codec", "rand 0.7.3", "scale-info", - "sp-arithmetic 6.0.0", - "sp-core 7.0.0", - "sp-io 7.0.0", + "sp-arithmetic", + "sp-core", + "sp-io", "sp-npos-elections", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", "static_assertions", "strum", ] @@ -6408,7 +6408,7 @@ dependencies = [ "frame-system", "parity-scale-codec", "sp-npos-elections", - "sp-runtime 7.0.0", + "sp-runtime", ] [[package]] @@ -6422,11 +6422,11 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", + "sp-core", + "sp-io", "sp-npos-elections", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -6441,10 +6441,10 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-io 7.0.0", - "sp-runtime 7.0.0", + "sp-io", + "sp-runtime", "sp-staking", - "sp-std 5.0.0", + "sp-std", ] [[package]] @@ -6460,14 +6460,14 @@ dependencies = [ "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", + "sp-application-crypto", + "sp-core", "sp-finality-grandpa", - "sp-io 7.0.0", - "sp-runtime 7.0.0", + "sp-io", + "sp-runtime", "sp-session", "sp-staking", - "sp-std 5.0.0", + "sp-std", ] [[package]] @@ -6481,9 +6481,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6498,12 +6498,12 @@ dependencies = [ "pallet-authorship", "parity-scale-codec", "scale-info", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", + "sp-application-crypto", + "sp-core", + "sp-io", + "sp-runtime", "sp-staking", - "sp-std 5.0.0", + "sp-std", ] [[package]] @@ -6516,11 +6516,11 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", + "sp-core", + "sp-io", "sp-keyring", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -6533,8 +6533,8 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -6548,10 +6548,10 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6573,9 +6573,9 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6588,11 +6588,11 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", + "sp-core", + "sp-io", + "sp-runtime", "sp-staking", - "sp-std 5.0.0", + "sp-std", ] [[package]] @@ -6609,10 +6609,10 @@ dependencies = [ "pallet-staking", "parity-scale-codec", "scale-info", - "sp-runtime 7.0.0", - "sp-runtime-interface 7.0.0", + "sp-runtime", + "sp-runtime-interface", "sp-staking", - "sp-std 5.0.0", + "sp-std", ] [[package]] @@ -6622,7 +6622,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb dependencies = [ "parity-scale-codec", "sp-api", - "sp-std 5.0.0", + "sp-std", ] [[package]] @@ -6637,9 +6637,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-runtime 7.0.0", + "sp-runtime", "sp-staking", - "sp-std 5.0.0", + "sp-std", ] [[package]] @@ -6660,9 +6660,9 @@ dependencies = [ "pallet-staking", "parity-scale-codec", "scale-info", - "sp-runtime 7.0.0", + "sp-runtime", "sp-staking", - "sp-std 5.0.0", + "sp-std", ] [[package]] @@ -6676,10 +6676,10 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6692,9 +6692,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6707,8 +6707,8 @@ dependencies = [ "parity-scale-codec", "safe-mix", "scale-info", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -6721,9 +6721,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6740,8 +6740,8 @@ dependencies = [ "rmrk-traits", "scale-info", "serde", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -6755,10 +6755,10 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", - "sp-weights 4.0.0", + "sp-io", + "sp-runtime", + "sp-std", + "sp-weights", ] [[package]] @@ -6773,13 +6773,13 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", + "sp-core", + "sp-io", + "sp-runtime", "sp-session", "sp-staking", - "sp-std 5.0.0", - "sp-trie 7.0.0", + "sp-std", + "sp-trie", ] [[package]] @@ -6793,9 +6793,9 @@ dependencies = [ "pallet-session", "pallet-staking", "rand 0.7.3", - "sp-runtime 7.0.0", + "sp-runtime", "sp-session", - "sp-std 5.0.0", + "sp-std", ] [[package]] @@ -6808,8 +6808,8 @@ dependencies = [ "parity-scale-codec", "rand_chacha 0.2.2", "scale-info", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -6828,11 +6828,11 @@ dependencies = [ "rand_chacha 0.2.2", "scale-info", "serde", - "sp-application-crypto 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", + "sp-application-crypto", + "sp-io", + "sp-runtime", "sp-staking", - "sp-std 5.0.0", + "sp-std", ] [[package]] @@ -6855,9 +6855,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6872,9 +6872,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-inherents", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-io", + "sp-runtime", + "sp-std", "sp-timestamp", ] @@ -6891,10 +6891,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6907,10 +6907,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6923,10 +6923,10 @@ dependencies = [ "parity-scale-codec", "sp-api", "sp-blockchain", - "sp-core 7.0.0", + "sp-core", "sp-rpc", - "sp-runtime 7.0.0", - "sp-weights 4.0.0", + "sp-runtime", + "sp-weights", ] [[package]] @@ -6937,8 +6937,8 @@ dependencies = [ "pallet-transaction-payment", "parity-scale-codec", "sp-api", - "sp-runtime 7.0.0", - "sp-weights 4.0.0", + "sp-runtime", + "sp-weights", ] [[package]] @@ -6954,8 +6954,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -6969,8 +6969,8 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -6983,10 +6983,10 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -7000,8 +7000,8 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -7149,15 +7149,6 @@ dependencies = [ "crypto-mac 0.11.1", ] -[[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest 0.10.3", -] - [[package]] name = "pear" version = "0.2.3" @@ -7306,15 +7297,15 @@ dependencies = [ "serde_path_to_error", "sgx-api-lite", "sidevm-host-runtime", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", - "sp-externalities 0.13.0", + "sp-application-crypto", + "sp-core", + "sp-externalities", "sp-finality-grandpa", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-runtime-interface 7.0.0", - "sp-state-machine 0.13.0", - "sp-trie 7.0.0", + "sp-io", + "sp-runtime", + "sp-runtime-interface", + "sp-state-machine", + "sp-trie", "surf", "thiserror", "tokio", @@ -7345,10 +7336,10 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", + "sp-application-crypto", + "sp-core", "sp-finality-grandpa", - "sp-runtime 7.0.0", + "sp-runtime", "tempdir", "tera", ] @@ -7385,8 +7376,8 @@ dependencies = [ "rand 0.8.5", "ring 0.16.20", "schnorrkel", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", + "sp-application-crypto", + "sp-core", "typenum", ] @@ -7402,7 +7393,7 @@ dependencies = [ "phala-serde-more", "scale-info", "serde", - "sp-core 7.0.0", + "sp-core", "spin 0.9.3", ] @@ -7471,16 +7462,16 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core 7.0.0", + "sp-core", "sp-finality-grandpa", "sp-inherents", - "sp-io 7.0.0", + "sp-io", "sp-keyring", - "sp-keystore 0.13.0", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", + "sp-keystore", + "sp-runtime", + "sp-state-machine", "sp-timestamp", - "sp-tracing 6.0.0", + "sp-tracing", "sp-transaction-pool", "sp-transaction-storage-proof", "substrate-build-script-utils", @@ -7514,7 +7505,7 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-runtime 7.0.0", + "sp-runtime", "thiserror", ] @@ -7599,14 +7590,14 @@ dependencies = [ "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core 7.0.0", + "sp-core", "sp-inherents", - "sp-io 7.0.0", + "sp-io", "sp-offchain", - "sp-runtime 7.0.0", + "sp-runtime", "sp-session", "sp-staking", - "sp-std 5.0.0", + "sp-std", "sp-transaction-pool", "sp-version", "static_assertions", @@ -7648,11 +7639,11 @@ dependencies = [ "rmrk-traits", "scale-info", "serde_json", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-application-crypto", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "untrusted 0.9.0", "webpki 0.22.0", "webpki 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -7682,7 +7673,7 @@ dependencies = [ "hex", "parity-scale-codec", "serde", - "sp-core 7.0.0", + "sp-core", ] [[package]] @@ -7699,11 +7690,11 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", - "sp-trie 7.0.0", + "sp-application-crypto", + "sp-core", + "sp-runtime", + "sp-state-machine", + "sp-trie", "trie-db", ] @@ -7717,7 +7708,7 @@ dependencies = [ "prpc", "scale-info", "serde", - "sp-core 7.0.0", + "sp-core", ] [[package]] @@ -7738,11 +7729,11 @@ dependencies = [ "pink-kv-session", "primitive-types", "scale-info", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-application-crypto", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -7759,7 +7750,7 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-core 11.0.0", + "sp-core", "subxt", "tokio", ] @@ -7793,9 +7784,9 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-core 7.0.0", + "sp-core", "sp-finality-grandpa", - "sp-runtime 7.0.0", + "sp-runtime", "tokio", ] @@ -7911,13 +7902,13 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.2", - "sp-core 7.0.0", - "sp-externalities 0.13.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", - "sp-std 5.0.0", - "sp-trie 7.0.0", + "sp-core", + "sp-externalities", + "sp-io", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", "wasmi-validation", "wat", ] @@ -7966,8 +7957,8 @@ dependencies = [ "reqwest", "reqwest-env-proxy", "ring 0.16.20", - "sp-core 7.0.0", - "sp-runtime-interface 7.0.0", + "sp-core", + "sp-runtime-interface", ] [[package]] @@ -8016,7 +8007,7 @@ dependencies = [ "primitive-types", "scale-info", "serde", - "sp-core-hashing 5.0.0", + "sp-core-hashing", "ss58-registry", "xcm", ] @@ -8859,8 +8850,8 @@ dependencies = [ "serde", "serde_cbor", "serde_json", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core", + "sp-runtime", "sqlx", "tokio", ] @@ -9029,8 +9020,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -9340,8 +9331,8 @@ version = "4.1.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "log", - "sp-core 7.0.0", - "sp-wasm-interface 7.0.0", + "sp-core", + "sp-wasm-interface", "thiserror", ] @@ -9365,9 +9356,9 @@ dependencies = [ "sp-api", "sp-authority-discovery", "sp-blockchain", - "sp-core 7.0.0", - "sp-keystore 0.13.0", - "sp-runtime 7.0.0", + "sp-core", + "sp-keystore", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", ] @@ -9389,9 +9380,9 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0", + "sp-core", "sp-inherents", - "sp-runtime 7.0.0", + "sp-runtime", "substrate-prometheus-endpoint", ] @@ -9405,10 +9396,10 @@ dependencies = [ "sp-api", "sp-block-builder", "sp-blockchain", - "sp-core 7.0.0", + "sp-core", "sp-inherents", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", + "sp-runtime", + "sp-state-machine", ] [[package]] @@ -9424,8 +9415,8 @@ dependencies = [ "sc-telemetry", "serde", "serde_json", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core", + "sp-runtime", ] [[package]] @@ -9468,14 +9459,14 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core 7.0.0", + "sp-core", "sp-keyring", - "sp-keystore 0.13.0", - "sp-panic-handler 5.0.0", - "sp-runtime 7.0.0", + "sp-keystore", + "sp-panic-handler", + "sp-runtime", "sp-version", "thiserror", - "tiny-bip39 0.8.2", + "tiny-bip39", "tokio", ] @@ -9496,14 +9487,14 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0", + "sp-core", "sp-database", - "sp-externalities 0.13.0", - "sp-keystore 0.13.0", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", - "sp-storage 7.0.0", - "sp-trie 7.0.0", + "sp-externalities", + "sp-keystore", + "sp-runtime", + "sp-state-machine", + "sp-storage", + "sp-trie", "substrate-prometheus-endpoint", ] @@ -9523,13 +9514,13 @@ dependencies = [ "parking_lot 0.12.1", "sc-client-api", "sc-state-db", - "sp-arithmetic 6.0.0", + "sp-arithmetic", "sp-blockchain", - "sp-core 7.0.0", + "sp-core", "sp-database", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", - "sp-trie 7.0.0", + "sp-runtime", + "sp-state-machine", + "sp-trie", ] [[package]] @@ -9550,9 +9541,9 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", + "sp-core", + "sp-runtime", + "sp-state-machine", "substrate-prometheus-endpoint", "thiserror", ] @@ -9581,18 +9572,18 @@ dependencies = [ "schnorrkel", "serde", "sp-api", - "sp-application-crypto 7.0.0", + "sp-application-crypto", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core 7.0.0", + "sp-core", "sp-inherents", - "sp-io 7.0.0", - "sp-keystore 0.13.0", - "sp-runtime 7.0.0", + "sp-io", + "sp-keystore", + "sp-runtime", "sp-version", "substrate-prometheus-endpoint", "thiserror", @@ -9610,13 +9601,13 @@ dependencies = [ "sc-rpc-api", "serde", "sp-api", - "sp-application-crypto 7.0.0", + "sp-application-crypto", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core 7.0.0", - "sp-keystore 0.13.0", - "sp-runtime 7.0.0", + "sp-core", + "sp-keystore", + "sp-runtime", "thiserror", ] @@ -9630,7 +9621,7 @@ dependencies = [ "sc-client-api", "sc-consensus", "sp-blockchain", - "sp-runtime 7.0.0", + "sp-runtime", ] [[package]] @@ -9646,14 +9637,14 @@ dependencies = [ "sc-client-api", "sc-consensus", "sc-telemetry", - "sp-arithmetic 6.0.0", + "sp-arithmetic", "sp-blockchain", "sp-consensus", "sp-consensus-slots", - "sp-core 7.0.0", + "sp-core", "sp-inherents", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", + "sp-runtime", + "sp-state-machine", "thiserror", ] @@ -9664,7 +9655,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb dependencies = [ "sc-client-api", "sp-authorship", - "sp-runtime 7.0.0", + "sp-runtime", "thiserror", ] @@ -9680,14 +9671,14 @@ dependencies = [ "sc-executor-wasmi", "sc-executor-wasmtime", "sp-api", - "sp-core 7.0.0", - "sp-externalities 0.13.0", - "sp-io 7.0.0", - "sp-panic-handler 5.0.0", - "sp-runtime-interface 7.0.0", - "sp-trie 7.0.0", + "sp-core", + "sp-externalities", + "sp-io", + "sp-panic-handler", + "sp-runtime-interface", + "sp-trie", "sp-version", - "sp-wasm-interface 7.0.0", + "sp-wasm-interface", "tracing", "wasmi 0.13.2", ] @@ -9699,7 +9690,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", - "sp-wasm-interface 7.0.0", + "sp-wasm-interface", "thiserror", "wasm-instrument 0.3.0", "wasmi 0.13.2", @@ -9713,8 +9704,8 @@ dependencies = [ "log", "sc-allocator", "sc-executor-common", - "sp-runtime-interface 7.0.0", - "sp-wasm-interface 7.0.0", + "sp-runtime-interface", + "sp-wasm-interface", "wasmi 0.13.2", ] @@ -9730,8 +9721,8 @@ dependencies = [ "rustix", "sc-allocator", "sc-executor-common", - "sp-runtime-interface 7.0.0", - "sp-wasm-interface 7.0.0", + "sp-runtime-interface", + "sp-wasm-interface", "wasmtime", ] @@ -9764,14 +9755,14 @@ dependencies = [ "sc-utils", "serde_json", "sp-api", - "sp-application-crypto 7.0.0", - "sp-arithmetic 6.0.0", + "sp-application-crypto", + "sp-arithmetic", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0", + "sp-core", "sp-finality-grandpa", - "sp-keystore 0.13.0", - "sp-runtime 7.0.0", + "sp-keystore", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", ] @@ -9792,8 +9783,8 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core", + "sp-runtime", "thiserror", ] @@ -9810,7 +9801,7 @@ dependencies = [ "sc-network-common", "sc-transaction-pool-api", "sp-blockchain", - "sp-runtime 7.0.0", + "sp-runtime", ] [[package]] @@ -9822,9 +9813,9 @@ dependencies = [ "async-trait", "parking_lot 0.12.1", "serde_json", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", - "sp-keystore 0.13.0", + "sp-application-crypto", + "sp-core", + "sp-keystore", "thiserror", ] @@ -9864,11 +9855,11 @@ dependencies = [ "serde", "serde_json", "smallvec", - "sp-arithmetic 6.0.0", + "sp-arithmetic", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", "unsigned-varint", @@ -9889,7 +9880,7 @@ dependencies = [ "sc-client-api", "sc-network-common", "sp-blockchain", - "sp-runtime 7.0.0", + "sp-runtime", "thiserror", "unsigned-varint", "void", @@ -9916,7 +9907,7 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-finality-grandpa", - "sp-runtime 7.0.0", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", ] @@ -9934,7 +9925,7 @@ dependencies = [ "lru", "sc-network-common", "sc-peerset", - "sp-runtime 7.0.0", + "sp-runtime", "substrate-prometheus-endpoint", "tracing", ] @@ -9955,8 +9946,8 @@ dependencies = [ "sc-network-common", "sc-peerset", "sp-blockchain", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core", + "sp-runtime", "thiserror", ] @@ -9982,12 +9973,12 @@ dependencies = [ "sc-peerset", "sc-utils", "smallvec", - "sp-arithmetic 6.0.0", + "sp-arithmetic", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0", + "sp-core", "sp-finality-grandpa", - "sp-runtime 7.0.0", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", ] @@ -10007,7 +9998,7 @@ dependencies = [ "sc-network-common", "sc-peerset", "sp-consensus", - "sp-runtime 7.0.0", + "sp-runtime", "substrate-prometheus-endpoint", ] @@ -10034,9 +10025,9 @@ dependencies = [ "sc-peerset", "sc-utils", "sp-api", - "sp-core 7.0.0", + "sp-core", "sp-offchain", - "sp-runtime 7.0.0", + "sp-runtime", "threadpool", "tracing", ] @@ -10084,11 +10075,11 @@ dependencies = [ "serde_json", "sp-api", "sp-blockchain", - "sp-core 7.0.0", - "sp-keystore 0.13.0", + "sp-core", + "sp-keystore", "sp-offchain", "sp-rpc", - "sp-runtime 7.0.0", + "sp-runtime", "sp-session", "sp-version", ] @@ -10108,10 +10099,10 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-core 7.0.0", + "sp-core", "sp-rpc", - "sp-runtime 7.0.0", - "sp-tracing 6.0.0", + "sp-runtime", + "sp-tracing", "sp-version", "thiserror", ] @@ -10146,8 +10137,8 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core", + "sp-runtime", "thiserror", ] @@ -10195,22 +10186,22 @@ dependencies = [ "serde", "serde_json", "sp-api", - "sp-application-crypto 7.0.0", + "sp-application-crypto", "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0", - "sp-externalities 0.13.0", + "sp-core", + "sp-externalities", "sp-inherents", - "sp-keystore 0.13.0", - "sp-runtime 7.0.0", + "sp-keystore", + "sp-runtime", "sp-session", - "sp-state-machine 0.13.0", - "sp-storage 7.0.0", - "sp-tracing 6.0.0", + "sp-state-machine", + "sp-storage", + "sp-tracing", "sp-transaction-pool", "sp-transaction-storage-proof", - "sp-trie 7.0.0", + "sp-trie", "sp-version", "static_init", "substrate-prometheus-endpoint", @@ -10244,15 +10235,15 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0", - "sp-externalities 0.13.0", - "sp-io 7.0.0", - "sp-panic-handler 5.0.0", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", - "sp-storage 7.0.0", - "sp-tracing 6.0.0", - "sp-trie 7.0.0", + "sp-core", + "sp-externalities", + "sp-io", + "sp-panic-handler", + "sp-runtime", + "sp-state-machine", + "sp-storage", + "sp-tracing", + "sp-trie", "substrate-test-runtime", "substrate-test-runtime-client", "tempfile", @@ -10268,7 +10259,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "sc-client-api", - "sp-core 7.0.0", + "sp-core", ] [[package]] @@ -10286,7 +10277,7 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-runtime 7.0.0", + "sp-runtime", "thiserror", ] @@ -10304,9 +10295,9 @@ dependencies = [ "sc-telemetry", "serde", "serde_json", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-io", + "sp-std", ] [[package]] @@ -10348,10 +10339,10 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-core 7.0.0", + "sp-core", "sp-rpc", - "sp-runtime 7.0.0", - "sp-tracing 6.0.0", + "sp-runtime", + "sp-tracing", "thiserror", "tracing", "tracing-log", @@ -10387,9 +10378,9 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-core 7.0.0", - "sp-runtime 7.0.0", - "sp-tracing 6.0.0", + "sp-core", + "sp-runtime", + "sp-tracing", "sp-transaction-pool", "substrate-prometheus-endpoint", "thiserror", @@ -10405,7 +10396,7 @@ dependencies = [ "log", "serde", "sp-blockchain", - "sp-runtime 7.0.0", + "sp-runtime", "thiserror", ] @@ -11173,11 +11164,11 @@ dependencies = [ "log", "parity-scale-codec", "sp-api-proc-macro", - "sp-core 7.0.0", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", - "sp-std 5.0.0", - "sp-trie 7.0.0", + "sp-core", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", "sp-version", "thiserror", ] @@ -11202,23 +11193,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-std 5.0.0", -] - -[[package]] -name = "sp-application-crypto" -version = "12.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a72575f160b1b134ee277a2ab46af4361c072a3fe661c48e474255406cb01c97" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 11.0.0", - "sp-io 12.0.0", - "sp-std 6.0.0", + "sp-core", + "sp-io", + "sp-std", ] [[package]] @@ -11231,23 +11208,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-debug-derive 5.0.0", - "sp-std 5.0.0", - "static_assertions", -] - -[[package]] -name = "sp-arithmetic" -version = "9.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2038010f7514d50775dcbd3edb569e17fa9bda63128580a9e172abb1795f2c1d" -dependencies = [ - "integer-sqrt", - "num-traits", - "parity-scale-codec", - "scale-info", - "serde", - "sp-std 6.0.0", + "sp-debug-derive", + "sp-std", "static_assertions", ] @@ -11259,9 +11221,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-application-crypto 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-application-crypto", + "sp-runtime", + "sp-std", ] [[package]] @@ -11272,8 +11234,8 @@ dependencies = [ "async-trait", "parity-scale-codec", "sp-inherents", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -11285,12 +11247,12 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", - "sp-io 7.0.0", + "sp-application-crypto", + "sp-core", + "sp-io", "sp-mmr-primitives", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -11301,8 +11263,8 @@ dependencies = [ "parity-scale-codec", "sp-api", "sp-inherents", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -11318,8 +11280,8 @@ dependencies = [ "sp-api", "sp-consensus", "sp-database", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", + "sp-runtime", + "sp-state-machine", "thiserror", ] @@ -11333,11 +11295,11 @@ dependencies = [ "futures-timer", "log", "parity-scale-codec", - "sp-core 7.0.0", + "sp-core", "sp-inherents", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-state-machine", + "sp-std", "sp-version", "thiserror", ] @@ -11351,12 +11313,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-application-crypto 7.0.0", + "sp-application-crypto", "sp-consensus", "sp-consensus-slots", "sp-inherents", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", "sp-timestamp", ] @@ -11371,15 +11333,15 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 7.0.0", + "sp-application-crypto", "sp-consensus", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core 7.0.0", + "sp-core", "sp-inherents", - "sp-keystore 0.13.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-keystore", + "sp-runtime", + "sp-std", "sp-timestamp", ] @@ -11391,9 +11353,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 6.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-arithmetic", + "sp-runtime", + "sp-std", "sp-timestamp", ] @@ -11405,9 +11367,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "schnorrkel", - "sp-core 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -11441,63 +11403,20 @@ dependencies = [ "secp256k1", "secrecy", "serde", - "sp-core-hashing 5.0.0", - "sp-debug-derive 5.0.0", - "sp-externalities 0.13.0", - "sp-runtime-interface 7.0.0", - "sp-std 5.0.0", - "sp-storage 7.0.0", + "sp-core-hashing", + "sp-debug-derive", + "sp-externalities", + "sp-runtime-interface", + "sp-std", + "sp-storage", "ss58-registry", "substrate-bip39", "thiserror", - "tiny-bip39 0.8.2", + "tiny-bip39", "wasmi 0.13.2", "zeroize", ] -[[package]] -name = "sp-core" -version = "11.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d99984f57c9eb858d29fbe0e4cf44092eec484b2ff72176d5afa4ab7bf1dc8b1" -dependencies = [ - "array-bytes", - "base58", - "bitflags", - "blake2", - "dyn-clonable", - "ed25519-zebra", - "futures", - "hash-db", - "hash256-std-hasher", - "impl-serde 0.4.0", - "lazy_static", - "libsecp256k1", - "log", - "merlin", - "parity-scale-codec", - "parking_lot 0.12.1", - "primitive-types", - "rand 0.8.5", - "regex", - "scale-info", - "schnorrkel", - "secp256k1", - "secrecy", - "serde", - "sp-core-hashing 6.0.0", - "sp-debug-derive 6.0.0", - "sp-externalities 0.15.0", - "sp-runtime-interface 10.0.0", - "sp-std 6.0.0", - "sp-storage 9.0.0", - "ss58-registry", - "substrate-bip39", - "thiserror", - "tiny-bip39 1.0.0", - "zeroize", -] - [[package]] name = "sp-core-hashing" version = "5.0.0" @@ -11508,22 +11427,7 @@ dependencies = [ "digest 0.10.3", "sha2 0.10.2", "sha3", - "sp-std 5.0.0", - "twox-hash", -] - -[[package]] -name = "sp-core-hashing" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc2d1947252b7a4e403b0a260f596920443742791765ec111daa2bbf98eff25" -dependencies = [ - "blake2", - "byteorder", - "digest 0.10.3", - "sha2 0.10.2", - "sha3", - "sp-std 6.0.0", + "sp-std", "twox-hash", ] @@ -11534,7 +11438,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb dependencies = [ "proc-macro2 1.0.47", "quote 1.0.20", - "sp-core-hashing 5.0.0", + "sp-core-hashing", "syn 1.0.98", ] @@ -11557,17 +11461,6 @@ dependencies = [ "syn 1.0.98", ] -[[package]] -name = "sp-debug-derive" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66fb9dc63d54de7d7bed62a505b6e0bd66c122525ea1abb348f6564717c3df2d" -dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.20", - "syn 1.0.98", -] - [[package]] name = "sp-externalities" version = "0.13.0" @@ -11575,20 +11468,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb dependencies = [ "environmental", "parity-scale-codec", - "sp-std 5.0.0", - "sp-storage 7.0.0", -] - -[[package]] -name = "sp-externalities" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc754e1cec66b93df0b48a8986d019c1a2a90431c42cf2614cc35a291597c329" -dependencies = [ - "environmental", - "parity-scale-codec", - "sp-std 6.0.0", - "sp-storage 9.0.0", + "sp-std", + "sp-storage", ] [[package]] @@ -11602,11 +11483,11 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", - "sp-keystore 0.13.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-application-crypto", + "sp-core", + "sp-keystore", + "sp-runtime", + "sp-std", ] [[package]] @@ -11617,9 +11498,9 @@ dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", - "sp-core 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-runtime", + "sp-std", "thiserror", ] @@ -11637,41 +11518,15 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "secp256k1", - "sp-core 7.0.0", - "sp-externalities 0.13.0", - "sp-keystore 0.13.0", - "sp-runtime-interface 7.0.0", - "sp-state-machine 0.13.0", - "sp-std 5.0.0", - "sp-tracing 6.0.0", - "sp-trie 7.0.0", - "sp-wasm-interface 7.0.0", - "tracing", - "tracing-core", -] - -[[package]] -name = "sp-io" -version = "12.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ac917b37c7733e3778e7ffc3958f1181a151ac3b14116d65fb10fe7b08db10e" -dependencies = [ - "bytes 1.1.0", - "ed25519", - "ed25519-dalek", - "futures", - "libsecp256k1", - "log", - "parity-scale-codec", - "secp256k1", - "sp-core 11.0.0", - "sp-externalities 0.15.0", - "sp-keystore 0.17.0", - "sp-runtime-interface 10.0.0", - "sp-state-machine 0.17.0", - "sp-std 6.0.0", - "sp-tracing 7.0.0", - "sp-trie 11.0.0", + "sp-core", + "sp-externalities", + "sp-keystore", + "sp-runtime-interface", + "sp-state-machine", + "sp-std", + "sp-tracing", + "sp-trie", + "sp-wasm-interface", "tracing", "tracing-core", ] @@ -11682,8 +11537,8 @@ version = "7.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "lazy_static", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core", + "sp-runtime", "strum", ] @@ -11699,25 +11554,8 @@ dependencies = [ "parking_lot 0.12.1", "schnorrkel", "serde", - "sp-core 7.0.0", - "sp-externalities 0.13.0", - "thiserror", -] - -[[package]] -name = "sp-keystore" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ada8b7a72404bda58b3353830bc42f027ec764e13a28b4cd4386cf34fb1ae7c" -dependencies = [ - "async-trait", - "futures", - "merlin", - "parity-scale-codec", - "parking_lot 0.12.1", - "schnorrkel", - "sp-core 11.0.0", - "sp-externalities 0.15.0", + "sp-core", + "sp-externalities", "thiserror", ] @@ -11741,10 +11579,10 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-core 7.0.0", - "sp-debug-derive 5.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-debug-derive", + "sp-runtime", + "sp-std", "thiserror", ] @@ -11756,10 +11594,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 6.0.0", - "sp-core 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-arithmetic", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -11768,8 +11606,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "sp-api", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core", + "sp-runtime", ] [[package]] @@ -11782,17 +11620,6 @@ dependencies = [ "regex", ] -[[package]] -name = "sp-panic-handler" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4abed79c3d5b3622f65ab065676addd9923b9b122cd257df23e2757ce487c6d2" -dependencies = [ - "backtrace", - "lazy_static", - "regex", -] - [[package]] name = "sp-rpc" version = "6.0.0" @@ -11800,7 +11627,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb dependencies = [ "rustc-hash", "serde", - "sp-core 7.0.0", + "sp-core", ] [[package]] @@ -11817,35 +11644,12 @@ dependencies = [ "rand 0.7.3", "scale-info", "serde", - "sp-application-crypto 7.0.0", - "sp-arithmetic 6.0.0", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-std 5.0.0", - "sp-weights 4.0.0", -] - -[[package]] -name = "sp-runtime" -version = "12.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c86578c67b060a6ecab52af64f1cf18b3892fca7fba5ffc5c49934b2e76b1929" -dependencies = [ - "either", - "hash256-std-hasher", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "paste", - "rand 0.8.5", - "scale-info", - "serde", - "sp-application-crypto 12.0.0", - "sp-arithmetic 9.0.0", - "sp-core 11.0.0", - "sp-io 12.0.0", - "sp-std 6.0.0", - "sp-weights 8.0.0", + "sp-application-crypto", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-std", + "sp-weights", ] [[package]] @@ -11857,31 +11661,12 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", - "sp-externalities 0.13.0", - "sp-runtime-interface-proc-macro 6.0.0", - "sp-std 5.0.0", - "sp-storage 7.0.0", - "sp-tracing 6.0.0", - "sp-wasm-interface 7.0.0", - "static_assertions", -] - -[[package]] -name = "sp-runtime-interface" -version = "10.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3858935567385728ea45f6d159f9970b0b278eb22a8e77625bbf4a63e43a85a" -dependencies = [ - "bytes 1.1.0", - "impl-trait-for-tuples", - "parity-scale-codec", - "primitive-types", - "sp-externalities 0.15.0", - "sp-runtime-interface-proc-macro 7.0.0", - "sp-std 6.0.0", - "sp-storage 9.0.0", - "sp-tracing 7.0.0", - "sp-wasm-interface 8.0.0", + "sp-externalities", + "sp-runtime-interface-proc-macro", + "sp-std", + "sp-storage", + "sp-tracing", + "sp-wasm-interface", "static_assertions", ] @@ -11897,19 +11682,6 @@ dependencies = [ "syn 1.0.98", ] -[[package]] -name = "sp-runtime-interface-proc-macro" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00083a77e938c4f35d0bde7ca0b6e5f616158ebe11af6063795aa664d92a238b" -dependencies = [ - "Inflector", - "proc-macro-crate", - "proc-macro2 1.0.47", - "quote 1.0.20", - "syn 1.0.98", -] - [[package]] name = "sp-session" version = "4.0.0-dev" @@ -11918,10 +11690,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core", + "sp-runtime", "sp-staking", - "sp-std 5.0.0", + "sp-std", ] [[package]] @@ -11931,9 +11703,9 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb dependencies = [ "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -11948,48 +11720,21 @@ dependencies = [ "parking_lot 0.12.1", "rand 0.7.3", "smallvec", - "sp-core 7.0.0", - "sp-externalities 0.13.0", - "sp-panic-handler 5.0.0", - "sp-std 5.0.0", - "sp-trie 7.0.0", + "sp-core", + "sp-externalities", + "sp-panic-handler", + "sp-std", + "sp-trie", "thiserror", "tracing", "trie-root", ] -[[package]] -name = "sp-state-machine" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fd4c600df0b5abf26c19b6c61d928b64e0c2b8a709a3dbef872be0507cd1ca" -dependencies = [ - "hash-db", - "log", - "parity-scale-codec", - "parking_lot 0.12.1", - "rand 0.8.5", - "smallvec", - "sp-core 11.0.0", - "sp-externalities 0.15.0", - "sp-panic-handler 6.0.0", - "sp-std 6.0.0", - "sp-trie 11.0.0", - "thiserror", - "tracing", -] - [[package]] name = "sp-std" version = "5.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" -[[package]] -name = "sp-std" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af0ee286f98455272f64ac5bb1384ff21ac029fbb669afbaf48477faff12760e" - [[package]] name = "sp-storage" version = "7.0.0" @@ -11999,22 +11744,8 @@ dependencies = [ "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 5.0.0", - "sp-std 5.0.0", -] - -[[package]] -name = "sp-storage" -version = "9.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9acb4059eb0ae4fa8cf9ca9119b0178ad312a592d4c6054bd17b411034f233e9" -dependencies = [ - "impl-serde 0.4.0", - "parity-scale-codec", - "ref-cast", - "serde", - "sp-debug-derive 6.0.0", - "sp-std 6.0.0", + "sp-debug-derive", + "sp-std", ] [[package]] @@ -12028,8 +11759,8 @@ dependencies = [ "parity-scale-codec", "sp-api", "sp-inherents", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", "thiserror", ] @@ -12039,20 +11770,7 @@ version = "6.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", - "sp-std 5.0.0", - "tracing", - "tracing-core", - "tracing-subscriber 0.2.25", -] - -[[package]] -name = "sp-tracing" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22d28a0bc2365dfb86644d14f2682a79da35891d4656d4896fb09fb05ff1e6c" -dependencies = [ - "parity-scale-codec", - "sp-std 6.0.0", + "sp-std", "tracing", "tracing-core", "tracing-subscriber 0.2.25", @@ -12064,7 +11782,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "sp-api", - "sp-runtime 7.0.0", + "sp-runtime", ] [[package]] @@ -12076,11 +11794,11 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", + "sp-core", "sp-inherents", - "sp-runtime 7.0.0", - "sp-std 5.0.0", - "sp-trie 7.0.0", + "sp-runtime", + "sp-std", + "sp-trie", ] [[package]] @@ -12098,32 +11816,8 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "scale-info", - "sp-core 7.0.0", - "sp-std 5.0.0", - "thiserror", - "tracing", - "trie-db", - "trie-root", -] - -[[package]] -name = "sp-trie" -version = "11.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db085f134cb444e52ca569a442d12c84bd17667532613d78dd6f568942632da4" -dependencies = [ - "ahash", - "hash-db", - "hashbrown 0.12.3", - "lazy_static", - "lru", - "memory-db", - "nohash-hasher", - "parity-scale-codec", - "parking_lot 0.12.1", - "scale-info", - "sp-core 11.0.0", - "sp-std 6.0.0", + "sp-core", + "sp-std", "thiserror", "tracing", "trie-db", @@ -12141,8 +11835,8 @@ dependencies = [ "scale-info", "serde", "sp-core-hashing-proc-macro", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", "sp-version-proc-macro", "thiserror", ] @@ -12166,21 +11860,7 @@ dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std 5.0.0", - "wasmi 0.13.2", - "wasmtime", -] - -[[package]] -name = "sp-wasm-interface" -version = "8.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ebc377987d42f8fc20e3f4ec4fd1147dd098fe90bcb4269e1eddb04e920f889" -dependencies = [ - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "sp-std 6.0.0", + "sp-std", "wasmi 0.13.2", "wasmtime", ] @@ -12195,26 +11875,10 @@ dependencies = [ "scale-info", "serde", "smallvec", - "sp-arithmetic 6.0.0", - "sp-core 7.0.0", - "sp-debug-derive 5.0.0", - "sp-std 5.0.0", -] - -[[package]] -name = "sp-weights" -version = "8.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90eca2a19f48978e9cd605e23905d0602419f7880a9360ac717b03412e9c7916" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "smallvec", - "sp-arithmetic 9.0.0", - "sp-core 11.0.0", - "sp-debug-derive 6.0.0", - "sp-std 6.0.0", + "sp-arithmetic", + "sp-core", + "sp-debug-derive", + "sp-std", ] [[package]] @@ -12557,8 +12221,8 @@ dependencies = [ "frame-support", "frame-system", "sc-cli", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core", + "sp-runtime", ] [[package]] @@ -12578,8 +12242,8 @@ dependencies = [ "sp-api", "sp-block-builder", "sp-blockchain", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core", + "sp-runtime", ] [[package]] @@ -12605,7 +12269,7 @@ dependencies = [ "log", "sc-rpc-api", "serde", - "sp-runtime 7.0.0", + "sp-runtime", ] [[package]] @@ -12627,11 +12291,11 @@ dependencies = [ "serde_json", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0", + "sp-core", "sp-keyring", - "sp-keystore 0.13.0", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", + "sp-keystore", + "sp-runtime", + "sp-state-machine", ] [[package]] @@ -12653,25 +12317,25 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 7.0.0", + "sp-application-crypto", "sp-beefy", "sp-block-builder", "sp-consensus-aura", "sp-consensus-babe", - "sp-core 7.0.0", - "sp-externalities 0.13.0", + "sp-core", + "sp-externalities", "sp-finality-grandpa", "sp-inherents", - "sp-io 7.0.0", + "sp-io", "sp-keyring", "sp-offchain", - "sp-runtime 7.0.0", - "sp-runtime-interface 7.0.0", + "sp-runtime", + "sp-runtime-interface", "sp-session", - "sp-state-machine 0.13.0", - "sp-std 5.0.0", + "sp-state-machine", + "sp-std", "sp-transaction-pool", - "sp-trie 7.0.0", + "sp-trie", "sp-version", "substrate-wasm-builder", "trie-db", @@ -12690,8 +12354,8 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core", + "sp-runtime", "substrate-test-client", "substrate-test-runtime", ] @@ -12741,9 +12405,9 @@ dependencies = [ "scale-value", "serde", "serde_json", - "sp-core 11.0.0", - "sp-core-hashing 6.0.0", - "sp-runtime 12.0.0", + "sp-core", + "sp-core-hashing", + "sp-runtime", "subxt-macro", "subxt-metadata", "thiserror", @@ -12786,7 +12450,7 @@ dependencies = [ "frame-metadata", "parity-scale-codec", "scale-info", - "sp-core-hashing 6.0.0", + "sp-core-hashing", ] [[package]] @@ -13105,25 +12769,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "tiny-bip39" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861" -dependencies = [ - "anyhow", - "hmac 0.12.1", - "once_cell", - "pbkdf2 0.11.0", - "rand 0.8.5", - "rustc-hash", - "sha2 0.10.2", - "thiserror", - "unicode-normalization", - "wasm-bindgen", - "zeroize", -] - [[package]] name = "tiny-keccak" version = "2.0.2" @@ -13530,16 +13175,16 @@ dependencies = [ "sc-service", "serde", "sp-api", - "sp-core 7.0.0", - "sp-debug-derive 5.0.0", - "sp-externalities 0.13.0", - "sp-io 7.0.0", - "sp-keystore 0.13.0", + "sp-core", + "sp-debug-derive", + "sp-externalities", + "sp-io", + "sp-keystore", "sp-rpc", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", + "sp-runtime", + "sp-state-machine", "sp-version", - "sp-weights 4.0.0", + "sp-weights", "substrate-rpc-client", "zstd", ] @@ -14944,7 +14589,7 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-runtime 7.0.0", + "sp-runtime", "xcm-procedural", ] diff --git a/crates/phaxt/Cargo.toml b/crates/phaxt/Cargo.toml index fc46e5462b..1fee19b7f9 100644 --- a/crates/phaxt/Cargo.toml +++ b/crates/phaxt/Cargo.toml @@ -16,5 +16,5 @@ phala-types = { path = "../phala-types" } phala-node-rpc-ext-types = { path = "../phala-node-rpc-ext/types" } phala-pallets = { path = "../../pallets/phala" } jsonrpsee = "0.16.2" -sp-core = { version = "11.0.0", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } primitive-types = { version = "0.12.0", default-features = false } diff --git a/standalone/prouter/Cargo.lock b/standalone/prouter/Cargo.lock index dc7cafcdf1..db2fe91986 100644 --- a/standalone/prouter/Cargo.lock +++ b/standalone/prouter/Cargo.lock @@ -1137,13 +1137,13 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-runtime-interface 7.0.0", - "sp-std 5.0.0", - "sp-storage 7.0.0", + "sp-application-crypto", + "sp-core", + "sp-io", + "sp-runtime", + "sp-runtime-interface", + "sp-std", + "sp-storage", ] [[package]] @@ -1167,11 +1167,11 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-arithmetic 6.0.0", - "sp-core 7.0.0", + "sp-arithmetic", + "sp-core", "sp-npos-elections", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -1183,11 +1183,11 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", - "sp-tracing 6.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-tracing", ] [[package]] @@ -1220,17 +1220,17 @@ dependencies = [ "serde", "smallvec", "sp-api", - "sp-arithmetic 6.0.0", - "sp-core 7.0.0", + "sp-arithmetic", + "sp-core", "sp-core-hashing-proc-macro", "sp-inherents", - "sp-io 7.0.0", - "sp-runtime 7.0.0", + "sp-io", + "sp-runtime", "sp-staking", - "sp-state-machine 0.13.0", - "sp-std 5.0.0", - "sp-tracing 6.0.0", - "sp-weights 4.0.0", + "sp-state-machine", + "sp-std", + "sp-tracing", + "sp-weights", "tt-call", ] @@ -1280,12 +1280,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "sp-version", - "sp-weights 4.0.0", + "sp-weights", ] [[package]] @@ -1298,9 +1298,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -1320,8 +1320,8 @@ dependencies = [ "frame-support", "parity-scale-codec", "sp-api", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -2327,9 +2327,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-application-crypto", + "sp-core", + "sp-runtime", ] [[package]] @@ -2515,9 +2515,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -2530,10 +2530,10 @@ dependencies = [ "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto 7.0.0", + "sp-application-crypto", "sp-authority-discovery", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -2547,8 +2547,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-authorship", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -2565,14 +2565,14 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto 7.0.0", + "sp-application-crypto", "sp-consensus-babe", "sp-consensus-vrf", - "sp-io 7.0.0", - "sp-runtime 7.0.0", + "sp-io", + "sp-runtime", "sp-session", "sp-staking", - "sp-std 5.0.0", + "sp-std", ] [[package]] @@ -2588,11 +2588,11 @@ dependencies = [ "pallet-balances", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", - "sp-tracing 6.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-tracing", ] [[package]] @@ -2606,8 +2606,8 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -2622,10 +2622,10 @@ dependencies = [ "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -2641,10 +2641,10 @@ dependencies = [ "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -2658,10 +2658,10 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -2676,10 +2676,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -2696,12 +2696,12 @@ dependencies = [ "parity-scale-codec", "rand 0.7.3", "scale-info", - "sp-arithmetic 6.0.0", - "sp-core 7.0.0", - "sp-io 7.0.0", + "sp-arithmetic", + "sp-core", + "sp-io", "sp-npos-elections", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", "static_assertions", "strum", ] @@ -2716,7 +2716,7 @@ dependencies = [ "frame-system", "parity-scale-codec", "sp-npos-elections", - "sp-runtime 7.0.0", + "sp-runtime", ] [[package]] @@ -2730,11 +2730,11 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", + "sp-core", + "sp-io", "sp-npos-elections", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -2749,10 +2749,10 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-io 7.0.0", - "sp-runtime 7.0.0", + "sp-io", + "sp-runtime", "sp-staking", - "sp-std 5.0.0", + "sp-std", ] [[package]] @@ -2768,14 +2768,14 @@ dependencies = [ "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", + "sp-application-crypto", + "sp-core", "sp-finality-grandpa", - "sp-io 7.0.0", - "sp-runtime 7.0.0", + "sp-io", + "sp-runtime", "sp-session", "sp-staking", - "sp-std 5.0.0", + "sp-std", ] [[package]] @@ -2789,9 +2789,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -2806,12 +2806,12 @@ dependencies = [ "pallet-authorship", "parity-scale-codec", "scale-info", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", + "sp-application-crypto", + "sp-core", + "sp-io", + "sp-runtime", "sp-staking", - "sp-std 5.0.0", + "sp-std", ] [[package]] @@ -2824,11 +2824,11 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", + "sp-core", + "sp-io", "sp-keyring", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -2841,8 +2841,8 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -2856,10 +2856,10 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -2881,9 +2881,9 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -2896,11 +2896,11 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", + "sp-core", + "sp-io", + "sp-runtime", "sp-staking", - "sp-std 5.0.0", + "sp-std", ] [[package]] @@ -2917,10 +2917,10 @@ dependencies = [ "pallet-staking", "parity-scale-codec", "scale-info", - "sp-runtime 7.0.0", - "sp-runtime-interface 7.0.0", + "sp-runtime", + "sp-runtime-interface", "sp-staking", - "sp-std 5.0.0", + "sp-std", ] [[package]] @@ -2930,7 +2930,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb dependencies = [ "parity-scale-codec", "sp-api", - "sp-std 5.0.0", + "sp-std", ] [[package]] @@ -2945,9 +2945,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-runtime 7.0.0", + "sp-runtime", "sp-staking", - "sp-std 5.0.0", + "sp-std", ] [[package]] @@ -2968,9 +2968,9 @@ dependencies = [ "pallet-staking", "parity-scale-codec", "scale-info", - "sp-runtime 7.0.0", + "sp-runtime", "sp-staking", - "sp-std 5.0.0", + "sp-std", ] [[package]] @@ -2984,10 +2984,10 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -3000,9 +3000,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -3015,8 +3015,8 @@ dependencies = [ "parity-scale-codec", "safe-mix", "scale-info", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -3029,9 +3029,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -3048,8 +3048,8 @@ dependencies = [ "rmrk-traits", "scale-info", "serde", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -3063,10 +3063,10 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", - "sp-weights 4.0.0", + "sp-io", + "sp-runtime", + "sp-std", + "sp-weights", ] [[package]] @@ -3081,13 +3081,13 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", + "sp-core", + "sp-io", + "sp-runtime", "sp-session", "sp-staking", - "sp-std 5.0.0", - "sp-trie 7.0.0", + "sp-std", + "sp-trie", ] [[package]] @@ -3101,9 +3101,9 @@ dependencies = [ "pallet-session", "pallet-staking", "rand 0.7.3", - "sp-runtime 7.0.0", + "sp-runtime", "sp-session", - "sp-std 5.0.0", + "sp-std", ] [[package]] @@ -3116,8 +3116,8 @@ dependencies = [ "parity-scale-codec", "rand_chacha 0.2.2", "scale-info", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -3135,11 +3135,11 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-application-crypto 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", + "sp-application-crypto", + "sp-io", + "sp-runtime", "sp-staking", - "sp-std 5.0.0", + "sp-std", ] [[package]] @@ -3162,9 +3162,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -3179,9 +3179,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-inherents", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-io", + "sp-runtime", + "sp-std", "sp-timestamp", ] @@ -3198,10 +3198,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -3214,10 +3214,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -3228,8 +3228,8 @@ dependencies = [ "pallet-transaction-payment", "parity-scale-codec", "sp-api", - "sp-runtime 7.0.0", - "sp-weights 4.0.0", + "sp-runtime", + "sp-weights", ] [[package]] @@ -3245,8 +3245,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -3260,8 +3260,8 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -3274,10 +3274,10 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -3291,8 +3291,8 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -3496,10 +3496,10 @@ dependencies = [ "reqwest", "scale-info", "serde", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", + "sp-application-crypto", + "sp-core", "sp-finality-grandpa", - "sp-runtime 7.0.0", + "sp-runtime", "tempdir", "tera", ] @@ -3519,8 +3519,8 @@ dependencies = [ "curve25519-dalek 2.1.3", "ring 0.16.20", "schnorrkel", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", + "sp-application-crypto", + "sp-core", ] [[package]] @@ -3535,7 +3535,7 @@ dependencies = [ "phala-serde-more", "scale-info", "serde", - "sp-core 7.0.0", + "sp-core", "spin 0.9.4", ] @@ -3620,14 +3620,14 @@ dependencies = [ "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core 7.0.0", + "sp-core", "sp-inherents", - "sp-io 7.0.0", + "sp-io", "sp-offchain", - "sp-runtime 7.0.0", + "sp-runtime", "sp-session", "sp-staking", - "sp-std 5.0.0", + "sp-std", "sp-transaction-pool", "sp-version", "static_assertions", @@ -3661,11 +3661,11 @@ dependencies = [ "rmrk-traits", "scale-info", "serde_json", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-application-crypto", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "untrusted 0.9.0", "webpki 0.22.0", "webpki 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3678,7 +3678,7 @@ dependencies = [ "hex", "parity-scale-codec", "serde", - "sp-core 7.0.0", + "sp-core", ] [[package]] @@ -3690,9 +3690,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0", - "sp-state-machine 0.13.0", - "sp-trie 7.0.0", + "sp-core", + "sp-state-machine", + "sp-trie", "trie-db", ] @@ -3706,7 +3706,7 @@ dependencies = [ "prpc", "scale-info", "serde", - "sp-core 7.0.0", + "sp-core", ] [[package]] @@ -3722,11 +3722,11 @@ dependencies = [ "parity-scale-codec", "primitive-types", "scale-info", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-application-crypto", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -3743,7 +3743,7 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-core 11.0.0", + "sp-core", "subxt", "tokio", ] @@ -4413,8 +4413,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -4979,11 +4979,11 @@ dependencies = [ "log", "parity-scale-codec", "sp-api-proc-macro", - "sp-core 7.0.0", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", - "sp-std 5.0.0", - "sp-trie 7.0.0", + "sp-core", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", "sp-version", "thiserror", ] @@ -5008,23 +5008,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-std 5.0.0", -] - -[[package]] -name = "sp-application-crypto" -version = "12.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a72575f160b1b134ee277a2ab46af4361c072a3fe661c48e474255406cb01c97" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 11.0.0", - "sp-io 12.0.0", - "sp-std 6.0.0", + "sp-core", + "sp-io", + "sp-std", ] [[package]] @@ -5037,23 +5023,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-debug-derive 5.0.0", - "sp-std 5.0.0", - "static_assertions", -] - -[[package]] -name = "sp-arithmetic" -version = "9.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2038010f7514d50775dcbd3edb569e17fa9bda63128580a9e172abb1795f2c1d" -dependencies = [ - "integer-sqrt", - "num-traits", - "parity-scale-codec", - "scale-info", - "serde", - "sp-std 6.0.0", + "sp-debug-derive", + "sp-std", "static_assertions", ] @@ -5065,9 +5036,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-application-crypto 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-application-crypto", + "sp-runtime", + "sp-std", ] [[package]] @@ -5078,8 +5049,8 @@ dependencies = [ "async-trait", "parity-scale-codec", "sp-inherents", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -5090,8 +5061,8 @@ dependencies = [ "parity-scale-codec", "sp-api", "sp-inherents", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -5104,11 +5075,11 @@ dependencies = [ "futures-timer", "log", "parity-scale-codec", - "sp-core 7.0.0", + "sp-core", "sp-inherents", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-state-machine", + "sp-std", "sp-version", "thiserror", ] @@ -5124,15 +5095,15 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 7.0.0", + "sp-application-crypto", "sp-consensus", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core 7.0.0", + "sp-core", "sp-inherents", - "sp-keystore 0.13.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-keystore", + "sp-runtime", + "sp-std", "sp-timestamp", ] @@ -5144,9 +5115,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 6.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-arithmetic", + "sp-runtime", + "sp-std", "sp-timestamp", ] @@ -5158,9 +5129,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "schnorrkel", - "sp-core 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -5194,63 +5165,20 @@ dependencies = [ "secp256k1", "secrecy", "serde", - "sp-core-hashing 5.0.0", - "sp-debug-derive 5.0.0", - "sp-externalities 0.13.0", - "sp-runtime-interface 7.0.0", - "sp-std 5.0.0", - "sp-storage 7.0.0", + "sp-core-hashing", + "sp-debug-derive", + "sp-externalities", + "sp-runtime-interface", + "sp-std", + "sp-storage", "ss58-registry", "substrate-bip39", "thiserror", - "tiny-bip39 0.8.2", + "tiny-bip39", "wasmi", "zeroize", ] -[[package]] -name = "sp-core" -version = "11.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d99984f57c9eb858d29fbe0e4cf44092eec484b2ff72176d5afa4ab7bf1dc8b1" -dependencies = [ - "array-bytes", - "base58", - "bitflags", - "blake2", - "dyn-clonable", - "ed25519-zebra", - "futures", - "hash-db", - "hash256-std-hasher", - "impl-serde", - "lazy_static", - "libsecp256k1", - "log", - "merlin", - "parity-scale-codec", - "parking_lot", - "primitive-types", - "rand 0.8.5", - "regex", - "scale-info", - "schnorrkel", - "secp256k1", - "secrecy", - "serde", - "sp-core-hashing 6.0.0", - "sp-debug-derive 6.0.0", - "sp-externalities 0.15.0", - "sp-runtime-interface 10.0.0", - "sp-std 6.0.0", - "sp-storage 9.0.0", - "ss58-registry", - "substrate-bip39", - "thiserror", - "tiny-bip39 1.0.0", - "zeroize", -] - [[package]] name = "sp-core-hashing" version = "5.0.0" @@ -5261,22 +5189,7 @@ dependencies = [ "digest 0.10.3", "sha2 0.10.2", "sha3", - "sp-std 5.0.0", - "twox-hash", -] - -[[package]] -name = "sp-core-hashing" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc2d1947252b7a4e403b0a260f596920443742791765ec111daa2bbf98eff25" -dependencies = [ - "blake2", - "byteorder", - "digest 0.10.3", - "sha2 0.10.2", - "sha3", - "sp-std 6.0.0", + "sp-std", "twox-hash", ] @@ -5287,7 +5200,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb dependencies = [ "proc-macro2 1.0.43", "quote 1.0.21", - "sp-core-hashing 5.0.0", + "sp-core-hashing", "syn 1.0.99", ] @@ -5301,17 +5214,6 @@ dependencies = [ "syn 1.0.99", ] -[[package]] -name = "sp-debug-derive" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66fb9dc63d54de7d7bed62a505b6e0bd66c122525ea1abb348f6564717c3df2d" -dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", -] - [[package]] name = "sp-externalities" version = "0.13.0" @@ -5319,20 +5221,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb dependencies = [ "environmental", "parity-scale-codec", - "sp-std 5.0.0", - "sp-storage 7.0.0", -] - -[[package]] -name = "sp-externalities" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc754e1cec66b93df0b48a8986d019c1a2a90431c42cf2614cc35a291597c329" -dependencies = [ - "environmental", - "parity-scale-codec", - "sp-std 6.0.0", - "sp-storage 9.0.0", + "sp-std", + "sp-storage", ] [[package]] @@ -5346,11 +5236,11 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", - "sp-keystore 0.13.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-application-crypto", + "sp-core", + "sp-keystore", + "sp-runtime", + "sp-std", ] [[package]] @@ -5361,9 +5251,9 @@ dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", - "sp-core 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-runtime", + "sp-std", "thiserror", ] @@ -5381,41 +5271,15 @@ dependencies = [ "parity-scale-codec", "parking_lot", "secp256k1", - "sp-core 7.0.0", - "sp-externalities 0.13.0", - "sp-keystore 0.13.0", - "sp-runtime-interface 7.0.0", - "sp-state-machine 0.13.0", - "sp-std 5.0.0", - "sp-tracing 6.0.0", - "sp-trie 7.0.0", - "sp-wasm-interface 7.0.0", - "tracing", - "tracing-core", -] - -[[package]] -name = "sp-io" -version = "12.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ac917b37c7733e3778e7ffc3958f1181a151ac3b14116d65fb10fe7b08db10e" -dependencies = [ - "bytes", - "ed25519", - "ed25519-dalek", - "futures", - "libsecp256k1", - "log", - "parity-scale-codec", - "secp256k1", - "sp-core 11.0.0", - "sp-externalities 0.15.0", - "sp-keystore 0.17.0", - "sp-runtime-interface 10.0.0", - "sp-state-machine 0.17.0", - "sp-std 6.0.0", - "sp-tracing 7.0.0", - "sp-trie 11.0.0", + "sp-core", + "sp-externalities", + "sp-keystore", + "sp-runtime-interface", + "sp-state-machine", + "sp-std", + "sp-tracing", + "sp-trie", + "sp-wasm-interface", "tracing", "tracing-core", ] @@ -5426,8 +5290,8 @@ version = "7.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "lazy_static", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core", + "sp-runtime", "strum", ] @@ -5442,25 +5306,8 @@ dependencies = [ "parity-scale-codec", "parking_lot", "schnorrkel", - "sp-core 7.0.0", - "sp-externalities 0.13.0", - "thiserror", -] - -[[package]] -name = "sp-keystore" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ada8b7a72404bda58b3353830bc42f027ec764e13a28b4cd4386cf34fb1ae7c" -dependencies = [ - "async-trait", - "futures", - "merlin", - "parity-scale-codec", - "parking_lot", - "schnorrkel", - "sp-core 11.0.0", - "sp-externalities 0.15.0", + "sp-core", + "sp-externalities", "thiserror", ] @@ -5472,10 +5319,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 6.0.0", - "sp-core 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-arithmetic", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -5484,8 +5331,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "sp-api", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core", + "sp-runtime", ] [[package]] @@ -5498,17 +5345,6 @@ dependencies = [ "regex", ] -[[package]] -name = "sp-panic-handler" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4abed79c3d5b3622f65ab065676addd9923b9b122cd257df23e2757ce487c6d2" -dependencies = [ - "backtrace", - "lazy_static", - "regex", -] - [[package]] name = "sp-runtime" version = "7.0.0" @@ -5523,35 +5359,12 @@ dependencies = [ "rand 0.7.3", "scale-info", "serde", - "sp-application-crypto 7.0.0", - "sp-arithmetic 6.0.0", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-std 5.0.0", - "sp-weights 4.0.0", -] - -[[package]] -name = "sp-runtime" -version = "12.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c86578c67b060a6ecab52af64f1cf18b3892fca7fba5ffc5c49934b2e76b1929" -dependencies = [ - "either", - "hash256-std-hasher", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "paste", - "rand 0.8.5", - "scale-info", - "serde", - "sp-application-crypto 12.0.0", - "sp-arithmetic 9.0.0", - "sp-core 11.0.0", - "sp-io 12.0.0", - "sp-std 6.0.0", - "sp-weights 8.0.0", + "sp-application-crypto", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-std", + "sp-weights", ] [[package]] @@ -5563,31 +5376,12 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", - "sp-externalities 0.13.0", - "sp-runtime-interface-proc-macro 6.0.0", - "sp-std 5.0.0", - "sp-storage 7.0.0", - "sp-tracing 6.0.0", - "sp-wasm-interface 7.0.0", - "static_assertions", -] - -[[package]] -name = "sp-runtime-interface" -version = "10.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3858935567385728ea45f6d159f9970b0b278eb22a8e77625bbf4a63e43a85a" -dependencies = [ - "bytes", - "impl-trait-for-tuples", - "parity-scale-codec", - "primitive-types", - "sp-externalities 0.15.0", - "sp-runtime-interface-proc-macro 7.0.0", - "sp-std 6.0.0", - "sp-storage 9.0.0", - "sp-tracing 7.0.0", - "sp-wasm-interface 8.0.0", + "sp-externalities", + "sp-runtime-interface-proc-macro", + "sp-std", + "sp-storage", + "sp-tracing", + "sp-wasm-interface", "static_assertions", ] @@ -5603,19 +5397,6 @@ dependencies = [ "syn 1.0.99", ] -[[package]] -name = "sp-runtime-interface-proc-macro" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00083a77e938c4f35d0bde7ca0b6e5f616158ebe11af6063795aa664d92a238b" -dependencies = [ - "Inflector", - "proc-macro-crate", - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", -] - [[package]] name = "sp-session" version = "4.0.0-dev" @@ -5624,10 +5405,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core", + "sp-runtime", "sp-staking", - "sp-std 5.0.0", + "sp-std", ] [[package]] @@ -5637,9 +5418,9 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb dependencies = [ "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -5654,48 +5435,21 @@ dependencies = [ "parking_lot", "rand 0.7.3", "smallvec", - "sp-core 7.0.0", - "sp-externalities 0.13.0", - "sp-panic-handler 5.0.0", - "sp-std 5.0.0", - "sp-trie 7.0.0", + "sp-core", + "sp-externalities", + "sp-panic-handler", + "sp-std", + "sp-trie", "thiserror", "tracing", "trie-root", ] -[[package]] -name = "sp-state-machine" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fd4c600df0b5abf26c19b6c61d928b64e0c2b8a709a3dbef872be0507cd1ca" -dependencies = [ - "hash-db", - "log", - "parity-scale-codec", - "parking_lot", - "rand 0.8.5", - "smallvec", - "sp-core 11.0.0", - "sp-externalities 0.15.0", - "sp-panic-handler 6.0.0", - "sp-std 6.0.0", - "sp-trie 11.0.0", - "thiserror", - "tracing", -] - [[package]] name = "sp-std" version = "5.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" -[[package]] -name = "sp-std" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af0ee286f98455272f64ac5bb1384ff21ac029fbb669afbaf48477faff12760e" - [[package]] name = "sp-storage" version = "7.0.0" @@ -5705,22 +5459,8 @@ dependencies = [ "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 5.0.0", - "sp-std 5.0.0", -] - -[[package]] -name = "sp-storage" -version = "9.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9acb4059eb0ae4fa8cf9ca9119b0178ad312a592d4c6054bd17b411034f233e9" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "ref-cast", - "serde", - "sp-debug-derive 6.0.0", - "sp-std 6.0.0", + "sp-debug-derive", + "sp-std", ] [[package]] @@ -5734,8 +5474,8 @@ dependencies = [ "parity-scale-codec", "sp-api", "sp-inherents", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", "thiserror", ] @@ -5745,20 +5485,7 @@ version = "6.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", - "sp-std 5.0.0", - "tracing", - "tracing-core", - "tracing-subscriber", -] - -[[package]] -name = "sp-tracing" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22d28a0bc2365dfb86644d14f2682a79da35891d4656d4896fb09fb05ff1e6c" -dependencies = [ - "parity-scale-codec", - "sp-std 6.0.0", + "sp-std", "tracing", "tracing-core", "tracing-subscriber", @@ -5770,7 +5497,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "sp-api", - "sp-runtime 7.0.0", + "sp-runtime", ] [[package]] @@ -5788,32 +5515,8 @@ dependencies = [ "parity-scale-codec", "parking_lot", "scale-info", - "sp-core 7.0.0", - "sp-std 5.0.0", - "thiserror", - "tracing", - "trie-db", - "trie-root", -] - -[[package]] -name = "sp-trie" -version = "11.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db085f134cb444e52ca569a442d12c84bd17667532613d78dd6f568942632da4" -dependencies = [ - "ahash", - "hash-db", - "hashbrown", - "lazy_static", - "lru", - "memory-db", - "nohash-hasher", - "parity-scale-codec", - "parking_lot", - "scale-info", - "sp-core 11.0.0", - "sp-std 6.0.0", + "sp-core", + "sp-std", "thiserror", "tracing", "trie-db", @@ -5831,8 +5534,8 @@ dependencies = [ "scale-info", "serde", "sp-core-hashing-proc-macro", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime", + "sp-std", "sp-version-proc-macro", "thiserror", ] @@ -5856,21 +5559,7 @@ dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std 5.0.0", - "wasmi", - "wasmtime", -] - -[[package]] -name = "sp-wasm-interface" -version = "8.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ebc377987d42f8fc20e3f4ec4fd1147dd098fe90bcb4269e1eddb04e920f889" -dependencies = [ - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "sp-std 6.0.0", + "sp-std", "wasmi", "wasmtime", ] @@ -5885,26 +5574,10 @@ dependencies = [ "scale-info", "serde", "smallvec", - "sp-arithmetic 6.0.0", - "sp-core 7.0.0", - "sp-debug-derive 5.0.0", - "sp-std 5.0.0", -] - -[[package]] -name = "sp-weights" -version = "8.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90eca2a19f48978e9cd605e23905d0602419f7880a9360ac717b03412e9c7916" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "smallvec", - "sp-arithmetic 9.0.0", - "sp-core 11.0.0", - "sp-debug-derive 6.0.0", - "sp-std 6.0.0", + "sp-arithmetic", + "sp-core", + "sp-debug-derive", + "sp-std", ] [[package]] @@ -6068,9 +5741,9 @@ dependencies = [ "scale-value", "serde", "serde_json", - "sp-core 11.0.0", - "sp-core-hashing 6.0.0", - "sp-runtime 12.0.0", + "sp-core", + "sp-core-hashing", + "sp-runtime", "subxt-macro", "subxt-metadata", "thiserror", @@ -6113,7 +5786,7 @@ dependencies = [ "frame-metadata", "parity-scale-codec", "scale-info", - "sp-core-hashing 6.0.0", + "sp-core-hashing", ] [[package]] @@ -6312,25 +5985,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "tiny-bip39" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861" -dependencies = [ - "anyhow", - "hmac 0.12.1", - "once_cell", - "pbkdf2 0.11.0", - "rand 0.8.5", - "rustc-hash", - "sha2 0.10.2", - "thiserror", - "unicode-normalization", - "wasm-bindgen", - "zeroize", -] - [[package]] name = "tinyvec" version = "1.6.0" @@ -6557,7 +6211,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.3", - "rand 0.8.5", + "rand 0.4.6", "static_assertions", ] diff --git a/standalone/pruntime/Cargo.lock b/standalone/pruntime/Cargo.lock index 0c8797a6f4..ac36e21cbb 100644 --- a/standalone/pruntime/Cargo.lock +++ b/standalone/pruntime/Cargo.lock @@ -7690,7 +7690,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.3", - "rand 0.4.6", + "rand 0.8.5", "static_assertions", ] diff --git a/subxt b/subxt index 977f2a3333..02197845f7 160000 --- a/subxt +++ b/subxt @@ -1 +1 @@ -Subproject commit 977f2a3333922b2b833ab526469ec63c4abef847 +Subproject commit 02197845f7c2dbc63ee9450ae774cca08cfa15ef