From d5b13c83ca050ba0c193cacd86bd539ec9cc28e8 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 17 Dec 2019 16:24:04 +0000 Subject: [PATCH 01/12] Implement instantiate command --- Cargo.lock | 1105 +++++++++++++++++++--------------------- Cargo.toml | 7 +- src/cmd/deploy.rs | 29 +- src/cmd/instantiate.rs | 98 ++++ src/cmd/mod.rs | 4 + src/main.rs | 113 +++- 6 files changed, 739 insertions(+), 617 deletions(-) create mode 100644 src/cmd/instantiate.rs diff --git a/Cargo.lock b/Cargo.lock index ab30015d..f99b9e1e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -35,7 +35,7 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.23" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -66,7 +66,7 @@ name = "atty" version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -82,7 +82,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -91,8 +91,8 @@ name = "backtrace-sys" version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -196,18 +196,19 @@ dependencies = [ name = "cargo-contract" version = "0.2.0" dependencies = [ - "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)", + "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cargo_metadata 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cargo_metadata 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-wasm 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", "pwasm-utils 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate/)", "structopt 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-subxt 0.3.0 (git+https://github.com/paritytech/substrate-subxt/?branch=v0.3)", + "substrate-subxt 0.4.0 (git+https://github.com/paritytech/substrate-subxt/?rev=a9df35c570afdf7f5b081acb09dcf06fc3e5ad42)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -218,18 +219,18 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "cc" -version = "1.0.47" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -247,7 +248,7 @@ dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -256,7 +257,7 @@ name = "clear_on_drop" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -272,7 +273,7 @@ name = "cmake" version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -304,7 +305,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -392,18 +393,19 @@ dependencies = [ "clear_on_drop 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "subtle 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "subtle 2.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "derive_more" -version = "0.14.1" +name = "curve25519-dalek" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "subtle 2.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "zeroize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -413,7 +415,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -426,18 +428,18 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "0.9.1" +version = "1.0.0-pre.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "clear_on_drop 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "curve25519-dalek 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "curve25519-dalek 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "elastic-array" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -476,7 +478,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -491,7 +493,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "static_assertions 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -518,18 +520,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "frame-metadata" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" dependencies = [ "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-std 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate/)", ] [[package]] name = "frame-support" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" dependencies = [ "bitmask 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "frame-metadata 2.0.0 (git+https://github.com/paritytech/substrate/)", @@ -539,65 +541,65 @@ dependencies = [ "once_cell 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-arithmetic 2.0.0 (git+https://github.com/paritytech/substrate/)", - "sr-io 2.0.0 (git+https://github.com/paritytech/substrate/)", - "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", - "sr-std 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-state-machine 2.0.0 (git+https://github.com/paritytech/substrate/)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-arithmetic 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-state-machine 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate/)", "tracing 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "frame-support-procedural" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" dependencies = [ "frame-support-procedural-tools 2.0.0 (git+https://github.com/paritytech/substrate/)", "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "frame-support-procedural-tools" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" dependencies = [ "frame-support-procedural-tools-derive 2.0.0 (git+https://github.com/paritytech/substrate/)", "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "frame-system" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" dependencies = [ "frame-support 2.0.0 (git+https://github.com/paritytech/substrate/)", "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 2.0.0 (git+https://github.com/paritytech/substrate/)", - "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", - "sr-std 2.0.0 (git+https://github.com/paritytech/substrate/)", - "sr-version 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-version 2.0.0 (git+https://github.com/paritytech/substrate/)", ] [[package]] @@ -675,7 +677,7 @@ dependencies = [ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -721,7 +723,7 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -779,10 +781,10 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -863,7 +865,7 @@ name = "impl-serde" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -873,7 +875,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -886,7 +888,7 @@ name = "iovec" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -896,61 +898,61 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "jsonrpc-client-transports" -version = "14.0.3" +version = "14.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpc-pubsub 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpc-core 14.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpc-pubsub 14.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "websocket 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", + "websocket 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "jsonrpc-core" -version = "14.0.3" +version = "14.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "jsonrpc-core-client" -version = "14.0.3" +version = "14.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "jsonrpc-client-transports 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpc-client-transports 14.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "jsonrpc-derive" -version = "14.0.3" +version = "14.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "jsonrpc-pubsub" -version = "14.0.3" +version = "14.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpc-core 14.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -982,20 +984,21 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.65" +version = "0.2.66" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libsecp256k1" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "crunchy 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "hmac-drbg 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "subtle 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "subtle 2.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1037,7 +1040,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1088,7 +1091,7 @@ dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "keccak 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "zeroize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zeroize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1101,14 +1104,15 @@ dependencies = [ [[package]] name = "mio" -version = "0.6.19" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1122,8 +1126,8 @@ version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1143,7 +1147,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1160,7 +1164,7 @@ version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1212,8 +1216,8 @@ name = "num_cpus" version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "hermit-abi 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1243,7 +1247,7 @@ dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1258,60 +1262,27 @@ version = "0.9.53" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", - "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "pallet-balances" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" -dependencies = [ - "frame-support 2.0.0 (git+https://github.com/paritytech/substrate/)", - "frame-system 2.0.0 (git+https://github.com/paritytech/substrate/)", - "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", - "sr-std 2.0.0 (git+https://github.com/paritytech/substrate/)", -] - -[[package]] -name = "pallet-contracts" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" -dependencies = [ - "frame-support 2.0.0 (git+https://github.com/paritytech/substrate/)", - "frame-system 2.0.0 (git+https://github.com/paritytech/substrate/)", - "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-wasm 0.40.3 (registry+https://github.com/rust-lang/crates.io-index)", - "pwasm-utils 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 2.0.0 (git+https://github.com/paritytech/substrate/)", - "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", - "sr-sandbox 2.0.0 (git+https://github.com/paritytech/substrate/)", - "sr-std 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", - "wasmi-validation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "pallet-indices" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" dependencies = [ "frame-support 2.0.0 (git+https://github.com/paritytech/substrate/)", "frame-system 2.0.0 (git+https://github.com/paritytech/substrate/)", "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 2.0.0 (git+https://github.com/paritytech/substrate/)", - "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", - "sr-std 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-keyring 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-keyring 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate/)", ] [[package]] @@ -1323,7 +1294,7 @@ dependencies = [ "bitvec 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "byte-slice-cast 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec-derive 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1334,7 +1305,7 @@ dependencies = [ "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1347,11 +1318,6 @@ dependencies = [ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "parity-wasm" -version = "0.40.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "parity-wasm" version = "0.41.0" @@ -1381,7 +1347,7 @@ name = "parking_lot_core" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1395,7 +1361,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1419,7 +1385,7 @@ dependencies = [ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1482,7 +1448,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1492,7 +1458,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1500,14 +1466,6 @@ name = "proc-macro-nested" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "proc-macro2" version = "1.0.6" @@ -1516,16 +1474,6 @@ dependencies = [ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "pwasm-utils" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-wasm 0.40.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "pwasm-utils" version = "0.12.0" @@ -1541,14 +1489,6 @@ name = "quick-error" version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "quote" version = "1.0.2" @@ -1563,7 +1503,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1581,7 +1521,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1655,7 +1595,7 @@ name = "rand_jitter" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1667,7 +1607,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1774,37 +1714,23 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" dependencies = [ "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpc-core-client 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpc-derive 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpc-pubsub 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpc-core 14.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpc-core-client 14.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpc-derive 14.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpc-pubsub 14.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sc-transaction-graph 2.0.0 (git+https://github.com/paritytech/substrate/)", - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-version 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-rpc-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", -] - -[[package]] -name = "sc-transaction-graph" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" -dependencies = [ - "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-rpc 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-version 2.0.0 (git+https://github.com/paritytech/substrate/)", ] [[package]] @@ -1828,7 +1754,7 @@ dependencies = [ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "subtle 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "subtle 2.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "zeroize 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1849,7 +1775,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1867,7 +1793,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1877,30 +1803,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "1.0.103" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_derive" -version = "1.0.103" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_json" -version = "1.0.42" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1938,369 +1864,394 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" +name = "sp-api" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" +dependencies = [ + "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-api-proc-macro 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-state-machine 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-version 2.0.0 (git+https://github.com/paritytech/substrate/)", +] [[package]] -name = "sr-arithmetic" +name = "sp-api-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" dependencies = [ - "integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-std 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-debug-derive 2.0.0 (git+https://github.com/paritytech/substrate/)", + "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "sr-io" +name = "sp-application-crypto" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" dependencies = [ - "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libsecp256k1 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-std 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-externalities 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-runtime-interface 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-state-machine 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-trie 2.0.0 (git+https://github.com/paritytech/substrate/)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate/)", ] [[package]] -name = "sr-primitives" +name = "sp-arithmetic" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" dependencies = [ - "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-arithmetic 2.0.0 (git+https://github.com/paritytech/substrate/)", - "sr-io 2.0.0 (git+https://github.com/paritytech/substrate/)", - "sr-std 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-debug-derive 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate/)", ] [[package]] -name = "sr-sandbox" +name = "sp-core" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" dependencies = [ + "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ed25519-dalek 1.0.0-pre.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", + "hash256-std-hasher 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", + "hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "impl-serde 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libsecp256k1 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 2.0.0 (git+https://github.com/paritytech/substrate/)", - "sr-std 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", + "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "primitive-types 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "schnorrkel 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-debug-derive 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-externalities 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-runtime-interface 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-storage 2.0.0 (git+https://github.com/paritytech/substrate/)", + "substrate-bip39 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "tiny-bip39 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "tiny-keccak 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "twox-hash 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "wasmi 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "zeroize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "sr-std" +name = "sp-debug-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" +dependencies = [ + "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] -name = "sr-version" +name = "sp-externalities" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" dependencies = [ - "impl-serde 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", - "sr-std 2.0.0 (git+https://github.com/paritytech/substrate/)", + "environmental 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-storage 2.0.0 (git+https://github.com/paritytech/substrate/)", ] [[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" +name = "sp-inherents" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" +dependencies = [ + "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate/)", +] [[package]] -name = "structopt" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" +name = "sp-io" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" dependencies = [ - "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "structopt-derive 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libsecp256k1 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-externalities 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-runtime-interface 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-state-machine 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate/)", ] [[package]] -name = "structopt-derive" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" +name = "sp-keyring" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" dependencies = [ - "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate/)", + "strum 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "strum" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" +name = "sp-panic-handler" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" dependencies = [ - "strum_macros 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "strum_macros" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" +name = "sp-rpc" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" dependencies = [ - "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate/)", ] [[package]] -name = "substrate-application-crypto" +name = "sp-runtime" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" dependencies = [ + "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 2.0.0 (git+https://github.com/paritytech/substrate/)", - "sr-std 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", + "paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-arithmetic 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate/)", ] [[package]] -name = "substrate-bip39" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" +name = "sp-runtime-interface" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" dependencies = [ - "hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pbkdf2 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "schnorrkel 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)", - "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "environmental 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "primitive-types 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-externalities 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-runtime-interface-proc-macro 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-wasm-interface 2.0.0 (git+https://github.com/paritytech/substrate/)", + "static_assertions 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "substrate-debug-derive" +name = "sp-runtime-interface-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" dependencies = [ + "Inflector 0.11.4 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "substrate-externalities" +name = "sp-state-machine" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" dependencies = [ - "environmental 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "primitive-types 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-std 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-primitives-storage 2.0.0 (git+https://github.com/paritytech/substrate/)", + "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-externalities 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-panic-handler 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate/)", + "trie-db 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", + "trie-root 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "substrate-inherents" +name = "sp-std" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" -dependencies = [ - "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-std 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", -] +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" [[package]] -name = "substrate-keyring" +name = "sp-storage" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" dependencies = [ - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", - "strum 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", - "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", + "impl-serde 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-debug-derive 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate/)", ] [[package]] -name = "substrate-panic-handler" +name = "sp-transaction-pool" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" dependencies = [ - "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)", + "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate/)", ] [[package]] -name = "substrate-primitives" +name = "sp-trie" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" dependencies = [ - "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ed25519-dalek 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", - "hash256-std-hasher 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", - "hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "impl-serde 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libsecp256k1 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "memory-db 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "primitive-types 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "schnorrkel 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-std 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-bip39 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "substrate-debug-derive 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-externalities 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-primitives-storage 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-runtime-interface 2.0.0 (git+https://github.com/paritytech/substrate/)", - "tiny-bip39 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tiny-keccak 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "twox-hash 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmi 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "zeroize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate/)", + "trie-db 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", + "trie-root 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "substrate-primitives-storage" +name = "sp-version" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" dependencies = [ "impl-serde 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-std 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-debug-derive 2.0.0 (git+https://github.com/paritytech/substrate/)", + "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate/)", ] [[package]] -name = "substrate-rpc-primitives" +name = "sp-wasm-interface" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" +source = "git+https://github.com/paritytech/substrate/#f548309478da3935f72567c2abc2eceec3978e9f" dependencies = [ - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", + "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmi 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "substrate-runtime-interface" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "structopt" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "environmental 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "primitive-types 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-std 2.0.0 (git+https://github.com/paritytech/substrate/)", - "static_assertions 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "substrate-externalities 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-runtime-interface-proc-macro 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-wasm-interface 2.0.0 (git+https://github.com/paritytech/substrate/)", + "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", + "structopt-derive 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "substrate-runtime-interface-proc-macro" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" +name = "structopt-derive" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "Inflector 0.11.4 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "substrate-state-machine" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" +name = "strum" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "substrate-externalities 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-panic-handler 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-trie 2.0.0 (git+https://github.com/paritytech/substrate/)", - "trie-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", - "trie-root 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", + "strum_macros 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "strum_macros" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "substrate-bip39" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "pbkdf2 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "schnorrkel 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)", + "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "substrate-subxt" -version = "0.3.0" -source = "git+https://github.com/paritytech/substrate-subxt/?branch=v0.3#1148141cf4a0fcf51689c0c3a115fe4fe5c597b9" +version = "0.4.0" +source = "git+https://github.com/paritytech/substrate-subxt/?rev=a9df35c570afdf7f5b081acb09dcf06fc3e5ad42#a9df35c570afdf7f5b081acb09dcf06fc3e5ad42" dependencies = [ - "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", "frame-metadata 2.0.0 (git+https://github.com/paritytech/substrate/)", "frame-support 2.0.0 (git+https://github.com/paritytech/substrate/)", - "frame-system 2.0.0 (git+https://github.com/paritytech/substrate/)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpc-core-client 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpc-core-client 14.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "pallet-balances 2.0.0 (git+https://github.com/paritytech/substrate/)", - "pallet-contracts 2.0.0 (git+https://github.com/paritytech/substrate/)", "pallet-indices 2.0.0 (git+https://github.com/paritytech/substrate/)", "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "sc-rpc-api 2.0.0 (git+https://github.com/paritytech/substrate/)", - "sc-transaction-graph 2.0.0 (git+https://github.com/paritytech/substrate/)", - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", - "sr-version 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-rpc-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-rpc 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate/)", + "sp-version 2.0.0 (git+https://github.com/paritytech/substrate/)", + "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "substrate-trie" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" -dependencies = [ - "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", - "memory-db 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-std 2.0.0 (git+https://github.com/paritytech/substrate/)", - "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)", - "trie-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", - "trie-root 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "substrate-wasm-interface" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate/#b3a7c8e463ff7a63ce20e1eb14d8ccc63de4a412" -dependencies = [ - "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmi 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "subtle" version = "1.0.0" @@ -2308,22 +2259,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "subtle" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "syn" -version = "0.15.44" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "syn" -version = "1.0.8" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2338,7 +2279,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2348,7 +2289,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2368,7 +2309,25 @@ name = "textwrap" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "thiserror" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "thiserror-impl 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2384,7 +2343,7 @@ name = "time" version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2418,18 +2377,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-fs 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-threadpool 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-udp 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2450,12 +2409,12 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-executor" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2469,7 +2428,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-threadpool 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2484,18 +2443,18 @@ dependencies = [ [[package]] name = "tokio-reactor" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2517,14 +2476,14 @@ dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-threadpool" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2535,18 +2494,18 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-timer" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2567,10 +2526,10 @@ dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2581,13 +2540,13 @@ dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2595,7 +2554,7 @@ name = "toml" version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2615,7 +2574,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2634,10 +2593,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "trie-db" -version = "0.15.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "elastic-array 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", + "elastic-array 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2712,12 +2671,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "unicode-width" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "unicode-xid" -version = "0.1.0" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -2737,7 +2691,7 @@ dependencies = [ [[package]] name = "vcpkg" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -2755,9 +2709,9 @@ name = "wabt" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", "wabt-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2766,7 +2720,7 @@ name = "wabt-sys" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)", "cmake 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2791,7 +2745,7 @@ name = "wasmi" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "memory_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2801,23 +2755,35 @@ dependencies = [ [[package]] name = "wasmi-validation" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "parity-wasm 0.40.3 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-wasm 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "wasmi-validation" -version = "0.3.0" +name = "websocket" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "parity-wasm 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)", + "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-tls 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "websocket-base 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "websocket" -version = "0.23.0" +name = "websocket-base" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2825,17 +2791,13 @@ dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)", "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-tls 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2900,7 +2862,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "zeroize" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "zeroize_derive 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2913,7 +2875,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2931,7 +2893,7 @@ dependencies = [ "checksum ahash 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "6f33b5018f120946c1dcf279194f238a9f146725593ead1c08fa47ff22b0b5d3" "checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -"checksum anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)" = "6f1072d8f55592084072d2d3cb23a4b680a8543c00f10d446118e85ad3718142" +"checksum anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "9267dff192e68f3399525901e709a48c1d3982c9c072fa32f2127a0cb0babf14" "checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" "checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" "checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" @@ -2954,8 +2916,8 @@ dependencies = [ "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" "checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" "checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" -"checksum cargo_metadata 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8d2d1617e838936c0d2323a65cc151e03ae19a7678dd24f72bccf27119b90a5d" -"checksum cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)" = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8" +"checksum cargo_metadata 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "46e3374c604fb39d1a2f35ed5e4a4e30e60d01fab49446e08f1b3e9a90aef202" +"checksum cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)" = "f52a465a666ca3d838ebbf08b241383421412fe7ebb463527bba275526d89f76" "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" "checksum clear_on_drop 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "97276801e127ffb46b66ce23f35cc96bd454fa311294bced4bbace7baa8b1d17" @@ -2975,11 +2937,11 @@ dependencies = [ "checksum crunchy 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" "checksum crypto-mac 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" "checksum curve25519-dalek 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8b7dcd30ba50cdf88b55b033456138b7c0ac4afdc436d82e1b79f370f24cc66d" -"checksum derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6d944ac6003ed268757ef1ee686753b57efc5fcf0ebe7b64c9fc81e7e32ff839" +"checksum curve25519-dalek 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "26778518a7f6cffa1d25a44b602b62b979bd88adb9e99ffec546998cf3404839" "checksum derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2159be042979966de68315bce7034bb000c775f22e3e834e1c52ff78f041cae8" "checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -"checksum ed25519-dalek 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d07e8b8a8386c3b89a7a4b329fdfa4cb545de2545e9e2ebbc3dd3929253e426" -"checksum elastic-array 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "073be79b6538296faf81c631872676600616073817dd9a440c477ad09b408983" +"checksum ed25519-dalek 1.0.0-pre.3 (registry+https://github.com/rust-lang/crates.io-index)" = "978710b352437433c97b2bff193f2fb1dfd58a093f863dd95e225a19baa599a2" +"checksum elastic-array 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "580f3768bd6465780d063f5b8213a2ebd506e139b345e4a81eb301ceae3d61e1" "checksum env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" "checksum environmental 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "34f8467a0284de039e6bd0e25c14519538462ba5beb548bb1f03e645097837a8" "checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" @@ -3017,7 +2979,7 @@ dependencies = [ "checksum hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead" "checksum heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1679e6ea370dee694f91f1dc469bf94cf8f52051d147aec3e1f9497c6fc22461" "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" -"checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120" +"checksum hermit-abi 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f629dc602392d3ec14bfc8a09b5e644d7ffd725102b48b81e59f90f2633621d7" "checksum hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "023b39be39e3a2da62a94feb433e91e8bcd37676fbc8bea371daf52b7a769a3e" "checksum hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695" "checksum hmac-drbg 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c6e570451493f10f6581b48cdd530413b63ea9e780f544bfd3bdcaa0d89d1a7b" @@ -3031,17 +2993,17 @@ dependencies = [ "checksum integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ea155abb3ba6f382a75f1418988c05fe82959ed9ce727de427f9cfd425b0c903" "checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" "checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" -"checksum jsonrpc-client-transports 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d389a085cb2184604dff060390cadb8cba1f063c7fd0ad710272c163c88b9f20" -"checksum jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "34651edf3417637cc45e70ed0182ecfa9ced0b7e8131805fccf7400d989845ca" -"checksum jsonrpc-core-client 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9dbaec1d57271ff952f24ca79d37d716cfd749c855b058d9aa5f053a6b8ae4ef" -"checksum jsonrpc-derive 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d5d5c31575cc70a8b21542599028472c80a9248394aeea4d8918a045a0ab08a3" -"checksum jsonrpc-pubsub 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3ee1b8da0b9219a231c4b7cbc7110bfdb457cbcd8d90a6224d0b3cab8aae8443" +"checksum jsonrpc-client-transports 14.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0a9ae166c4d1f702d297cd76d4b55758ace80272ffc6dbb139fdc1bf810de40b" +"checksum jsonrpc-core 14.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fe3b688648f1ef5d5072229e2d672ecb92cbff7d1c79bcf3fd5898f3f3df0970" +"checksum jsonrpc-core-client 14.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "080dc110be17701097df238fad3c816d4a478a1899dfbcf8ec8957dd40ec7304" +"checksum jsonrpc-derive 14.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8609af8f63b626e8e211f52441fcdb6ec54f1a446606b10d5c89ae9bf8a20058" +"checksum jsonrpc-pubsub 14.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3453625f0f0f5cd6d6776d389d73b7d70fcc98620b7cbb1cbbb1f6a36e95f39a" "checksum keccak 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8" -"checksum libsecp256k1 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2bd9a7c16c9487e710536b699c962f022266347c94201174aa0a7eb0546051aa" +"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" +"checksum libsecp256k1 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b0885ff5b8070cdafbf65b3d098a0b7daf4925a18a704d3c503996443b799cc2" "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" "checksum lock_api 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e57b3997725d2b60dbec1297f6c2e2957cc383db1cebd6be812163f969c7d586" "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" @@ -3055,7 +3017,7 @@ dependencies = [ "checksum memory_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" "checksum merlin 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2b0942b357c1b4d0dc43ba724674ec89c3218e6ca2b3e8269e7cb53bcecd2f6e" "checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" -"checksum mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "83f51996a3ed004ef184e16818edc51fadffe8e7ca68be67f9dee67d84d0ff23" +"checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f" "checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125" "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" "checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" @@ -3072,13 +3034,10 @@ dependencies = [ "checksum openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585" "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" "checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f" -"checksum pallet-balances 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" -"checksum pallet-contracts 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" "checksum pallet-indices 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" "checksum parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f9f9d99dae413590a5f37e43cd99b94d4e62a244160562899126913ea7108673" "checksum parity-scale-codec-derive 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "492ac3aa93d6caa5d20e4e3e0b75d08e2dcd9dd8a50d19529548b6fe11b3f295" "checksum parity-util-mem 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "570093f39f786beea92dcc09e45d8aae7841516ac19a50431953ac82a0e8f85c" -"checksum parity-wasm 0.40.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1e39faaa292a687ea15120b1ac31899b13586446521df6c149e46f1584671e0f" "checksum parity-wasm 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc878dac00da22f8f61e7af3157988424567ab01d9920b962ef7dcbd7cd865" "checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337" "checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" @@ -3097,12 +3056,9 @@ dependencies = [ "checksum proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aeccfe4d5d8ea175d5f0e4a2ad0637e0f4121d63bd99d356fb1f39ab2e7c6097" "checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" "checksum proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e" -"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" "checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" -"checksum pwasm-utils 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d473123ba135028544926f7aa6f34058d8bc6f120c4fcd3777f84af724280b3" "checksum pwasm-utils 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f7a12f176deee919f4ba55326ee17491c8b707d0987aed822682c821b660192" "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" -"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" "checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" "checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412" @@ -3131,7 +3087,6 @@ dependencies = [ "checksum safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" "checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421" "checksum sc-rpc-api 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" -"checksum sc-transaction-graph 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" "checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" "checksum schnorrkel 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)" = "eacd8381b3c37840c9c9f40472af529e49975bdcbc24f83c31059fd6539023d3" "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" @@ -3140,51 +3095,54 @@ dependencies = [ "checksum security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895" "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -"checksum serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "1217f97ab8e8904b57dd22eb61cde455fa7446a9c1cf43966066da047c1f3702" -"checksum serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "a8c6faef9a2e64b0064f48570289b4bf8823b7581f1d6157c1b52152306651d0" -"checksum serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)" = "1a3351dcbc1f067e2c92ab7c3c1f288ad1a4cffc470b5aaddb4c2e0a3ae80043" +"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" +"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" +"checksum serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)" = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7" "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" "checksum sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d" "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" "checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" "checksum smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86" +"checksum sp-api 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" +"checksum sp-api-proc-macro 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" +"checksum sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" +"checksum sp-arithmetic 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" +"checksum sp-core 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" +"checksum sp-debug-derive 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" +"checksum sp-externalities 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" +"checksum sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" +"checksum sp-io 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" +"checksum sp-keyring 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" +"checksum sp-panic-handler 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" +"checksum sp-rpc 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" +"checksum sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" +"checksum sp-runtime-interface 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" +"checksum sp-runtime-interface-proc-macro 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" +"checksum sp-state-machine 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" +"checksum sp-std 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" +"checksum sp-storage 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" +"checksum sp-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" +"checksum sp-trie 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" +"checksum sp-version 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" +"checksum sp-wasm-interface 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" "checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" -"checksum sr-arithmetic 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" -"checksum sr-io 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" -"checksum sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" -"checksum sr-sandbox 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" -"checksum sr-std 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" -"checksum sr-version 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" "checksum static_assertions 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" "checksum structopt 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "30b3a3e93f5ad553c38b3301c8a0a0cec829a36783f6a0c467fc4bf553a5f5bf" "checksum structopt-derive 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea692d40005b3ceba90a9fe7a78fa8d4b82b0ce627eebbffc329aab850f3410e" "checksum strum 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6138f8f88a16d90134763314e3fc76fa3ed6a7db4725d6acf9a3ef95a3188d22" "checksum strum_macros 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0054a7df764039a6cd8592b9de84be4bec368ff081d203a7d5371cbfa8e65c81" -"checksum substrate-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" "checksum substrate-bip39 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3be511be555a3633e71739a79e4ddff6a6aaa6579fa6114182a51d72c3eb93c5" -"checksum substrate-debug-derive 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" -"checksum substrate-externalities 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" -"checksum substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" -"checksum substrate-keyring 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" -"checksum substrate-panic-handler 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" -"checksum substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" -"checksum substrate-primitives-storage 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" -"checksum substrate-rpc-primitives 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" -"checksum substrate-runtime-interface 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" -"checksum substrate-runtime-interface-proc-macro 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" -"checksum substrate-state-machine 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" -"checksum substrate-subxt 0.3.0 (git+https://github.com/paritytech/substrate-subxt/?branch=v0.3)" = "" -"checksum substrate-trie 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" -"checksum substrate-wasm-interface 2.0.0 (git+https://github.com/paritytech/substrate/)" = "" +"checksum substrate-subxt 0.4.0 (git+https://github.com/paritytech/substrate-subxt/?rev=a9df35c570afdf7f5b081acb09dcf06fc3e5ad42)" = "" "checksum subtle 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" -"checksum subtle 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab3af2eb31c42e8f0ccf43548232556c42737e01a96db6e1777b0be108e79799" -"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -"checksum syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "661641ea2aa15845cddeb97dad000d22070bb5c1fb456b96c1cba883ec691e92" +"checksum subtle 2.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c65d530b10ccaeac294f349038a597e435b18fb456aadd0840a623f83b9e941" +"checksum syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238" "checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" "checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +"checksum thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6f357d1814b33bc2dc221243f8424104bfe72dbe911d5b71b3816a2dff1c977e" +"checksum thiserror-impl 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2e25d25307eb8436894f727aba8f65d07adf02e5b35a13cebed48bd282bfef" "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" "checksum tiny-bip39 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c1c5676413eaeb1ea35300a0224416f57abc3bd251657e0fafc12c47ff98c060" @@ -3192,14 +3150,14 @@ dependencies = [ "checksum tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" "checksum tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f" "checksum tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443" -"checksum tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0f27ee0e6db01c5f0b2973824547ce7e637b2ed79b891a9677b0de9bd532b6ac" +"checksum tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "ca6df436c42b0c3330a82d855d2ef017cd793090ad550a6bc2184f4b933532ab" "checksum tokio-fs 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe6dc22b08d6993916647d108a1a7d15b9cd29c4f4496c62b92c45b5041b7af" "checksum tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926" -"checksum tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "c56391be9805bc80163151c0b9e5164ee64f4b0200962c346fea12773158f22d" +"checksum tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "6732fe6b53c8d11178dcb77ac6d9682af27fc6d4cb87789449152e5377377146" "checksum tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "d06554cce1ae4a50f42fba8023918afa931413aded705b560e29600ccf7c6d76" "checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119" -"checksum tokio-threadpool 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "2bd2c6a3885302581f4401c82af70d792bb9df1700e7437b0aeb4ada94d5388c" -"checksum tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e" +"checksum tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "f0c32ffea4827978e9aa392d2f743d973c1dfa3730a2ed3f22ce1e6984da848c" +"checksum tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1739638e364e558128461fc1ad84d997702c8e31c2e6b18fb99842268199e827" "checksum tokio-tls 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "354b8cd83825b3c20217a9dc174d6a0c67441a2fae5c41bcb1ea6679f6ae0f7c" "checksum tokio-udp 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f02298505547f73e60f568359ef0d016d5acd6e830ab9bc7c4a5b3403440121b" "checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445" @@ -3208,7 +3166,7 @@ dependencies = [ "checksum tracing-attributes 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a4263b12c3d3c403274493eb805966093b53214124796552d674ca1dd5d27c2b" "checksum tracing-core 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "bc913647c520c959b6d21e35ed8fa6984971deca9f0a2fcb8c51207e0c56af1d" "checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" -"checksum trie-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d0b62d27e8aa1c07414549ac872480ac82380bab39e730242ab08d82d7cc098a" +"checksum trie-db 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "784a9813d23f18bccab728ab039c39b8a87d0d6956dcdece39e92f5cffe5076e" "checksum trie-root 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0b779f7c1c8fe9276365d9d5be5c4b5adeacf545117bb3f64c974305789c5c0b" "checksum twox-hash 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3bfd5b7557925ce778ff9b9ef90e3ade34c524b5ff10e239c69a42d546d2af56" "checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" @@ -3218,11 +3176,10 @@ dependencies = [ "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" "checksum unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b561e267b2326bb4cebfc0ef9e68355c7abe6c6f522aeac2f5bf95d56c59bdcf" "checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" -"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20" -"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" +"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" "checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -"checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95" +"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" "checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" "checksum wabt 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3c5c5c1286c6e578416982609f47594265f9d489f9b836157d403ad605a46693" @@ -3230,9 +3187,9 @@ dependencies = [ "checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e" "checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" "checksum wasmi 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bf617d864d25af3587aa745529f7aaa541066c876d57e050c0d0c85c61c92aff" -"checksum wasmi-validation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6bc0356e3df56e639fc7f7d8a99741915531e27ed735d911ed83d7e1339c8188" "checksum wasmi-validation 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea78c597064ba73596099281e2f4cfc019075122a65cdda3205af94f0b264d93" -"checksum websocket 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b255b190f412e45000c35be7fe9b48b39a2ac5eb90d093d421694e5dae8b335c" +"checksum websocket 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)" = "413b37840b9e27b340ce91b319ede10731de8c72f5bc4cb0206ec1ca4ce581d0" +"checksum websocket-base 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5e3810f0d00c4dccb54c30a4eee815e703232819dec7b007db115791c42aa374" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" @@ -3242,6 +3199,6 @@ dependencies = [ "checksum wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9" "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" "checksum zeroize 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "45af6a010d13e4cf5b54c94ba5a2b2eba5596b9e46bf5875612d332a1f2b3f86" -"checksum zeroize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cdc979d9b5ead18184c357c4d8a3f81b579aae264e32507223032e64715462d3" +"checksum zeroize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3cbac2ed2ba24cc90f5e06485ac8c7c1e5449fe8911aef4d8877218af021a5b8" "checksum zeroize_derive 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2" "checksum zip 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3c21bb410afa2bd823a047f5bda3adb62f51074ac7e06263b2c97ecdd47e9fc6" diff --git a/Cargo.toml b/Cargo.toml index 5fc193ed..f62487f1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,13 +20,14 @@ anyhow = "1.0" structopt = "0.3" log = "0.4" heck = "0.3" +hex = "0.4.0" zip = { version = "0.5", default-features = false } pwasm-utils = "0.12" parity-wasm = "0.41" cargo_metadata = "0.9" -substrate-primitives = { git = "https://github.com/paritytech/substrate/", package = "substrate-primitives", optional = true } -subxt = { git = "https://github.com/paritytech/substrate-subxt/", branch = "v0.3", package = "substrate-subxt", optional = true } +sp-core = { git = "https://github.com/paritytech/substrate/", package = "sp-core", optional = true } +subxt = { git = "https://github.com/paritytech/substrate-subxt/", rev = "a9df35c570afdf7f5b081acb09dcf06fc3e5ad42", package = "substrate-subxt", optional = true } tokio = { version = "0.1", optional = true } futures = { version = "0.1", optional = true } url = { version = "1.7", optional = true } @@ -43,5 +44,5 @@ wabt = "0.9" [features] default = [] -deploy = ["substrate-primitives", "subxt", "tokio", "futures", "url"] +deploy = ["sp-core", "subxt", "tokio", "futures", "url"] test-ci-only = [] diff --git a/src/cmd/deploy.rs b/src/cmd/deploy.rs index 245d79b2..e3ac683e 100644 --- a/src/cmd/deploy.rs +++ b/src/cmd/deploy.rs @@ -18,10 +18,10 @@ use std::{fs, io::Read, path::PathBuf}; use anyhow::{Context, Result}; use futures::future::Future; -use substrate_primitives::{crypto::Pair, sr25519, H256}; +use sp_core::H256; use subxt::{contracts, system::System, DefaultNodeRuntime}; -use crate::cmd::build::{self, CrateMetadata}; +use crate::{ExtrinsicOpts, cmd::build}; /// Load the wasm blob from the specified path. /// @@ -60,24 +60,19 @@ fn extract_code_hash(extrinsic_result: subxt::ExtrinsicSuccess) -> /// Creates an extrinsic with the `Contracts::put_code` Call, submits via RPC, then waits for /// the `ContractsEvent::CodeStored` event. pub(crate) fn execute_deploy( - url: url::Url, - suri: &str, - password: Option<&str>, - gas: u64, + extrinsic_opts: &ExtrinsicOpts, contract_wasm_path: Option<&PathBuf>, ) -> Result { - let signer = match sr25519::Pair::from_string(suri, password) { - Ok(signer) => signer, - Err(_) => anyhow::bail!("Secret string error"), - }; + let signer = extrinsic_opts.signer()?; + let gas_limit = extrinsic_opts.gas_limit.clone(); let code = load_contract_code(contract_wasm_path)?; let fut = subxt::ClientBuilder::::new() - .set_url(url) + .set_url(extrinsic_opts.url.clone()) .build() .and_then(|cli| cli.xt(signer, None)) - .and_then(move |xt| xt.submit_and_watch(contracts::put_code(gas, code))); + .and_then(move |xt| xt.submit_and_watch(contracts::put_code(gas_limit, code))); let mut rt = tokio::runtime::Runtime::new()?; if let Ok(extrinsic_success) = rt.block_on(fut) { @@ -95,6 +90,7 @@ mod tests { use std::{fs, io::Write, path}; use assert_matches::assert_matches; + use crate::ExtrinsicOpts; #[test] #[ignore] // depends on a local substrate node running @@ -117,7 +113,14 @@ mod tests { let _ = file.write_all(&wasm); let url = url::Url::parse("ws://localhost:9944").unwrap(); - let result = super::execute_deploy(url, "//Alice", None, 500_000, Some(&wasm_path)); +// let extrinsic_opts = ExtrinsicOpts::new(url, "//Alice".into(), None, 500_000); + let extrinsic_opts = ExtrinsicOpts { + url, + suri: "//Alice".into(), + password: None, + gas_limit: 500_000 + }; + let result = super::execute_deploy(&extrinsic_opts, Some(&wasm_path)); assert_matches!(result, Ok(_)); } diff --git a/src/cmd/instantiate.rs b/src/cmd/instantiate.rs new file mode 100644 index 00000000..a5b731f1 --- /dev/null +++ b/src/cmd/instantiate.rs @@ -0,0 +1,98 @@ +// Copyright 2018-2019 Parity Technologies (UK) Ltd. +// This file is part of ink!. +// +// ink! 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. +// +// ink! 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 ink!. If not, see . + +use anyhow::Result; +use futures::future::Future; +use subxt::{balances::Balances, contracts, system::System, DefaultNodeRuntime}; + +use crate::{ExtrinsicOpts, HexData}; + +/// Attempt to extract the contract account from the extrinsic result. +/// +/// Returns an Error if the `Contracts::Instantiated` is not found or cannot be decoded. +fn extract_contract_account(extrinsic_result: subxt::ExtrinsicSuccess) -> Result { + match extrinsic_result.find_event::<(T::AccountId, T::AccountId)>("Contracts", "Instantiated") { + Some(Ok((_src_acct, dest_acct))) => Ok(dest_acct), + Some(Err(err)) => Err(anyhow::anyhow!("Failed to decode contract source and destination accounts: {}", err)), + None => Err(anyhow::anyhow!( + "Failed to find Contracts::Instantiated Event" + )), + } +} + +/// Instantiate a contract stored at the supplied code hash. +/// Returns the account id of the instantiated contract if successful. +/// +/// Creates an extrinsic with the `Contracts::instantiate` Call, submits via RPC, then waits for +/// the `ContractsEvent::Instantiated` event. +pub(crate) fn execute_instantiate( + extrinsic_opts: &ExtrinsicOpts, + endowment: ::Balance, + code_hash: ::Hash, + data: HexData, +) -> Result { + let signer = extrinsic_opts.signer()?; + let gas_limit = extrinsic_opts.gas_limit.clone(); + + let fut = subxt::ClientBuilder::::new() + .set_url(extrinsic_opts.url.clone()) + .build() + .and_then(|cli| cli.xt(signer, None)) + .and_then(move |xt| xt.submit_and_watch(contracts::instantiate::(endowment, gas_limit, code_hash, data.0))); + + let mut rt = tokio::runtime::Runtime::new()?; + if let Ok(extrinsic_success) = rt.block_on(fut) { + log::debug!("Instantiate success: {:?}", extrinsic_success); + + let contract_account = extract_contract_account(extrinsic_success)?; + Ok(format!("Contract account: {:?}", contract_account)) + } else { + Err(anyhow::anyhow!("Deploy error")) + } +} + +//#[cfg(test)] +//mod tests { +// use std::{fs, io::Write, path}; +// +// use assert_matches::assert_matches; +// +// #[test] +// #[ignore] // depends on a local substrate node running +// fn deploy_contract() { +// const CONTRACT: &str = r#" +//(module +// (func (export "call")) +// (func (export "deploy")) +//) +//"#; +// let wasm = wabt::wat2wasm(CONTRACT).expect("invalid wabt"); +// +// let out_dir = path::Path::new(env!("OUT_DIR")); +// +// let target_dir = path::Path::new("./target"); +// let _ = fs::create_dir(target_dir); +// +// let wasm_path = out_dir.join("flipper-pruned.wasm"); +// let mut file = fs::File::create(&wasm_path).unwrap(); +// let _ = file.write_all(&wasm); +// +// let url = url::Url::parse("ws://localhost:9944").unwrap(); +// let result = super::execute_deploy(url, "//Alice", None, 500_000, Some(&wasm_path)); +// +// assert_matches!(result, Ok(_)); +// } +//} diff --git a/src/cmd/mod.rs b/src/cmd/mod.rs index 64a93ec5..03d4950c 100644 --- a/src/cmd/mod.rs +++ b/src/cmd/mod.rs @@ -25,11 +25,15 @@ use anyhow::Result; mod build; #[cfg(feature = "deploy")] mod deploy; +#[cfg(feature = "deploy")] +mod instantiate; mod metadata; mod new; #[cfg(feature = "deploy")] pub(crate) use self::deploy::execute_deploy; +#[cfg(feature = "deploy")] +pub(crate) use self::instantiate::execute_instantiate; pub(crate) use self::{ build::execute_build, metadata::execute_generate_metadata, new::execute_new, }; diff --git a/src/main.rs b/src/main.rs index 5f3e529d..e7bf1748 100644 --- a/src/main.rs +++ b/src/main.rs @@ -16,7 +16,8 @@ mod cmd; -use std::{path::PathBuf, result::Result as StdResult}; +use std::{path::PathBuf, result::Result as StdResult, str::FromStr}; +use sp_core::{crypto::Pair, sr25519, H256}; use anyhow::Result; use structopt::{clap, StructOpt}; @@ -54,7 +55,7 @@ impl std::fmt::Display for InvalidAbstractionLayer { } } -impl std::str::FromStr for AbstractionLayer { +impl FromStr for AbstractionLayer { type Err = InvalidAbstractionLayer; fn from_str(input: &str) -> StdResult { @@ -67,6 +68,48 @@ impl std::str::FromStr for AbstractionLayer { } } +#[derive(Debug, Clone, PartialEq, Eq)] +pub(crate) struct HexData(pub Vec); + +impl FromStr for HexData { + type Err = hex::FromHexError; + + fn from_str(input: &str) -> StdResult { + hex::decode(input).map(HexData) + } +} + +/// Arguments required for creating and sending an extrinsic to a substrate node +#[derive(Debug, StructOpt)] +pub(crate) struct ExtrinsicOpts { + /// Websockets url of a substrate node + #[structopt( + name = "url", + long, + parse(try_from_str), + default_value = "ws://localhost:9944" + )] + url: url::Url, + /// Secret key URI for the account deploying the contract. + #[structopt(name = "suri", long, short)] + suri: String, + /// Password for the secret key + #[structopt(name = "password", long, short)] + password: Option, + /// Maximum amount of gas to be used for this command + #[structopt(name = "gas", long, default_value = "500_000")] + gas_limit: u64, +} + +impl ExtrinsicOpts { + pub fn signer(&self) -> Result { + sr25519::Pair::from_string( + &self.suri, + self.password.as_ref().map(String::as_ref) + ).map_err(|_| anyhow::anyhow!("Secret string error")) + } +} + #[derive(Debug, StructOpt)] enum Command { /// Setup and create a new smart contract. @@ -94,27 +137,37 @@ enum Command { #[cfg(feature = "deploy")] #[structopt(name = "deploy")] Deploy { - /// Websockets url of a substrate node - #[structopt( - name = "url", - long, - parse(try_from_str), - default_value = "ws://localhost:9944" - )] - url: url::Url, - /// Secret key URI for the account deploying the contract. - #[structopt(name = "suri", long, short)] - suri: String, - /// Password for the secret key - #[structopt(name = "password", long, short)] - password: Option, - #[structopt(name = "gas", long, default_value = "500000")] - /// Maximum amount of gas to be used in this deployment - gas: u64, + #[structopt(flatten)] + extrinsic_opts: ExtrinsicOpts, /// Path to wasm contract code, defaults to ./target/-pruned.wasm #[structopt(parse(from_os_str))] wasm_path: Option, }, + #[cfg(feature = "deploy")] + #[structopt(name = "instantiate")] + Instantiate { + #[structopt(flatten)] + extrinsic_opts: ExtrinsicOpts, + /// Transfers an initial balance to the instantiated contract + #[structopt(name = "endowment", long, default_value = "0")] + endowment: u128, + /// The hash of the smart contract code already uploaded to the chain + #[structopt(long, parse(try_from_str = parse_code_hash))] + code_hash: H256, + /// Hex encoded data to call a contract constructor + #[structopt(long)] + data: HexData, + }, +} + +fn parse_code_hash(input: &str) -> Result { + let bytes = hex::decode(input)?; + if bytes.len() != 32 { + anyhow::bail!("Code hash should be 32 bytes in length") + } + let mut arr = [0u8; 32]; + arr.copy_from_slice(&bytes); + Ok(H256(arr)) } fn main() { @@ -139,17 +192,23 @@ fn exec(cmd: Command) -> Result { Command::Test {} => Err(anyhow::anyhow!("Command unimplemented")), #[cfg(feature = "deploy")] Command::Deploy { - url, - suri, - password, - gas, + extrinsic_opts, wasm_path, } => cmd::execute_deploy( - url.clone(), - suri, - password.as_ref().map(String::as_ref), - *gas, + extrinsic_opts, wasm_path.as_ref(), ), + #[cfg(feature = "deploy")] + Command::Instantiate { + extrinsic_opts, + endowment, + code_hash, + data, + } => cmd::execute_instantiate( + extrinsic_opts, + *endowment, + *code_hash, + data.clone() + ) } } -- GitLab From 9b29d461fad5702d1fd2bfe333c277b0adb2f1fb Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 17 Dec 2019 17:15:28 +0000 Subject: [PATCH 02/12] Bump version --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f99b9e1e..a5c51198 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -194,7 +194,7 @@ dependencies = [ [[package]] name = "cargo-contract" -version = "0.2.0" +version = "0.3.0" dependencies = [ "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index f62487f1..f6f73697 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-contract" -version = "0.2.0" +version = "0.3.0" authors = ["Parity Technologies "] build = "build.rs" edition = "2018" -- GitLab From 58086aa1624344640002c023ccf2084172177e19 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 17 Dec 2019 17:17:51 +0000 Subject: [PATCH 03/12] Doc comments --- src/main.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main.rs b/src/main.rs index e7bf1748..c6f3b0ff 100644 --- a/src/main.rs +++ b/src/main.rs @@ -112,28 +112,28 @@ impl ExtrinsicOpts { #[derive(Debug, StructOpt)] enum Command { - /// Setup and create a new smart contract. + /// Setup and create a new smart contract project #[structopt(name = "new")] New { /// The abstraction layer to use: `core`, `model` or `lang` #[structopt(short = "l", long = "layer", default_value = "lang")] layer: AbstractionLayer, - /// The name of the newly created smart contract. + /// The name of the newly created smart contract name: String, /// The optional target directory for the contract project #[structopt(short, long, parse(from_os_str))] target_dir: Option, }, - /// Builds the smart contract. + /// Compiles the smart contract #[structopt(name = "build")] Build {}, /// Generate contract metadata artifacts #[structopt(name = "generate-metadata")] GenerateMetadata {}, - /// Test the smart contract off-chain. + /// Test the smart contract off-chain #[structopt(name = "test")] Test {}, - /// Deploy the smart contract on-chain. (Also for testing purposes.) + /// Upload the smart contract code to the chain #[cfg(feature = "deploy")] #[structopt(name = "deploy")] Deploy { @@ -143,6 +143,7 @@ enum Command { #[structopt(parse(from_os_str))] wasm_path: Option, }, + /// Instantiate a deployed smart contract #[cfg(feature = "deploy")] #[structopt(name = "instantiate")] Instantiate { -- GitLab From 96a3a54da6fe0b9330fb1b0042d073f48be99411 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 17 Dec 2019 17:24:29 +0000 Subject: [PATCH 04/12] Fix invalid default gas value --- src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index c6f3b0ff..58397b2e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -97,7 +97,7 @@ pub(crate) struct ExtrinsicOpts { #[structopt(name = "password", long, short)] password: Option, /// Maximum amount of gas to be used for this command - #[structopt(name = "gas", long, default_value = "500_000")] + #[structopt(name = "gas", long, default_value = "500000")] gas_limit: u64, } -- GitLab From 078038c3ffd99f3a49716696ce18c8781f833514 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Wed, 18 Dec 2019 10:07:50 +0000 Subject: [PATCH 05/12] Default empty constructor data --- src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index 58397b2e..3db4a75e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -156,7 +156,7 @@ enum Command { #[structopt(long, parse(try_from_str = parse_code_hash))] code_hash: H256, /// Hex encoded data to call a contract constructor - #[structopt(long)] + #[structopt(long, default_value = "0x")] data: HexData, }, } -- GitLab From 84f9bbd6bb833437f43a93a7c4012d891dc8d1e3 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Wed, 18 Dec 2019 11:04:52 +0000 Subject: [PATCH 06/12] Require constructor data --- src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index 3db4a75e..58397b2e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -156,7 +156,7 @@ enum Command { #[structopt(long, parse(try_from_str = parse_code_hash))] code_hash: H256, /// Hex encoded data to call a contract constructor - #[structopt(long, default_value = "0x")] + #[structopt(long)] data: HexData, }, } -- GitLab From 6599d356efcca83a3fb44272bd022535272f97c5 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Wed, 18 Dec 2019 11:35:07 +0000 Subject: [PATCH 07/12] Hide instantiate behind deploy feature --- Cargo.toml | 4 ++-- src/main.rs | 55 +++++++++++++++++++++++++++++------------------------ 2 files changed, 32 insertions(+), 27 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f6f73697..63c84dd3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,6 @@ anyhow = "1.0" structopt = "0.3" log = "0.4" heck = "0.3" -hex = "0.4.0" zip = { version = "0.5", default-features = false } pwasm-utils = "0.12" parity-wasm = "0.41" @@ -31,6 +30,7 @@ subxt = { git = "https://github.com/paritytech/substrate-subxt/", rev = "a9df35c tokio = { version = "0.1", optional = true } futures = { version = "0.1", optional = true } url = { version = "1.7", optional = true } +hex = { version = "0.4.0", optional = true } [build-dependencies] anyhow = "1.0" @@ -44,5 +44,5 @@ wabt = "0.9" [features] default = [] -deploy = ["sp-core", "subxt", "tokio", "futures", "url"] +deploy = ["sp-core", "subxt", "tokio", "futures", "url", "hex"] test-ci-only = [] diff --git a/src/main.rs b/src/main.rs index 58397b2e..f5e9f5f0 100644 --- a/src/main.rs +++ b/src/main.rs @@ -17,7 +17,6 @@ mod cmd; use std::{path::PathBuf, result::Result as StdResult, str::FromStr}; -use sp_core::{crypto::Pair, sr25519, H256}; use anyhow::Result; use structopt::{clap, StructOpt}; @@ -80,34 +79,40 @@ impl FromStr for HexData { } /// Arguments required for creating and sending an extrinsic to a substrate node -#[derive(Debug, StructOpt)] -pub(crate) struct ExtrinsicOpts { - /// Websockets url of a substrate node - #[structopt( +#[cfg(feature = "deploy")] +mod xt { + use sp_core::{crypto::Pair, sr25519, H256}; + + #[derive(Debug, StructOpt)] + pub(crate) struct ExtrinsicOpts { + /// Websockets url of a substrate node + #[structopt( name = "url", long, parse(try_from_str), default_value = "ws://localhost:9944" - )] - url: url::Url, - /// Secret key URI for the account deploying the contract. - #[structopt(name = "suri", long, short)] - suri: String, - /// Password for the secret key - #[structopt(name = "password", long, short)] - password: Option, - /// Maximum amount of gas to be used for this command - #[structopt(name = "gas", long, default_value = "500000")] - gas_limit: u64, -} + )] + url: url::Url, + /// Secret key URI for the account deploying the contract. + #[structopt(name = "suri", long, short)] + suri: String, + /// Password for the secret key + #[structopt(name = "password", long, short)] + password: Option, + /// Maximum amount of gas to be used for this command + #[structopt(name = "gas", long, default_value = "500000")] + gas_limit: u64, + } -impl ExtrinsicOpts { - pub fn signer(&self) -> Result { - sr25519::Pair::from_string( - &self.suri, - self.password.as_ref().map(String::as_ref) - ).map_err(|_| anyhow::anyhow!("Secret string error")) + impl ExtrinsicOpts { + pub fn signer(&self) -> Result { + sr25519::Pair::from_string( + &self.suri, + self.password.as_ref().map(String::as_ref) + ).map_err(|_| anyhow::anyhow!("Secret string error")) + } } + } #[derive(Debug, StructOpt)] @@ -138,7 +143,7 @@ enum Command { #[structopt(name = "deploy")] Deploy { #[structopt(flatten)] - extrinsic_opts: ExtrinsicOpts, + extrinsic_opts: xt::ExtrinsicOpts, /// Path to wasm contract code, defaults to ./target/-pruned.wasm #[structopt(parse(from_os_str))] wasm_path: Option, @@ -148,7 +153,7 @@ enum Command { #[structopt(name = "instantiate")] Instantiate { #[structopt(flatten)] - extrinsic_opts: ExtrinsicOpts, + extrinsic_opts: xt::ExtrinsicOpts, /// Transfers an initial balance to the instantiated contract #[structopt(name = "endowment", long, default_value = "0")] endowment: u128, -- GitLab From 0491163fe04fbd7b9b5a98e815750be1af096f11 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Wed, 18 Dec 2019 11:43:39 +0000 Subject: [PATCH 08/12] Rename deploy feature to extrinsics to include instantiate --- Cargo.toml | 2 +- README.md | 6 ++--- src/cmd/mod.rs | 8 +++--- src/main.rs | 68 +++++++++++++++++++++++++------------------------- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 63c84dd3..51c9cab4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,5 +44,5 @@ wabt = "0.9" [features] default = [] -deploy = ["sp-core", "subxt", "tokio", "futures", "url", "hex"] +extrinsics = ["sp-core", "subxt", "tokio", "futures", "url", "hex"] test-ci-only = [] diff --git a/README.md b/README.md index f7781b59..2088a68d 100644 --- a/README.md +++ b/README.md @@ -34,11 +34,11 @@ SUBCOMMANDS: ## Feature -The `deploy` subcommand is **disabled by default**, since it's not working properly at the moment and increases the build time. +The `deploy` and `instantiate` subcommands are **disabled by default**, since they are not fully stable yet and increase the build time. -If you want to try it, you need to enable the `deploy` feature. +If you want to try them, you need to enable the `extrinsics` feature. -Once it is working properly and the compilation time is acceptable, we will consider removing the `deploy` feature. +Once they are stable and the compilation time is acceptable, we will consider removing the `extrinsics` feature. ## License diff --git a/src/cmd/mod.rs b/src/cmd/mod.rs index 03d4950c..e8ad6429 100644 --- a/src/cmd/mod.rs +++ b/src/cmd/mod.rs @@ -23,16 +23,16 @@ use std::{ use anyhow::Result; mod build; -#[cfg(feature = "deploy")] +#[cfg(feature = "extrinsics")] mod deploy; -#[cfg(feature = "deploy")] +#[cfg(feature = "extrinsics")] mod instantiate; mod metadata; mod new; -#[cfg(feature = "deploy")] +#[cfg(feature = "extrinsics")] pub(crate) use self::deploy::execute_deploy; -#[cfg(feature = "deploy")] +#[cfg(feature = "extrinsics")] pub(crate) use self::instantiate::execute_instantiate; pub(crate) use self::{ build::execute_build, metadata::execute_generate_metadata, new::execute_new, diff --git a/src/main.rs b/src/main.rs index f5e9f5f0..0a2136d3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -17,6 +17,8 @@ mod cmd; use std::{path::PathBuf, result::Result as StdResult, str::FromStr}; +#[cfg(feature = "extrinsics")] +use sp_core::{crypto::Pair, sr25519, H256}; use anyhow::Result; use structopt::{clap, StructOpt}; @@ -70,6 +72,7 @@ impl FromStr for AbstractionLayer { #[derive(Debug, Clone, PartialEq, Eq)] pub(crate) struct HexData(pub Vec); +#[cfg(feature = "extrinsics")] impl FromStr for HexData { type Err = hex::FromHexError; @@ -79,40 +82,36 @@ impl FromStr for HexData { } /// Arguments required for creating and sending an extrinsic to a substrate node -#[cfg(feature = "deploy")] -mod xt { - use sp_core::{crypto::Pair, sr25519, H256}; - - #[derive(Debug, StructOpt)] - pub(crate) struct ExtrinsicOpts { - /// Websockets url of a substrate node - #[structopt( +#[cfg(feature = "extrinsics")] +#[derive(Debug, StructOpt)] +pub(crate) struct ExtrinsicOpts { + /// Websockets url of a substrate node + #[structopt( name = "url", long, parse(try_from_str), default_value = "ws://localhost:9944" - )] - url: url::Url, - /// Secret key URI for the account deploying the contract. - #[structopt(name = "suri", long, short)] - suri: String, - /// Password for the secret key - #[structopt(name = "password", long, short)] - password: Option, - /// Maximum amount of gas to be used for this command - #[structopt(name = "gas", long, default_value = "500000")] - gas_limit: u64, - } + )] + url: url::Url, + /// Secret key URI for the account deploying the contract. + #[structopt(name = "suri", long, short)] + suri: String, + /// Password for the secret key + #[structopt(name = "password", long, short)] + password: Option, + /// Maximum amount of gas to be used for this command + #[structopt(name = "gas", long, default_value = "500000")] + gas_limit: u64, +} - impl ExtrinsicOpts { - pub fn signer(&self) -> Result { - sr25519::Pair::from_string( - &self.suri, - self.password.as_ref().map(String::as_ref) - ).map_err(|_| anyhow::anyhow!("Secret string error")) - } +#[cfg(feature = "extrinsics")] +impl ExtrinsicOpts { + pub fn signer(&self) -> Result { + sr25519::Pair::from_string( + &self.suri, + self.password.as_ref().map(String::as_ref) + ).map_err(|_| anyhow::anyhow!("Secret string error")) } - } #[derive(Debug, StructOpt)] @@ -139,21 +138,21 @@ enum Command { #[structopt(name = "test")] Test {}, /// Upload the smart contract code to the chain - #[cfg(feature = "deploy")] + #[cfg(feature = "extrinsics")] #[structopt(name = "deploy")] Deploy { #[structopt(flatten)] - extrinsic_opts: xt::ExtrinsicOpts, + extrinsic_opts: ExtrinsicOpts, /// Path to wasm contract code, defaults to ./target/-pruned.wasm #[structopt(parse(from_os_str))] wasm_path: Option, }, /// Instantiate a deployed smart contract - #[cfg(feature = "deploy")] + #[cfg(feature = "extrinsics")] #[structopt(name = "instantiate")] Instantiate { #[structopt(flatten)] - extrinsic_opts: xt::ExtrinsicOpts, + extrinsic_opts: ExtrinsicOpts, /// Transfers an initial balance to the instantiated contract #[structopt(name = "endowment", long, default_value = "0")] endowment: u128, @@ -166,6 +165,7 @@ enum Command { }, } +#[cfg(feature = "extrinsics")] fn parse_code_hash(input: &str) -> Result { let bytes = hex::decode(input)?; if bytes.len() != 32 { @@ -196,7 +196,7 @@ fn exec(cmd: Command) -> Result { Command::Build {} => cmd::execute_build(None), Command::GenerateMetadata {} => cmd::execute_generate_metadata(None), Command::Test {} => Err(anyhow::anyhow!("Command unimplemented")), - #[cfg(feature = "deploy")] + #[cfg(feature = "extrinsics")] Command::Deploy { extrinsic_opts, wasm_path, @@ -204,7 +204,7 @@ fn exec(cmd: Command) -> Result { extrinsic_opts, wasm_path.as_ref(), ), - #[cfg(feature = "deploy")] + #[cfg(feature = "extrinsics")] Command::Instantiate { extrinsic_opts, endowment, -- GitLab From 3f4d093e04a186f4f4b78312176714b01dda43a0 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Wed, 18 Dec 2019 11:44:56 +0000 Subject: [PATCH 09/12] Format code --- src/cmd/deploy.rs | 7 +++-- src/cmd/instantiate.rs | 59 ++++++++++++++++++++++++------------------ src/main.rs | 20 ++++---------- 3 files changed, 42 insertions(+), 44 deletions(-) diff --git a/src/cmd/deploy.rs b/src/cmd/deploy.rs index e3ac683e..5319cbaf 100644 --- a/src/cmd/deploy.rs +++ b/src/cmd/deploy.rs @@ -21,7 +21,7 @@ use futures::future::Future; use sp_core::H256; use subxt::{contracts, system::System, DefaultNodeRuntime}; -use crate::{ExtrinsicOpts, cmd::build}; +use crate::{cmd::build, ExtrinsicOpts}; /// Load the wasm blob from the specified path. /// @@ -89,8 +89,8 @@ pub(crate) fn execute_deploy( mod tests { use std::{fs, io::Write, path}; - use assert_matches::assert_matches; use crate::ExtrinsicOpts; + use assert_matches::assert_matches; #[test] #[ignore] // depends on a local substrate node running @@ -113,12 +113,11 @@ mod tests { let _ = file.write_all(&wasm); let url = url::Url::parse("ws://localhost:9944").unwrap(); -// let extrinsic_opts = ExtrinsicOpts::new(url, "//Alice".into(), None, 500_000); let extrinsic_opts = ExtrinsicOpts { url, suri: "//Alice".into(), password: None, - gas_limit: 500_000 + gas_limit: 500_000, }; let result = super::execute_deploy(&extrinsic_opts, Some(&wasm_path)); diff --git a/src/cmd/instantiate.rs b/src/cmd/instantiate.rs index a5b731f1..b8bb1522 100644 --- a/src/cmd/instantiate.rs +++ b/src/cmd/instantiate.rs @@ -23,14 +23,19 @@ use crate::{ExtrinsicOpts, HexData}; /// Attempt to extract the contract account from the extrinsic result. /// /// Returns an Error if the `Contracts::Instantiated` is not found or cannot be decoded. -fn extract_contract_account(extrinsic_result: subxt::ExtrinsicSuccess) -> Result { - match extrinsic_result.find_event::<(T::AccountId, T::AccountId)>("Contracts", "Instantiated") { - Some(Ok((_src_acct, dest_acct))) => Ok(dest_acct), - Some(Err(err)) => Err(anyhow::anyhow!("Failed to decode contract source and destination accounts: {}", err)), - None => Err(anyhow::anyhow!( +fn extract_contract_account( + extrinsic_result: subxt::ExtrinsicSuccess, +) -> Result { + match extrinsic_result.find_event::<(T::AccountId, T::AccountId)>("Contracts", "Instantiated") { + Some(Ok((_src_acct, dest_acct))) => Ok(dest_acct), + Some(Err(err)) => Err(anyhow::anyhow!( + "Failed to decode contract source and destination accounts: {}", + err + )), + None => Err(anyhow::anyhow!( "Failed to find Contracts::Instantiated Event" )), - } + } } /// Instantiate a contract stored at the supplied code hash. @@ -39,29 +44,33 @@ fn extract_contract_account(extrinsic_result: subxt::ExtrinsicSuccess /// Creates an extrinsic with the `Contracts::instantiate` Call, submits via RPC, then waits for /// the `ContractsEvent::Instantiated` event. pub(crate) fn execute_instantiate( - extrinsic_opts: &ExtrinsicOpts, - endowment: ::Balance, - code_hash: ::Hash, - data: HexData, + extrinsic_opts: &ExtrinsicOpts, + endowment: ::Balance, + code_hash: ::Hash, + data: HexData, ) -> Result { - let signer = extrinsic_opts.signer()?; - let gas_limit = extrinsic_opts.gas_limit.clone(); + let signer = extrinsic_opts.signer()?; + let gas_limit = extrinsic_opts.gas_limit.clone(); - let fut = subxt::ClientBuilder::::new() - .set_url(extrinsic_opts.url.clone()) - .build() - .and_then(|cli| cli.xt(signer, None)) - .and_then(move |xt| xt.submit_and_watch(contracts::instantiate::(endowment, gas_limit, code_hash, data.0))); + let fut = subxt::ClientBuilder::::new() + .set_url(extrinsic_opts.url.clone()) + .build() + .and_then(|cli| cli.xt(signer, None)) + .and_then(move |xt| { + xt.submit_and_watch(contracts::instantiate::( + endowment, gas_limit, code_hash, data.0, + )) + }); - let mut rt = tokio::runtime::Runtime::new()?; - if let Ok(extrinsic_success) = rt.block_on(fut) { - log::debug!("Instantiate success: {:?}", extrinsic_success); + let mut rt = tokio::runtime::Runtime::new()?; + if let Ok(extrinsic_success) = rt.block_on(fut) { + log::debug!("Instantiate success: {:?}", extrinsic_success); - let contract_account = extract_contract_account(extrinsic_success)?; - Ok(format!("Contract account: {:?}", contract_account)) - } else { - Err(anyhow::anyhow!("Deploy error")) - } + let contract_account = extract_contract_account(extrinsic_success)?; + Ok(format!("Contract account: {:?}", contract_account)) + } else { + Err(anyhow::anyhow!("Deploy error")) + } } //#[cfg(test)] diff --git a/src/main.rs b/src/main.rs index 0a2136d3..d7ad63a8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -16,9 +16,9 @@ mod cmd; -use std::{path::PathBuf, result::Result as StdResult, str::FromStr}; #[cfg(feature = "extrinsics")] use sp_core::{crypto::Pair, sr25519, H256}; +use std::{path::PathBuf, result::Result as StdResult, str::FromStr}; use anyhow::Result; use structopt::{clap, StructOpt}; @@ -107,10 +107,8 @@ pub(crate) struct ExtrinsicOpts { #[cfg(feature = "extrinsics")] impl ExtrinsicOpts { pub fn signer(&self) -> Result { - sr25519::Pair::from_string( - &self.suri, - self.password.as_ref().map(String::as_ref) - ).map_err(|_| anyhow::anyhow!("Secret string error")) + sr25519::Pair::from_string(&self.suri, self.password.as_ref().map(String::as_ref)) + .map_err(|_| anyhow::anyhow!("Secret string error")) } } @@ -200,21 +198,13 @@ fn exec(cmd: Command) -> Result { Command::Deploy { extrinsic_opts, wasm_path, - } => cmd::execute_deploy( - extrinsic_opts, - wasm_path.as_ref(), - ), + } => cmd::execute_deploy(extrinsic_opts, wasm_path.as_ref()), #[cfg(feature = "extrinsics")] Command::Instantiate { extrinsic_opts, endowment, code_hash, data, - } => cmd::execute_instantiate( - extrinsic_opts, - *endowment, - *code_hash, - data.clone() - ) + } => cmd::execute_instantiate(extrinsic_opts, *endowment, *code_hash, data.clone()), } } -- GitLab From 05ef4d3715f9540ea84240f721305dc7d0e0301a Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Wed, 18 Dec 2019 12:23:19 +0000 Subject: [PATCH 10/12] Fix deploy test --- src/cmd/deploy.rs | 61 +++++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/src/cmd/deploy.rs b/src/cmd/deploy.rs index 5319cbaf..31c1243f 100644 --- a/src/cmd/deploy.rs +++ b/src/cmd/deploy.rs @@ -27,9 +27,11 @@ use crate::{cmd::build, ExtrinsicOpts}; /// /// Defaults to the target contract wasm in the current project, inferred via the crate metadata. fn load_contract_code(path: Option<&PathBuf>) -> Result> { - let default_wasm_path = build::collect_crate_metadata(path)?.dest_wasm; - let contract_wasm_path = path.unwrap_or(&default_wasm_path); - + let contract_wasm_path = match path { + Some(path) => path.clone(), + None => build::collect_crate_metadata(path)?.dest_wasm + }; + log::info!("Contract code path: {}", contract_wasm_path.display()); let mut data = Vec::new(); let mut file = fs::File::open(&contract_wasm_path) .context(format!("Failed to open {}", contract_wasm_path.display()))?; @@ -87,40 +89,41 @@ pub(crate) fn execute_deploy( #[cfg(test)] mod tests { - use std::{fs, io::Write, path}; + use std::{fs, io::Write}; - use crate::ExtrinsicOpts; + use crate::{ + cmd::{deploy::execute_deploy, tests::with_tmp_dir}, + ExtrinsicOpts, + }; use assert_matches::assert_matches; - #[test] - #[ignore] // depends on a local substrate node running - fn deploy_contract() { - const CONTRACT: &str = r#" + const CONTRACT: &str = r#" (module (func (export "call")) (func (export "deploy")) ) "#; - let wasm = wabt::wat2wasm(CONTRACT).expect("invalid wabt"); - - let out_dir = path::Path::new(env!("OUT_DIR")); - - let target_dir = path::Path::new("./target"); - let _ = fs::create_dir(target_dir); - let wasm_path = out_dir.join("flipper-pruned.wasm"); - let mut file = fs::File::create(&wasm_path).unwrap(); - let _ = file.write_all(&wasm); - - let url = url::Url::parse("ws://localhost:9944").unwrap(); - let extrinsic_opts = ExtrinsicOpts { - url, - suri: "//Alice".into(), - password: None, - gas_limit: 500_000, - }; - let result = super::execute_deploy(&extrinsic_opts, Some(&wasm_path)); - - assert_matches!(result, Ok(_)); + #[test] + #[ignore] // depends on a local substrate node running + fn deploy_contract() { + with_tmp_dir(|path| { + let wasm = wabt::wat2wasm(CONTRACT).expect("invalid wabt"); + + let wasm_path = path.join("test.wasm"); + let mut file = fs::File::create(&wasm_path).unwrap(); + let _ = file.write_all(&wasm); + + let url = url::Url::parse("ws://localhost:9944").unwrap(); + let extrinsic_opts = ExtrinsicOpts { + url, + suri: "//Alice".into(), + password: None, + gas_limit: 500_000, + }; + let result = execute_deploy(&extrinsic_opts, Some(&wasm_path)); + + assert_matches!(result, Ok(_)); + }); } } -- GitLab From fa0e945274578eb236db4222a648797a4c526dd2 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Wed, 18 Dec 2019 13:07:06 +0000 Subject: [PATCH 11/12] Instantiate test --- src/cmd/deploy.rs | 6 ++-- src/cmd/instantiate.rs | 77 +++++++++++++++++++++++------------------- src/main.rs | 12 +++++-- 3 files changed, 53 insertions(+), 42 deletions(-) diff --git a/src/cmd/deploy.rs b/src/cmd/deploy.rs index 31c1243f..4bb7d95f 100644 --- a/src/cmd/deploy.rs +++ b/src/cmd/deploy.rs @@ -64,7 +64,7 @@ fn extract_code_hash(extrinsic_result: subxt::ExtrinsicSuccess) -> pub(crate) fn execute_deploy( extrinsic_opts: &ExtrinsicOpts, contract_wasm_path: Option<&PathBuf>, -) -> Result { +) -> Result { let signer = extrinsic_opts.signer()?; let gas_limit = extrinsic_opts.gas_limit.clone(); @@ -79,9 +79,7 @@ pub(crate) fn execute_deploy( let mut rt = tokio::runtime::Runtime::new()?; if let Ok(extrinsic_success) = rt.block_on(fut) { log::debug!("Deploy success: {:?}", extrinsic_success); - - let code_hash = extract_code_hash(extrinsic_success)?; - Ok(format!("Code hash: {:?}", code_hash)) + extract_code_hash(extrinsic_success) } else { Err(anyhow::anyhow!("Deploy error")) } diff --git a/src/cmd/instantiate.rs b/src/cmd/instantiate.rs index b8bb1522..3052d451 100644 --- a/src/cmd/instantiate.rs +++ b/src/cmd/instantiate.rs @@ -48,7 +48,7 @@ pub(crate) fn execute_instantiate( endowment: ::Balance, code_hash: ::Hash, data: HexData, -) -> Result { +) -> Result<::AccountId> { let signer = extrinsic_opts.signer()?; let gas_limit = extrinsic_opts.gas_limit.clone(); @@ -66,42 +66,49 @@ pub(crate) fn execute_instantiate( if let Ok(extrinsic_success) = rt.block_on(fut) { log::debug!("Instantiate success: {:?}", extrinsic_success); - let contract_account = extract_contract_account(extrinsic_success)?; - Ok(format!("Contract account: {:?}", contract_account)) + extract_contract_account(extrinsic_success) } else { Err(anyhow::anyhow!("Deploy error")) } } -//#[cfg(test)] -//mod tests { -// use std::{fs, io::Write, path}; -// -// use assert_matches::assert_matches; -// -// #[test] -// #[ignore] // depends on a local substrate node running -// fn deploy_contract() { -// const CONTRACT: &str = r#" -//(module -// (func (export "call")) -// (func (export "deploy")) -//) -//"#; -// let wasm = wabt::wat2wasm(CONTRACT).expect("invalid wabt"); -// -// let out_dir = path::Path::new(env!("OUT_DIR")); -// -// let target_dir = path::Path::new("./target"); -// let _ = fs::create_dir(target_dir); -// -// let wasm_path = out_dir.join("flipper-pruned.wasm"); -// let mut file = fs::File::create(&wasm_path).unwrap(); -// let _ = file.write_all(&wasm); -// -// let url = url::Url::parse("ws://localhost:9944").unwrap(); -// let result = super::execute_deploy(url, "//Alice", None, 500_000, Some(&wasm_path)); -// -// assert_matches!(result, Ok(_)); -// } -//} +#[cfg(test)] +mod tests { + use std::{fs, io::Write}; + + use crate::{cmd::{deploy::execute_deploy, tests::with_tmp_dir}, ExtrinsicOpts, HexData}; + use assert_matches::assert_matches; + + const CONTRACT: &str = r#" +(module + (func (export "call")) + (func (export "deploy")) +) +"#; + + #[test] + #[ignore] // depends on a local substrate node running + fn instantiate_contract() { + with_tmp_dir(|path| { + let wasm = wabt::wat2wasm(CONTRACT).expect("invalid wabt"); + + let wasm_path = path.join("test.wasm"); + let mut file = fs::File::create(&wasm_path).unwrap(); + let _ = file.write_all(&wasm); + + let url = url::Url::parse("ws://localhost:9944").unwrap(); + let extrinsic_opts = ExtrinsicOpts { + url, + suri: "//Alice".into(), + password: None, + gas_limit: 500_000, + }; + let code_hash = execute_deploy(&extrinsic_opts, Some(&wasm_path)) + .expect("Deploy should succeed"); + + let result = super::execute_instantiate(&extrinsic_opts, 100000000000000, code_hash, HexData::default()); + + assert_matches!(result, Ok(_)); + }); + } +} diff --git a/src/main.rs b/src/main.rs index d7ad63a8..6bd31e8f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -69,7 +69,7 @@ impl FromStr for AbstractionLayer { } } -#[derive(Debug, Clone, PartialEq, Eq)] +#[derive(Debug, Default, Clone, PartialEq, Eq)] pub(crate) struct HexData(pub Vec); #[cfg(feature = "extrinsics")] @@ -198,13 +198,19 @@ fn exec(cmd: Command) -> Result { Command::Deploy { extrinsic_opts, wasm_path, - } => cmd::execute_deploy(extrinsic_opts, wasm_path.as_ref()), + } => { + let code_hash = cmd::execute_deploy(extrinsic_opts, wasm_path.as_ref())?; + Ok(format!("Code hash: {:?}", code_hash)) + }, #[cfg(feature = "extrinsics")] Command::Instantiate { extrinsic_opts, endowment, code_hash, data, - } => cmd::execute_instantiate(extrinsic_opts, *endowment, *code_hash, data.clone()), + } => { + let contract_account = cmd::execute_instantiate(extrinsic_opts, *endowment, *code_hash, data.clone())?; + Ok(format!("Contract account: {:?}", contract_account)) + }, } } -- GitLab From e02fc5ead06787fcb2cdba2f24188e44b5ac2813 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Wed, 18 Dec 2019 13:11:21 +0000 Subject: [PATCH 12/12] Update README --- README.md | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 2088a68d..d430f363 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Use the --force to ensure you are updated to the most recent cargo-contract vers ## Usage ``` -cargo-contract 0.2.0 +cargo-contract 0.3.0 Utilities to develop Wasm smart contracts. USAGE: @@ -24,19 +24,22 @@ OPTIONS: -V, --version Prints version information SUBCOMMANDS: - new Setup and create a new smart contract. - build Builds the smart contract. + new Setup and create a new smart contract project + build Compiles the smart contract generate-metadata Generate contract metadata artifacts - test Test the smart contract off-chain. - deploy Deploy the smart contract on-chain. (Also for testing purposes.) + test Test the smart contract off-chain + deploy Upload the smart contract code to the chain + instantiate Instantiate a deployed smart contract help Prints this message or the help of the given subcommand(s) ``` -## Feature +## Features The `deploy` and `instantiate` subcommands are **disabled by default**, since they are not fully stable yet and increase the build time. -If you want to try them, you need to enable the `extrinsics` feature. +If you want to try them, you need to enable the `extrinsics` feature: + +`cargo install --git https://github.com/paritytech/cargo-contract cargo-contract --features extrinsics --force` Once they are stable and the compilation time is acceptable, we will consider removing the `extrinsics` feature. -- GitLab