From 22e28d84cb6f852accda9df70f3e9baf30706b79 Mon Sep 17 00:00:00 2001 From: clearloop <26088946+clearloop@users.noreply.github.com> Date: Sat, 23 Dec 2023 01:34:30 +0800 Subject: [PATCH 1/2] chore(sandbox): use sp-wasm-interface-common instead of sp-wasm-interface (#3603) --- Cargo.lock | 308 ++++++++++----------- Cargo.toml | 1 + sandbox/env/Cargo.toml | 4 +- sandbox/env/src/lib.rs | 2 +- sandbox/host/Cargo.toml | 2 +- sandbox/host/src/sandbox.rs | 24 +- sandbox/host/src/sandbox/wasmer_backend.rs | 2 +- sandbox/host/src/sandbox/wasmi_backend.rs | 2 +- sandbox/host/src/util.rs | 2 +- 9 files changed, 173 insertions(+), 174 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f0c9411a928..b013b289e91 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3336,7 +3336,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "parity-scale-codec", ] @@ -3359,7 +3359,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-support", "frame-support-procedural", @@ -3384,7 +3384,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "Inflector", "array-bytes", @@ -3431,7 +3431,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -3442,7 +3442,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -3459,7 +3459,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-support", "frame-system", @@ -3500,7 +3500,7 @@ dependencies = [ [[package]] name = "frame-remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "futures", "log", @@ -3516,7 +3516,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "bitflags 1.3.2", "environmental", @@ -3549,7 +3549,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "Inflector", "cfg-expr", @@ -3564,7 +3564,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.1.3", @@ -3576,7 +3576,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "proc-macro2", "quote", @@ -3586,7 +3586,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -3610,7 +3610,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-support", "frame-system", @@ -3621,7 +3621,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-support", "log", @@ -3639,7 +3639,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -3654,7 +3654,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "parity-scale-codec", "sp-api", @@ -3663,7 +3663,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-support", "parity-scale-codec", @@ -4397,7 +4397,7 @@ dependencies = [ "parity-scale-codec", "sp-core", "sp-std 5.0.0", - "sp-wasm-interface", + "sp-wasm-interface-common", ] [[package]] @@ -4409,7 +4409,7 @@ dependencies = [ "log", "parity-scale-codec", "sp-allocator", - "sp-wasm-interface", + "sp-wasm-interface-common", "tempfile", "thiserror", "wasmer", @@ -4608,7 +4608,7 @@ dependencies = [ [[package]] name = "generate-bags" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "chrono", "frame-election-provider-support", @@ -7471,7 +7471,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-support", "frame-system", @@ -7487,7 +7487,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-support", "frame-system", @@ -7501,7 +7501,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -7525,7 +7525,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7545,7 +7545,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -7560,7 +7560,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -7578,7 +7578,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -7597,7 +7597,7 @@ dependencies = [ [[package]] name = "pallet-conviction-voting" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "assert_matches", "frame-benchmarking", @@ -7614,7 +7614,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7637,7 +7637,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8060,7 +8060,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -8083,7 +8083,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "enumflags2 0.7.7", "frame-benchmarking", @@ -8099,7 +8099,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -8119,7 +8119,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -8135,7 +8135,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-support", "frame-system", @@ -8152,7 +8152,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "pallet-nomination-pools", "parity-scale-codec", @@ -8163,7 +8163,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-support", "frame-system", @@ -8180,7 +8180,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -8197,7 +8197,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -8212,7 +8212,7 @@ dependencies = [ [[package]] name = "pallet-ranked-collective" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -8230,7 +8230,7 @@ dependencies = [ [[package]] name = "pallet-referenda" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "assert_matches", "frame-benchmarking", @@ -8249,7 +8249,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -8266,7 +8266,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-support", "frame-system", @@ -8287,7 +8287,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8310,7 +8310,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "log", "sp-arithmetic", @@ -8319,7 +8319,7 @@ dependencies = [ [[package]] name = "pallet-staking-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "parity-scale-codec", "sp-api", @@ -8328,7 +8328,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-support", "frame-system", @@ -8342,7 +8342,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -8360,7 +8360,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-support", "frame-system", @@ -8376,7 +8376,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "jsonrpsee 0.16.3", "pallet-transaction-payment-rpc-runtime-api", @@ -8392,7 +8392,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -8404,7 +8404,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -8421,7 +8421,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -8437,7 +8437,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -8452,7 +8452,7 @@ dependencies = [ [[package]] name = "pallet-whitelist" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -9969,7 +9969,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -9984,7 +9984,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "memmap2", "sc-chain-spec-derive", @@ -10003,7 +10003,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -10014,7 +10014,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "array-bytes", "chrono", @@ -10054,7 +10054,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "fnv", "futures", @@ -10080,7 +10080,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "hash-db", "kvdb", @@ -10106,7 +10106,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "async-trait", "futures", @@ -10131,7 +10131,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "async-trait", "fork-tree", @@ -10170,7 +10170,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "futures", "jsonrpsee 0.16.3", @@ -10192,7 +10192,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "fork-tree", "parity-scale-codec", @@ -10205,7 +10205,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "ahash 0.8.6", "array-bytes", @@ -10245,7 +10245,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "finality-grandpa", "futures", @@ -10265,7 +10265,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "async-trait", "futures", @@ -10288,7 +10288,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "lru 0.8.1", "parity-scale-codec", @@ -10312,7 +10312,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "sp-allocator", "sp-maybe-compressed-blob", @@ -10325,7 +10325,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "log", "sc-executor-common", @@ -10338,7 +10338,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "anyhow", "cfg-if", @@ -10356,7 +10356,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "ansi_term", "futures", @@ -10372,7 +10372,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "array-bytes", "async-trait", @@ -10387,7 +10387,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "array-bytes", "async-channel", @@ -10431,7 +10431,7 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "cid", "futures", @@ -10451,7 +10451,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "array-bytes", "async-trait", @@ -10479,7 +10479,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "ahash 0.8.6", "futures", @@ -10498,7 +10498,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "array-bytes", "futures", @@ -10520,7 +10520,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "array-bytes", "async-trait", @@ -10554,7 +10554,7 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "array-bytes", "futures", @@ -10574,7 +10574,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "array-bytes", "bytes", @@ -10605,7 +10605,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "futures", "libp2p", @@ -10618,7 +10618,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -10627,7 +10627,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "futures", "jsonrpsee 0.16.3", @@ -10657,7 +10657,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "jsonrpsee 0.16.3", "parity-scale-codec", @@ -10676,7 +10676,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "http", "jsonrpsee 0.16.3", @@ -10691,7 +10691,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "array-bytes", "futures", @@ -10717,7 +10717,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "async-trait", "directories 4.0.1", @@ -10783,7 +10783,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "log", "parity-scale-codec", @@ -10794,7 +10794,7 @@ dependencies = [ [[package]] name = "sc-storage-monitor" version = "0.1.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "clap 4.4.11", "fs4", @@ -10810,7 +10810,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "jsonrpsee 0.16.3", "parity-scale-codec", @@ -10829,7 +10829,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "futures", "libc", @@ -10848,7 +10848,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "chrono", "futures", @@ -10867,7 +10867,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "ansi_term", "atty", @@ -10898,7 +10898,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -10909,7 +10909,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "async-trait", "futures", @@ -10936,7 +10936,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "async-trait", "futures", @@ -10950,7 +10950,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "async-channel", "futures", @@ -11716,7 +11716,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "4.1.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "log", "parity-scale-codec", @@ -11727,7 +11727,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "hash-db", "log", @@ -11745,7 +11745,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "Inflector", "blake2", @@ -11759,7 +11759,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "7.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "parity-scale-codec", "scale-info", @@ -11772,7 +11772,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "6.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "integer-sqrt", "num-traits", @@ -11786,7 +11786,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "parity-scale-codec", "scale-info", @@ -11799,7 +11799,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "parity-scale-codec", "sp-api", @@ -11811,7 +11811,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "futures", "log", @@ -11829,7 +11829,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "async-trait", "futures", @@ -11844,7 +11844,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "async-trait", "parity-scale-codec", @@ -11862,7 +11862,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "async-trait", "merlin 2.0.1", @@ -11885,7 +11885,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "finality-grandpa", "log", @@ -11903,7 +11903,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "parity-scale-codec", "scale-info", @@ -11915,7 +11915,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "parity-scale-codec", "scale-info", @@ -11928,7 +11928,7 @@ dependencies = [ [[package]] name = "sp-core" version = "7.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "array-bytes", "base58", @@ -11972,7 +11972,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "5.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "blake2b_simd", "byteorder", @@ -12001,7 +12001,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "proc-macro2", "quote", @@ -12012,7 +12012,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -12021,7 +12021,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "5.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "proc-macro2", "quote", @@ -12031,7 +12031,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.13.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "environmental", "parity-scale-codec", @@ -12042,7 +12042,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -12057,7 +12057,7 @@ dependencies = [ [[package]] name = "sp-io" version = "7.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "bytes", "ed25519 1.5.3", @@ -12082,7 +12082,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "7.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "lazy_static", "sp-core", @@ -12093,7 +12093,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.13.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "async-trait", "futures", @@ -12110,7 +12110,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "thiserror", "zstd", @@ -12119,7 +12119,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "parity-scale-codec", "scale-info", @@ -12133,7 +12133,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "sp-api", "sp-core", @@ -12143,7 +12143,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "5.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "backtrace", "lazy_static", @@ -12153,7 +12153,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "rustc-hash", "serde", @@ -12163,7 +12163,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "7.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "either", "hash256-std-hasher", @@ -12185,7 +12185,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "7.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -12203,7 +12203,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "6.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "Inflector", "proc-macro-crate 1.1.3", @@ -12215,7 +12215,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "parity-scale-codec", "scale-info", @@ -12229,7 +12229,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "parity-scale-codec", "scale-info", @@ -12241,7 +12241,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.13.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "hash-db", "log", @@ -12261,7 +12261,7 @@ dependencies = [ [[package]] name = "sp-std" version = "5.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" [[package]] name = "sp-std" @@ -12272,7 +12272,7 @@ checksum = "53458e3c57df53698b3401ec0934bea8e8cfce034816873c0b0abbd83d7bac0d" [[package]] name = "sp-storage" version = "7.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "impl-serde", "parity-scale-codec", @@ -12285,7 +12285,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "async-trait", "futures-timer", @@ -12300,7 +12300,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "6.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "parity-scale-codec", "sp-std 5.0.0", @@ -12312,7 +12312,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "sp-api", "sp-runtime", @@ -12321,7 +12321,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "async-trait", "log", @@ -12337,7 +12337,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "7.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "ahash 0.8.6", "hash-db", @@ -12360,7 +12360,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "impl-serde", "parity-scale-codec", @@ -12377,7 +12377,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -12388,7 +12388,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "7.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -12403,7 +12403,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface-common" version = "7.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "parity-scale-codec", "sp-std 5.0.0", @@ -12413,7 +12413,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "parity-scale-codec", "scale-info", @@ -12594,7 +12594,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "platforms 2.0.0", ] @@ -12602,7 +12602,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -12621,7 +12621,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "hyper", "log", @@ -12633,7 +12633,7 @@ dependencies = [ [[package]] name = "substrate-rpc-client" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "async-trait", "jsonrpsee 0.16.3", @@ -12646,7 +12646,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "jsonrpsee 0.16.3", "log", @@ -12665,7 +12665,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "array-bytes", "async-trait", @@ -12691,7 +12691,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "ansi_term", "build-helper", @@ -13516,7 +13516,7 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#27779e0eaaa2161ba165ff8f0b0ff103bb63e5a1" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes#9aa124f32c4cb05f5b032be0da02092245cfb6ba" dependencies = [ "async-trait", "clap 4.4.11", diff --git a/Cargo.toml b/Cargo.toml index c5bcede64bc..9f9df4f6ca4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -349,6 +349,7 @@ sp-transaction-storage-proof = { version = "4.0.0-dev", git = "https://github.co sp-trie = { version = "7.0.0", git = "https://github.com/gear-tech/substrate.git", branch = "gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes", default-features = false } sp-version = { version = "5.0.0", git = "https://github.com/gear-tech/substrate.git", branch = "gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes", default-features = false } sp-wasm-interface = { version = "7.0.0", git = "https://github.com/gear-tech/substrate.git", branch = "gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes", default-features = false } +sp-wasm-interface-common = { version = "7.0.0", git = "https://github.com/gear-tech/substrate.git", branch = "gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes", default-features = false } substrate-build-script-utils = { version = "3.0.0", git = "https://github.com/gear-tech/substrate.git", branch = "gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes" } substrate-frame-rpc-system = { version = "4.0.0-dev", git = "https://github.com/gear-tech/substrate.git", branch = "gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes" } substrate-rpc-client = { version = "0.10.0-dev", git = "https://github.com/gear-tech/substrate.git", branch = "gear-polkadot-v0.9.41-canary-no-sandbox-revert-oom-changes" } diff --git a/sandbox/env/Cargo.toml b/sandbox/env/Cargo.toml index 9c4a8891467..48ea3811487 100644 --- a/sandbox/env/Cargo.toml +++ b/sandbox/env/Cargo.toml @@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"] codec.workspace = true sp-core.workspace = true sp-std.workspace = true -sp-wasm-interface = { workspace = true, default-features = false } +sp-wasm-interface-common = { workspace = true, default-features = false } [features] default = ["std"] @@ -23,5 +23,5 @@ std = [ "codec/std", "sp-core/std", "sp-std/std", - "sp-wasm-interface/std", + "sp-wasm-interface-common/std", ] diff --git a/sandbox/env/src/lib.rs b/sandbox/env/src/lib.rs index 9b1e93fd43f..14a019a496d 100644 --- a/sandbox/env/src/lib.rs +++ b/sandbox/env/src/lib.rs @@ -26,7 +26,7 @@ use alloc::string::String; use codec::{Decode, Encode}; use sp_core::RuntimeDebug; use sp_std::vec::Vec; -use sp_wasm_interface::ReturnValue; +use sp_wasm_interface_common::ReturnValue; #[derive(Clone, Copy, Debug)] pub enum Instantiate { diff --git a/sandbox/host/Cargo.toml b/sandbox/host/Cargo.toml index 99b8c0770a0..662ad165e59 100644 --- a/sandbox/host/Cargo.toml +++ b/sandbox/host/Cargo.toml @@ -21,7 +21,7 @@ sandbox-wasmer.workspace = true sandbox-wasmer-types.workspace = true wasmi = { git = "https://github.com/gear-tech/wasmi", branch = "v0.13.2-sign-ext", features = ["virtual_memory"] } sp-allocator = { workspace = true, features = ["std"] } -sp-wasm-interface = { workspace = true, features = ["std"] } +sp-wasm-interface-common = { workspace = true, features = ["std"] } gear-sandbox-env = { workspace = true, features = ["std"] } wasmer-cache = { workspace = true, optional = true } tempfile.workspace = true diff --git a/sandbox/host/src/sandbox.rs b/sandbox/host/src/sandbox.rs index 96f1ea51b8f..72958d47e49 100644 --- a/sandbox/host/src/sandbox.rs +++ b/sandbox/host/src/sandbox.rs @@ -28,7 +28,7 @@ use std::{collections::HashMap, pin::Pin, rc::Rc}; use codec::Decode; use env::Instantiate; use gear_sandbox_env as sandbox_env; -use sp_wasm_interface::{Pointer, WordSize}; +use sp_wasm_interface_common::{Pointer, Value, WordSize}; use crate::{ error::{self, Result}, @@ -50,6 +50,8 @@ use self::{ pub use gear_sandbox_env as env; +type SandboxResult = core::result::Result; + /// Index of a function inside the supervisor. /// /// This is a typically an index in the default table of the supervisor, however @@ -143,11 +145,7 @@ pub trait SandboxContext { ) -> Result; /// Read memory from `address` into a vector. - fn read_memory_into( - &self, - address: Pointer, - dest: &mut [u8], - ) -> sp_wasm_interface::Result<()>; + fn read_memory_into(&self, address: Pointer, dest: &mut [u8]) -> SandboxResult<()>; /// Read memory into the given `dest` buffer from `address`. fn read_memory(&self, address: Pointer, size: WordSize) -> Result> { @@ -157,13 +155,13 @@ pub trait SandboxContext { } /// Write the given data at `address` into the memory. - fn write_memory(&mut self, address: Pointer, data: &[u8]) -> sp_wasm_interface::Result<()>; + fn write_memory(&mut self, address: Pointer, data: &[u8]) -> SandboxResult<()>; /// Allocate a memory instance of `size` bytes. - fn allocate_memory(&mut self, size: WordSize) -> sp_wasm_interface::Result>; + fn allocate_memory(&mut self, size: WordSize) -> SandboxResult>; /// Deallocate a given memory instance. - fn deallocate_memory(&mut self, ptr: Pointer) -> sp_wasm_interface::Result<()>; + fn deallocate_memory(&mut self, ptr: Pointer) -> SandboxResult<()>; } /// Implementation of [`Externals`] that allows execution of guest module with @@ -211,9 +209,9 @@ impl SandboxInstance { pub fn invoke( &self, export_name: &str, - args: &[sp_wasm_interface::Value], + args: &[Value], sandbox_context: &mut dyn SandboxContext, - ) -> std::result::Result, error::Error> { + ) -> std::result::Result, error::Error> { match &self.backend_instance { BackendInstance::Wasmi(wasmi_instance) => { wasmi_invoke(self, wasmi_instance, export_name, args, sandbox_context) @@ -228,7 +226,7 @@ impl SandboxInstance { /// Get the value from a global with the given `name`. /// /// Returns `Some(_)` if the global could be found. - pub fn get_global_val(&self, name: &str) -> Option { + pub fn get_global_val(&self, name: &str) -> Option { match &self.backend_instance { BackendInstance::Wasmi(wasmi_instance) => wasmi_get_global(wasmi_instance, name), @@ -242,7 +240,7 @@ impl SandboxInstance { pub fn set_global_val( &self, name: &str, - value: sp_wasm_interface::Value, + value: Value, ) -> std::result::Result, error::Error> { match &self.backend_instance { BackendInstance::Wasmi(wasmi_instance) => wasmi_set_global(wasmi_instance, name, value), diff --git a/sandbox/host/src/sandbox/wasmer_backend.rs b/sandbox/host/src/sandbox/wasmer_backend.rs index a0bd58cff3d..d21ec36b2aa 100644 --- a/sandbox/host/src/sandbox/wasmer_backend.rs +++ b/sandbox/host/src/sandbox/wasmer_backend.rs @@ -25,7 +25,7 @@ use sandbox_wasmer_types::TrapCode; use codec::{Decode, Encode}; use gear_sandbox_env::{HostError, Instantiate, WasmReturnValue, GLOBAL_NAME_GAS}; -use sp_wasm_interface::{util, Pointer, ReturnValue, Value, WordSize}; +use sp_wasm_interface_common::{util, Pointer, ReturnValue, Value, WordSize}; use crate::{ error::{Error, Result}, diff --git a/sandbox/host/src/sandbox/wasmi_backend.rs b/sandbox/host/src/sandbox/wasmi_backend.rs index 828991fcb65..0eed336810c 100644 --- a/sandbox/host/src/sandbox/wasmi_backend.rs +++ b/sandbox/host/src/sandbox/wasmi_backend.rs @@ -22,7 +22,7 @@ use std::fmt; use codec::{Decode, Encode}; use gear_sandbox_env::HostError; -use sp_wasm_interface::{util, Pointer, ReturnValue, Value, WordSize}; +use sp_wasm_interface_common::{util, Pointer, ReturnValue, Value, WordSize}; use wasmi::{ memory_units::Pages, ImportResolver, MemoryInstance, Module, ModuleInstance, RuntimeArgs, RuntimeValue, Trap, TrapCode, diff --git a/sandbox/host/src/util.rs b/sandbox/host/src/util.rs index b890e088e2d..d4eed753abf 100644 --- a/sandbox/host/src/util.rs +++ b/sandbox/host/src/util.rs @@ -19,7 +19,7 @@ //! Utilities used by all backends use crate::error::Result; -use sp_wasm_interface::Pointer; +use sp_wasm_interface_common::Pointer; /// Provides safe memory access interface using an external buffer pub trait MemoryTransfer { From f4242567520444a4d7eba3e1e57103c7832d3914 Mon Sep 17 00:00:00 2001 From: clearloop <26088946+clearloop@users.noreply.github.com> Date: Mon, 25 Dec 2023 07:37:19 +0800 Subject: [PATCH 2/2] feat(gcli): embed programs in commands (#3589) --- Cargo.lock | 1 + examples/messager/Cargo.toml | 6 ++ .../messager/src/bin/demo_messager.rs | 52 ++++++------ gcli/Cargo.toml | 1 + gcli/examples/mycli.rs | 2 +- gcli/src/app.rs | 2 +- gcli/src/bin/gcli.rs | 2 +- gcli/src/cmd/claim.rs | 2 +- gcli/src/cmd/create.rs | 2 +- gcli/src/cmd/info.rs | 4 +- gcli/src/cmd/key.rs | 6 +- gcli/src/cmd/login.rs | 2 +- gcli/src/cmd/mod.rs | 50 ++++++++--- gcli/src/cmd/new.rs | 2 +- gcli/src/cmd/program.rs | 42 +++++++-- gcli/src/cmd/reply.rs | 2 +- gcli/src/cmd/send.rs | 2 +- gcli/src/cmd/transfer.rs | 2 +- gcli/src/cmd/update.rs | 2 +- gcli/src/cmd/upload.rs | 23 ++++- gcli/src/embed.rs | 85 +++++++++++++++++++ gcli/src/lib.rs | 7 +- gcli/tests/common/app.rs | 67 +++++++++++++++ gcli/tests/common/env.rs | 14 +-- gcli/tests/common/mod.rs | 1 + gcli/tests/gear.rs | 14 +-- utils/wasm-builder/src/lib.rs | 12 ++- 27 files changed, 329 insertions(+), 78 deletions(-) rename gcli/src/cmd/meta.rs => examples/messager/src/bin/demo_messager.rs (54%) create mode 100644 gcli/src/embed.rs create mode 100644 gcli/tests/common/app.rs diff --git a/Cargo.lock b/Cargo.lock index b013b289e91..12f87345efc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2191,6 +2191,7 @@ dependencies = [ name = "demo-messager" version = "0.1.0" dependencies = [ + "gcli", "gear-wasm-builder", "gstd", ] diff --git a/examples/messager/Cargo.toml b/examples/messager/Cargo.toml index 884b045bec8..678d4d6e0c0 100644 --- a/examples/messager/Cargo.toml +++ b/examples/messager/Cargo.toml @@ -5,8 +5,14 @@ authors.workspace = true license.workspace = true edition.workspace = true +[[bin]] +name = "demo_messager" +path = "src/bin/demo_messager.rs" +required-features = ["gcli"] + [dependencies] gstd.workspace = true +gcli = { workspace = true, optional = true, features = ["embed"] } [build-dependencies] gear-wasm-builder.workspace = true diff --git a/gcli/src/cmd/meta.rs b/examples/messager/src/bin/demo_messager.rs similarity index 54% rename from gcli/src/cmd/meta.rs rename to examples/messager/src/bin/demo_messager.rs index b3dddfed8b5..6a70ab3bdfc 100644 --- a/gcli/src/cmd/meta.rs +++ b/examples/messager/src/bin/demo_messager.rs @@ -15,38 +15,42 @@ // // You should have received a copy of the GNU General Public License // along with this program. If not, see . +#![cfg(feature = "gcli")] -//! command `meta` -use crate::{metadata::Metadata, result::Result}; -use clap::Parser; -use std::{fs, path::PathBuf}; +use gcli::{ + anyhow, async_trait, + clap::{self, Parser}, + cmd::Upload, + color_eyre, tokio, App, +}; -/// Show metadata structure, read types from registry, etc. #[derive(Debug, Parser)] -pub enum Action { - /// Display the structure of the metadata. - Display, +pub enum Command { + Upload(Upload), } -/// Show metadata structure, read types from registry, etc. #[derive(Debug, Parser)] -pub struct Meta { - /// Path of "*.meta.wasm". - pub metadata: PathBuf, - #[command(subcommand)] - pub action: Action, +pub struct Messager { + #[clap(subcommand)] + command: Command, } -impl Meta { - /// Run command meta. - pub fn exec(&self) -> Result<()> { - let wasm = fs::read(&self.metadata)?; - let meta = Metadata::of(&wasm)?; +#[async_trait] +impl App for Messager { + async fn exec(&self) -> anyhow::Result<()> { + let lookup = gcli::lookup!(); + let signer = self.signer().await?; - match self.action { - Action::Display => println!("{}", format!("{meta:#}").replace('"', "")), - } - - Ok(()) + let Command::Upload(upload) = &self.command; + upload + .clone_with_code_overridden(lookup.opt) + .exec(signer) + .await + .map_err(Into::into) } } + +#[tokio::main] +async fn main() -> color_eyre::Result<()> { + Messager::parse().run().await +} diff --git a/gcli/Cargo.toml b/gcli/Cargo.toml index 3bb0dcb1b35..2db1a7dec7d 100644 --- a/gcli/Cargo.toml +++ b/gcli/Cargo.toml @@ -57,6 +57,7 @@ gsdk = { workspace = true, features = ["testing"] } which.workspace = true [features] +embed = [] node-key = [ "libp2p" ] [package.metadata.docs.rs] diff --git a/gcli/examples/mycli.rs b/gcli/examples/mycli.rs index 9b049342ae2..39c45f6019b 100644 --- a/gcli/examples/mycli.rs +++ b/gcli/examples/mycli.rs @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -use gcli::{async_trait, App, Command, Parser}; +use gcli::{async_trait, clap::Parser, App, Command}; /// My customized sub commands. #[derive(Debug, Parser)] diff --git a/gcli/src/app.rs b/gcli/src/app.rs index 7075d13b86d..a269f9538e1 100644 --- a/gcli/src/app.rs +++ b/gcli/src/app.rs @@ -27,7 +27,7 @@ use gsdk::{signer::Signer, Api}; /// Command line gear program application abstraction. /// /// ```ignore -/// use gcli::{async_trait, App, Command, Parser}; +/// use gcli::{async_trait, App, Command, clap::Parser, color_eyre, anyhow}; /// /// /// My customized sub commands. /// #[derive(Debug, Parser)] diff --git a/gcli/src/bin/gcli.rs b/gcli/src/bin/gcli.rs index 1ed0e8eefb0..8c5b36996cd 100644 --- a/gcli/src/bin/gcli.rs +++ b/gcli/src/bin/gcli.rs @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -use gcli::{cmd::Opt, App, Parser}; +use gcli::{clap::Parser, cmd::Opt, App}; #[tokio::main] async fn main() -> color_eyre::Result<()> { diff --git a/gcli/src/cmd/claim.rs b/gcli/src/cmd/claim.rs index 730cbcff38d..75c55f887f7 100644 --- a/gcli/src/cmd/claim.rs +++ b/gcli/src/cmd/claim.rs @@ -22,7 +22,7 @@ use clap::Parser; use gsdk::signer::Signer; /// Claim value from mailbox. -#[derive(Parser, Debug)] +#[derive(Clone, Debug, Parser)] pub struct Claim { /// Claim value from. message_id: String, diff --git a/gcli/src/cmd/create.rs b/gcli/src/cmd/create.rs index 0f30db2b585..72c1eabc5bf 100644 --- a/gcli/src/cmd/create.rs +++ b/gcli/src/cmd/create.rs @@ -22,7 +22,7 @@ use clap::Parser; use gsdk::signer::Signer; /// Deploy program to gear node -#[derive(Parser, Debug)] +#[derive(Clone, Debug, Parser)] pub struct Create { /// gear program code id code_id: String, diff --git a/gcli/src/cmd/info.rs b/gcli/src/cmd/info.rs index 59776d958ba..ef8b707f508 100644 --- a/gcli/src/cmd/info.rs +++ b/gcli/src/cmd/info.rs @@ -31,7 +31,7 @@ use gsdk::{ }; use std::fmt; -#[derive(Debug, Parser)] +#[derive(Clone, Debug, Parser)] pub enum Action { /// Get balance info of the current account Balance, @@ -44,7 +44,7 @@ pub enum Action { } /// Get account info from ss58address. -#[derive(Debug, Parser)] +#[derive(Clone, Debug, Parser)] pub struct Info { /// Info of this address, if none, will use the logged in account. pub address: Option, diff --git a/gcli/src/cmd/key.rs b/gcli/src/cmd/key.rs index 68c1bf3bc00..f4ea4d5f715 100644 --- a/gcli/src/cmd/key.rs +++ b/gcli/src/cmd/key.rs @@ -26,7 +26,7 @@ use gsdk::ext::{ use std::{fmt::Display, result::Result as StdResult, str::FromStr}; /// Cryptography scheme -#[derive(Debug, Clone)] +#[derive(Clone, Debug)] pub enum Scheme { Ecdsa, Ed25519, @@ -45,7 +45,7 @@ impl FromStr for Scheme { } } -#[derive(Debug, Parser)] +#[derive(Clone, Debug, Parser)] pub enum Action { /// Generate a random account Generate, @@ -88,7 +88,7 @@ pub enum Action { } /// Keypair utils -#[derive(Debug, Parser)] +#[derive(Clone, Debug, Parser)] pub struct Key { /// Cryptography scheme #[arg(short, long, default_value = "sr25519")] diff --git a/gcli/src/cmd/login.rs b/gcli/src/cmd/login.rs index f36c9c999d0..a5ab026810d 100644 --- a/gcli/src/cmd/login.rs +++ b/gcli/src/cmd/login.rs @@ -22,7 +22,7 @@ use clap::Parser; use std::path::PathBuf; /// Log in to account -#[derive(Debug, Parser)] +#[derive(Clone, Debug, Parser)] pub struct Login { /// The default keystore path is ~/.gear/keystore and ~/.gear/keystore.json /// diff --git a/gcli/src/cmd/mod.rs b/gcli/src/cmd/mod.rs index 29ea7ef4c41..4815ae63735 100644 --- a/gcli/src/cmd/mod.rs +++ b/gcli/src/cmd/mod.rs @@ -33,22 +33,27 @@ pub mod transfer; pub mod update; pub mod upload; +pub use self::{ + claim::Claim, create::Create, info::Info, key::Key, login::Login, new::New, program::Program, + reply::Reply, send::Send, transfer::Transfer, update::Update, upload::Upload, +}; + /// All SubCommands of gear command line interface. -#[derive(Debug, Parser)] +#[derive(Clone, Debug, Parser)] pub enum Command { - Claim(claim::Claim), - Create(create::Create), - Info(info::Info), - Key(key::Key), - Login(login::Login), - New(new::New), + Claim(Claim), + Create(Create), + Info(Info), + Key(Key), + Login(Login), + New(New), #[clap(subcommand)] - Program(program::Program), - Reply(reply::Reply), - Send(send::Send), - Upload(upload::Upload), - Transfer(transfer::Transfer), - Update(update::Update), + Program(Program), + Reply(Reply), + Send(Send), + Upload(Upload), + Transfer(Transfer), + Update(Update), } impl Command { @@ -71,6 +76,25 @@ impl Command { Ok(()) } + + #[cfg(feature = "embed")] + pub async fn exec_embedded( + &self, + app: &impl App, + artifact: crate::embed::Artifact, + ) -> anyhow::Result<()> { + let this = match self { + Command::Upload(upload) => { + Command::Upload(upload.clone_with_code_overridden(artifact.opt)) + } + Command::Program(program) => { + Command::Program(program.clone_with_meta_overridden(artifact.meta)) + } + _ => self.clone(), + }; + + Self::exec(&this, app).await + } } /// Gear command-line interface. diff --git a/gcli/src/cmd/new.rs b/gcli/src/cmd/new.rs index 3698b2d6a32..524e4724c62 100644 --- a/gcli/src/cmd/new.rs +++ b/gcli/src/cmd/new.rs @@ -21,7 +21,7 @@ use crate::{result::Result, template}; use clap::Parser; /// Create a new gear program -#[derive(Debug, Parser)] +#[derive(Clone, Debug, Parser)] pub struct New { /// Create gear program from templates. #[arg(short, long, default_value = "dapp-template")] diff --git a/gcli/src/cmd/program.rs b/gcli/src/cmd/program.rs index e6c7bdaba78..f533d1f92dc 100644 --- a/gcli/src/cmd/program.rs +++ b/gcli/src/cmd/program.rs @@ -23,7 +23,7 @@ use gsdk::{ext::sp_core::H256, Api}; use std::{fs, path::PathBuf}; /// Read program state, etc. -#[derive(Debug, Parser)] +#[derive(Clone, Debug, Parser)] pub enum Program { /// Display metadata of the program. /// @@ -33,7 +33,11 @@ pub enum Program { /// /// - "*.meta.txt" describes the metadata of the program /// - "*.meta.wasm" describes the wasm exports of the program + #[cfg_attr(feature = "embed", clap(skip))] meta: PathBuf, + /// Overridden metadata binary if feature embed is enabled. + #[clap(skip)] + meta_override: Vec, /// Derive the description of the specified type from registry. #[arg(short, long)] derive: Option, @@ -60,6 +64,15 @@ pub enum Program { } impl Program { + /// Clone self with metadata overridden. + pub fn clone_with_meta_overridden(&self, meta: Vec) -> Self { + let mut overridden = self.clone(); + if let Program::Meta { meta_override, .. } = &mut overridden { + *meta_override = meta; + }; + overridden + } + /// Run command program. pub async fn exec(&self, app: &impl App) -> Result<()> { match self { @@ -79,7 +92,19 @@ impl Program { Self::full_state(api, *pid, *at).await?; } } - Program::Meta { meta, derive } => Self::meta(meta, derive)?, + Program::Meta { + meta, + derive, + meta_override, + } => { + let meta = if meta_override.is_empty() { + Self::resolve_meta(meta) + } else { + Meta::decode_wasm(meta_override) + }?; + + Self::meta(meta, derive)? + } } Ok(()) @@ -96,17 +121,17 @@ impl Program { let state = api .read_state_using_wasm(pid, Default::default(), method, wasm, args, at) .await?; - println!("{}", state); + println!("{state}"); Ok(()) } async fn full_state(api: Api, pid: H256, at: Option) -> Result<()> { let state = api.read_state(pid, Default::default(), at).await?; - println!("{}", state); + println!("{state}"); Ok(()) } - fn meta(path: &PathBuf, name: &Option) -> Result<()> { + fn resolve_meta(path: &PathBuf) -> Result { let ext = path .extension() .ok_or_else(|| anyhow::anyhow!("Invalid file extension"))?; @@ -122,11 +147,14 @@ impl Program { return Err(anyhow::anyhow!(format!("Unsupported file extension {:?}", ext)).into()); }; - // Format types. + Ok(meta) + } + + fn meta(meta: Meta, name: &Option) -> Result<()> { let fmt = if let Some(name) = name { format!("{:#}", meta.derive(name)?) } else { - format!("{:#}", meta) + format!("{meta:#}") }; // println result. diff --git a/gcli/src/cmd/reply.rs b/gcli/src/cmd/reply.rs index ada227ba901..a20b08862e7 100644 --- a/gcli/src/cmd/reply.rs +++ b/gcli/src/cmd/reply.rs @@ -33,7 +33,7 @@ use gsdk::signer::Signer; /// - `value`: balance to be transferred to the program once it's been created. /// /// - `DispatchMessageEnqueued(H256)` when dispatch message is placed in the queue. -#[derive(Parser, Debug)] +#[derive(Clone, Debug, Parser)] pub struct Reply { /// Reply to reply_to_id: String, diff --git a/gcli/src/cmd/send.rs b/gcli/src/cmd/send.rs index a72e3bb7375..7ead01046b7 100644 --- a/gcli/src/cmd/send.rs +++ b/gcli/src/cmd/send.rs @@ -42,7 +42,7 @@ use gsdk::{ /// /// Emits the following events: /// - `DispatchMessageEnqueued(MessageInfo)` when dispatch message is placed in the queue. -#[derive(Parser, Debug)] +#[derive(Clone, Debug, Parser)] pub struct Send { /// Send to pub destination: String, diff --git a/gcli/src/cmd/transfer.rs b/gcli/src/cmd/transfer.rs index ff0f4feb956..baf802d2e1d 100644 --- a/gcli/src/cmd/transfer.rs +++ b/gcli/src/cmd/transfer.rs @@ -32,7 +32,7 @@ use gsdk::{ /// [the staging testnet][0], and the decimals of 1 UNIT is 12 by default. /// /// [0]: https://github.com/gear-tech/gear/blob/c01d0390cdf1031cb4eba940d0199d787ea480e0/node/src/chain_spec.rs#L218 -#[derive(Debug, Parser)] +#[derive(Clone, Debug, Parser)] pub struct Transfer { /// Transfer to (ss58address). destination: String, diff --git a/gcli/src/cmd/update.rs b/gcli/src/cmd/update.rs index cf9af5835ab..e7b06f8bd2b 100644 --- a/gcli/src/cmd/update.rs +++ b/gcli/src/cmd/update.rs @@ -24,7 +24,7 @@ use std::process::{self, Command}; const REPO: &str = "https://github.com/gear-tech/gear-program"; /// Update self from crates.io or github -#[derive(Debug, Parser)] +#[derive(Clone, Debug, Parser)] pub struct Update { /// Force update self from #[arg(short, long)] diff --git a/gcli/src/cmd/upload.rs b/gcli/src/cmd/upload.rs index 27f8073e362..cd47fd5677b 100644 --- a/gcli/src/cmd/upload.rs +++ b/gcli/src/cmd/upload.rs @@ -28,10 +28,14 @@ use gsdk::{ use std::{fs, path::PathBuf}; /// Deploy program to gear node or save program `code` in storage. -#[derive(Parser, Debug)] +#[derive(Clone, Debug, Parser)] pub struct Upload { - /// gear program code <*.wasm> + /// Gear program code <*.wasm>. + #[cfg_attr(feature = "embed", clap(skip))] code: PathBuf, + /// Overridden code if feature embed is enabled. + #[clap(skip)] + code_override: Vec, /// Save program `code` in storage only. #[arg(short, long)] code_only: bool, @@ -50,10 +54,21 @@ pub struct Upload { } impl Upload { + /// Clone self with code overridden. + pub fn clone_with_code_overridden(&self, code: Vec) -> Self { + let mut overridden = self.clone(); + overridden.code_override = code; + overridden + } + /// Exec command submit pub async fn exec(&self, signer: Signer) -> Result<()> { - let code = - fs::read(&self.code).map_err(|e| anyhow!("program {:?} not found, {e}", &self.code))?; + let code = if self.code_override.is_empty() { + fs::read(&self.code).map_err(|e| anyhow!("program {:?} not found, {e}", &self.code))? + } else { + self.code_override.clone() + }; + if self.code_only { signer.calls.upload_code(code).await?; return Ok(()); diff --git a/gcli/src/embed.rs b/gcli/src/embed.rs new file mode 100644 index 00000000000..17b9be6e8d5 --- /dev/null +++ b/gcli/src/embed.rs @@ -0,0 +1,85 @@ +// This file is part of Gear. +// +// Copyright (C) 2021-2023 Gear Technologies Inc. +// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0 +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +//! Utils for embedded commands. +#![cfg(feature = "embed")] + +use std::{fs, path::PathBuf}; + +/// This macro is used to lookup the artifact from the `OUT_DIR`, +/// it's just a wrapper around [`Artifact::from_out_dir`] for +/// avoiding importing [`Artifact`] in users' code. +/// +/// NOTE: This macro should only be used in external crates. +#[macro_export] +macro_rules! lookup { + () => {{ + if let Some(artifact) = ::gcli::embed::Artifact::from_out_dir(env!("OUT_DIR")) { + artifact + } else { + ::gcli::log::warn!("No artifact is found from the out_dir"); + Default::default() + } + }}; +} + +/// The length of the suffix of the output folder. +/// +/// Example: `[gcli]-1234567890abcdef` +const OUT_SUFFIX_LENGTH: usize = 17; + +/// Program binaries for embedded commands. +#[derive(Debug, Default)] +pub struct Artifact { + /// The optitmized WASM binary. + pub opt: Vec, + + /// The metadata WASM binary if any. + pub meta: Vec, +} + +impl Artifact { + /// Parse the artifact from the `OUT_DIR` + /// environment variable. + pub fn from_out_dir(out: &str) -> Option { + let out_dir = PathBuf::from(out); + let mut ancestors = out_dir.ancestors(); + + let [name, profile, target] = [ + ancestors + .nth(1)? + .file_name()? + .to_str() + .and_then(|name| name.get(..name.len().checked_sub(OUT_SUFFIX_LENGTH)?))?, + if ancestors.nth(1)?.file_name()?.to_str()? == "debug" { + "debug" + } else { + "release" + }, + ancestors.next()?.to_str()?, + ]; + + let bin = PathBuf::from(format!("{target}/wasm32-unknown-unknown/{profile}")); + let stem = PathBuf::from(name.replace('-', "_")); + + Some(Self { + opt: fs::read(bin.join(stem.with_extension("wasm"))).ok()?, + meta: fs::read(bin.join(stem.with_extension("meta.wasm"))).unwrap_or_default(), + }) + } +} diff --git a/gcli/src/lib.rs b/gcli/src/lib.rs index 364fe1e00a8..00901343496 100644 --- a/gcli/src/lib.rs +++ b/gcli/src/lib.rs @@ -124,6 +124,7 @@ mod app; pub mod cmd; +pub mod embed; pub mod keystore; pub mod meta; pub mod result; @@ -131,9 +132,13 @@ pub mod template; pub mod utils; pub use self::{app::App, cmd::Command}; +pub use anyhow; pub use async_trait::async_trait; -pub use clap::Parser; +pub use clap; +pub use color_eyre; pub use gsdk::signer::Signer; +pub use log; +pub use tokio; /// SS58 prefix for vara network. pub const VARA_SS58_PREFIX: u8 = 137; diff --git a/gcli/tests/common/app.rs b/gcli/tests/common/app.rs new file mode 100644 index 00000000000..2521ac26aa3 --- /dev/null +++ b/gcli/tests/common/app.rs @@ -0,0 +1,67 @@ +// This file is part of Gear. +// +// Copyright (C) 2021-2023 Gear Technologies Inc. +// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0 +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +use crate::common::{ + self, env, + node::{Convert, NodeExec}, + Args, +}; +use anyhow::{anyhow, Result}; +use std::{ + path::PathBuf, + process::{Command, Stdio}, +}; + +fn demo_messager() -> Result { + let path = PathBuf::from(env::bin("demo_messager")); + + if !path.exists() + && !Command::new("cargo") + .args([ + "build", + "-p", + "demo-messager", + &format!("--{}", *env::PROFILE), + "--features", + "gcli", + ]) + .status()? + .success() + { + return Err(anyhow!("Failed to build demo-messager with feature gcli")); + } + + Ok(path) +} + +#[test] +fn embedded_gcli() -> Result<()> { + let node = common::dev()?; + let demo = Command::new(demo_messager()?) + .args(Vec::::from(Args::new("upload").endpoint(node.ws()))) + .stderr(Stdio::piped()) + .output()?; + + let stderr = demo.stderr.convert(); + assert!( + !stderr.contains("Submitted Gear::upload_program"), + "code should be uploaded, but got: {stderr}" + ); + + Ok(()) +} diff --git a/gcli/tests/common/env.rs b/gcli/tests/common/env.rs index 745287a80ee..38455e2845b 100644 --- a/gcli/tests/common/env.rs +++ b/gcli/tests/common/env.rs @@ -25,23 +25,23 @@ const WASM_TARGET: &str = "target/wasm32-unknown-unknown"; lazy_static! { static ref ROOT: String = env!("CARGO_MANIFEST_DIR").to_owned() + "/../"; + pub static ref PROFILE: &'static str = if cfg!(debug_assertions) { + "debug" + } else { + "release" + }; } fn bin_path(name: &str, wasm: bool) -> String { ROOT.clone() - + [ + + &[ if wasm { WASM_TARGET } else { TARGET }, "/", - if cfg!(debug_assertions) { - "debug" - } else { - "release" - }, + *PROFILE, "/", name, ] .concat() - .as_str() } /// path of binaries diff --git a/gcli/tests/common/mod.rs b/gcli/tests/common/mod.rs index f387ecb27de..a1699a3b27c 100644 --- a/gcli/tests/common/mod.rs +++ b/gcli/tests/common/mod.rs @@ -33,6 +33,7 @@ use std::{ process::{Command, Output}, }; +mod app; mod args; pub mod env; pub mod node; diff --git a/gcli/tests/gear.rs b/gcli/tests/gear.rs index a815d2d96d5..52635755941 100644 --- a/gcli/tests/gear.rs +++ b/gcli/tests/gear.rs @@ -25,10 +25,14 @@ mod common; #[tokio::test] async fn api_timeout() { - assert!(matches!( - Api::new_with_timeout(None, Some(1)).await.err(), - Some(Error::SubxtRpc(jsonrpsee::core::Error::Transport(..))) - )); + let error = Api::new_with_timeout(None, Some(0)).await.err(); + assert!( + matches!( + error, + Some(Error::SubxtRpc(jsonrpsee::core::Error::Transport(..))) + ), + "Unexpected error occurred: {error:?}" + ); } #[test] @@ -42,7 +46,7 @@ fn paths() { .into_iter() .for_each(|path| { if !PathBuf::from(&path).exists() { - panic!("{} not found.", path) + panic!("{path} not found.") } }) } diff --git a/utils/wasm-builder/src/lib.rs b/utils/wasm-builder/src/lib.rs index 9e7e2e21c91..6562f1cc155 100644 --- a/utils/wasm-builder/src/lib.rs +++ b/utils/wasm-builder/src/lib.rs @@ -166,7 +166,17 @@ impl WasmBuilder { unmatched_features.join(", ") ); } - Ok(matched_features) + + // NOTE: Filter out feature `gcli`. + // + // dependency feature `gcli` could be captured here + // but it is not needed for the build. + // + // TODO: Filter dep features in this function (#3588) + Ok(matched_features + .into_iter() + .filter(|feature| feature != "gcli") + .collect()) } fn paths_to_remap(&self) -> Result> {