From a224292e8d300483973718cd295df2156b6bca4f Mon Sep 17 00:00:00 2001 From: Linfeng Qian Date: Mon, 17 May 2021 12:46:59 +0800 Subject: [PATCH 1/5] docs: add remark to test only rpc methods --- src/subcommands/rpc.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/subcommands/rpc.rs b/src/subcommands/rpc.rs index 810dea56..08833ad4 100644 --- a/src/subcommands/rpc.rs +++ b/src/subcommands/rpc.rs @@ -240,7 +240,7 @@ impl<'a> RpcSubCommand<'a> { .required(true) .about("The cycles of the transaction") ) - .about("Broadcast transaction without verify"), + .about("[TEST ONLY] Broadcast transaction without verify"), App::new("truncate") .arg( Arg::with_name("tip-hash") @@ -250,7 +250,7 @@ impl<'a> RpcSubCommand<'a> { .required(true) .about("Target tip block hash") ) - .about("Truncate blocks to target tip block"), + .about("[TEST ONLY] Truncate blocks to target tip block"), App::new("generate_block") .arg( Arg::with_name("json-path") @@ -266,6 +266,7 @@ impl<'a> RpcSubCommand<'a> { .validator(|input| HexParser.validate(input)) .about("Block assembler message (hex format)") ) + .about("[TEST ONLY] Generate an empty block") ]) } } From a0fd0b645e14cbbbffb4215e5110f70cf6ced047 Mon Sep 17 00:00:00 2001 From: Linfeng Qian Date: Tue, 18 May 2021 16:37:29 +0800 Subject: [PATCH 2/5] chore: Update ckb to v0.42.0-rc1 --- Cargo.lock | 97 +++++++++++++++++++------------------- Cargo.toml | 22 ++++----- Makefile | 2 +- ckb-index/Cargo.toml | 4 +- ckb-sdk-types/Cargo.toml | 14 +++--- ckb-sdk/Cargo.toml | 16 +++---- ckb-sdk/src/rpc/client.rs | 8 +--- ckb-sdk/src/rpc/types.rs | 24 ---------- plugin-protocol/Cargo.toml | 4 +- src/subcommands/rpc.rs | 5 +- test/Cargo.toml | 12 ++--- 11 files changed, 89 insertions(+), 119 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 620c12b2..212336d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -341,13 +341,13 @@ dependencies = [ [[package]] name = "ckb-build-info" -version = "0.41.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.41.0-rc1#ad1d897055ad90b6b899f6ff28a59cd42d7cc804" +version = "0.42.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" [[package]] name = "ckb-chain-spec" -version = "0.41.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.41.0-rc1#ad1d897055ad90b6b899f6ff28a59cd42d7cc804" +version = "0.42.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" dependencies = [ "ckb-crypto", "ckb-dao-utils", @@ -365,15 +365,15 @@ dependencies = [ [[package]] name = "ckb-channel" -version = "0.41.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.41.0-rc1#ad1d897055ad90b6b899f6ff28a59cd42d7cc804" +version = "0.42.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" dependencies = [ "crossbeam-channel", ] [[package]] name = "ckb-cli" -version = "0.41.0" +version = "0.42.0" dependencies = [ "ansi_term", "atty", @@ -441,8 +441,8 @@ dependencies = [ [[package]] name = "ckb-crypto" -version = "0.41.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.41.0-rc1#ad1d897055ad90b6b899f6ff28a59cd42d7cc804" +version = "0.42.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" dependencies = [ "ckb-fixed-hash", "faster-hex 0.4.1", @@ -454,8 +454,8 @@ dependencies = [ [[package]] name = "ckb-dao-utils" -version = "0.41.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.41.0-rc1#ad1d897055ad90b6b899f6ff28a59cd42d7cc804" +version = "0.42.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" dependencies = [ "byteorder", "ckb-error", @@ -464,8 +464,8 @@ dependencies = [ [[package]] name = "ckb-error" -version = "0.41.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.41.0-rc1#ad1d897055ad90b6b899f6ff28a59cd42d7cc804" +version = "0.42.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" dependencies = [ "anyhow", "ckb-occupied-capacity", @@ -475,8 +475,8 @@ dependencies = [ [[package]] name = "ckb-fixed-hash" -version = "0.41.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.41.0-rc1#ad1d897055ad90b6b899f6ff28a59cd42d7cc804" +version = "0.42.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" dependencies = [ "ckb-fixed-hash-core", "ckb-fixed-hash-macros", @@ -484,8 +484,8 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-core" -version = "0.41.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.41.0-rc1#ad1d897055ad90b6b899f6ff28a59cd42d7cc804" +version = "0.42.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" dependencies = [ "faster-hex 0.4.1", "serde", @@ -494,8 +494,8 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-macros" -version = "0.41.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.41.0-rc1#ad1d897055ad90b6b899f6ff28a59cd42d7cc804" +version = "0.42.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" dependencies = [ "ckb-fixed-hash-core", "proc-macro2", @@ -505,8 +505,8 @@ dependencies = [ [[package]] name = "ckb-hash" -version = "0.41.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.41.0-rc1#ad1d897055ad90b6b899f6ff28a59cd42d7cc804" +version = "0.42.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" dependencies = [ "blake2b-ref", "blake2b-rs", @@ -514,7 +514,7 @@ dependencies = [ [[package]] name = "ckb-index" -version = "0.41.0" +version = "0.42.0" dependencies = [ "bincode", "ckb-rocksdb", @@ -528,8 +528,8 @@ dependencies = [ [[package]] name = "ckb-jsonrpc-types" -version = "0.41.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.41.0-rc1#ad1d897055ad90b6b899f6ff28a59cd42d7cc804" +version = "0.42.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" dependencies = [ "ckb-types", "faster-hex 0.4.1", @@ -551,16 +551,16 @@ dependencies = [ [[package]] name = "ckb-logger" -version = "0.41.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.41.0-rc1#ad1d897055ad90b6b899f6ff28a59cd42d7cc804" +version = "0.42.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" dependencies = [ "log", ] [[package]] name = "ckb-occupied-capacity" -version = "0.41.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.41.0-rc1#ad1d897055ad90b6b899f6ff28a59cd42d7cc804" +version = "0.42.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" dependencies = [ "ckb-occupied-capacity-core", "ckb-occupied-capacity-macros", @@ -568,16 +568,16 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity-core" -version = "0.41.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.41.0-rc1#ad1d897055ad90b6b899f6ff28a59cd42d7cc804" +version = "0.42.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" dependencies = [ "serde", ] [[package]] name = "ckb-occupied-capacity-macros" -version = "0.41.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.41.0-rc1#ad1d897055ad90b6b899f6ff28a59cd42d7cc804" +version = "0.42.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" dependencies = [ "ckb-occupied-capacity-core", "quote", @@ -586,8 +586,8 @@ dependencies = [ [[package]] name = "ckb-pow" -version = "0.41.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.41.0-rc1#ad1d897055ad90b6b899f6ff28a59cd42d7cc804" +version = "0.42.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" dependencies = [ "byteorder", "ckb-hash", @@ -599,8 +599,8 @@ dependencies = [ [[package]] name = "ckb-rational" -version = "0.41.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.41.0-rc1#ad1d897055ad90b6b899f6ff28a59cd42d7cc804" +version = "0.42.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" dependencies = [ "numext-fixed-uint", "serde", @@ -608,8 +608,8 @@ dependencies = [ [[package]] name = "ckb-resource" -version = "0.41.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.41.0-rc1#ad1d897055ad90b6b899f6ff28a59cd42d7cc804" +version = "0.42.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" dependencies = [ "ckb-system-scripts", "ckb-types", @@ -633,8 +633,8 @@ dependencies = [ [[package]] name = "ckb-script" -version = "0.41.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.41.0-rc1#ad1d897055ad90b6b899f6ff28a59cd42d7cc804" +version = "0.42.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" dependencies = [ "byteorder", "ckb-chain-spec", @@ -652,7 +652,7 @@ dependencies = [ [[package]] name = "ckb-sdk" -version = "0.41.0" +version = "0.42.0" dependencies = [ "aes-ctr", "bech32", @@ -688,7 +688,7 @@ dependencies = [ [[package]] name = "ckb-sdk-types" -version = "0.41.0" +version = "0.42.0" dependencies = [ "ckb-crypto", "ckb-error", @@ -715,16 +715,16 @@ dependencies = [ [[package]] name = "ckb-traits" -version = "0.41.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.41.0-rc1#ad1d897055ad90b6b899f6ff28a59cd42d7cc804" +version = "0.42.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" dependencies = [ "ckb-types", ] [[package]] name = "ckb-types" -version = "0.41.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.41.0-rc1#ad1d897055ad90b6b899f6ff28a59cd42d7cc804" +version = "0.42.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" dependencies = [ "bit-vec", "bytes 0.5.6", @@ -734,6 +734,7 @@ dependencies = [ "ckb-hash", "ckb-occupied-capacity", "ckb-rational", + "derive_more", "merkle-cbt", "molecule", "numext-fixed-uint", @@ -742,8 +743,8 @@ dependencies = [ [[package]] name = "ckb-util" -version = "0.41.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.41.0-rc1#ad1d897055ad90b6b899f6ff28a59cd42d7cc804" +version = "0.42.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" dependencies = [ "linked-hash-map", "parking_lot 0.10.2", diff --git a/Cargo.toml b/Cargo.toml index baac81f4..fb7a3350 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,20 +1,20 @@ [package] name = "ckb-cli" -version = "0.41.0" +version = "0.42.0" license = "MIT" authors = ["Linfeng Qian ", "Nervos Core Dev "] edition = "2018" [dependencies] -ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } -ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } -ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1", features = ["secp"] } -ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } -ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } -ckb-util = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } -ckb-resource = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } -ckb-dao-utils = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } -ckb-chain-spec = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } +ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } +ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } +ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1", features = ["secp"] } +ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } +ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } +ckb-util = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } +ckb-resource = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } +ckb-dao-utils = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } +ckb-chain-spec = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } ckb-sdk = { path = "ckb-sdk" } ckb-index = { path = "ckb-index" } plugin-protocol = { path = "plugin-protocol", package = "ckb-cli-plugin-protocol" } @@ -60,7 +60,7 @@ tui = "0.6.0" termion = "1.5" [build-dependencies] -ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } +ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } [workspace] members = ["ckb-sdk", "ckb-index", "ckb-sdk-types", "plugin-protocol"] diff --git a/Makefile b/Makefile index b1e5e703..df40a1e5 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ ci: fmt clippy test security-audit git diff --exit-code Cargo.lock integration: - bash devtools/ci/integration.sh v0.41.0-rc1 + bash devtools/ci/integration.sh v0.42.0-rc1 prod: ## Build binary with release profile. cargo build --release diff --git a/ckb-index/Cargo.toml b/ckb-index/Cargo.toml index 425b45ec..9754baba 100644 --- a/ckb-index/Cargo.toml +++ b/ckb-index/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-index" -version = "0.41.0" +version = "0.42.0" authors = ["Linfeng Qian ", "Nervos Core Dev "] edition = "2018" license = "MIT" @@ -11,6 +11,6 @@ serde_derive = "1.0" bincode = "1.1.4" log = "0.4.6" failure = "0.1.5" -ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } +ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } ckb-sdk = { path = "../ckb-sdk" } rocksdb = { package = "ckb-rocksdb", version = "=0.13.0", features = ["snappy"] } diff --git a/ckb-sdk-types/Cargo.toml b/ckb-sdk-types/Cargo.toml index bbd1023a..340be8ab 100644 --- a/ckb-sdk-types/Cargo.toml +++ b/ckb-sdk-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-sdk-types" -version = "0.41.0" +version = "0.42.0" authors = ["Linfeng Qian ", "Nervos Core Dev "] edition = "2018" license = "MIT" @@ -9,11 +9,11 @@ license = "MIT" serde = { version = "1.0", features = ["rc"] } serde_derive = "1.0" -ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } -ckb-traits = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } -ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } -ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } -ckb-error = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } +ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } +ckb-traits = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } +ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } +ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } +ckb-error = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } [dev-dependencies] -ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1", features = ["secp"] } +ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1", features = ["secp"] } diff --git a/ckb-sdk/Cargo.toml b/ckb-sdk/Cargo.toml index 7187b562..78858918 100644 --- a/ckb-sdk/Cargo.toml +++ b/ckb-sdk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-sdk" -version = "0.41.0" +version = "0.42.0" authors = ["Linfeng Qian ", "Nervos Core Dev "] edition = "2018" license = "MIT" @@ -29,11 +29,11 @@ tokio = { version = "1" } bytes = "1" futures = "0.3" -ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } -ckb-error = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } -ckb-script = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } -ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } -ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } -ckb-resource = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } -ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1", features = ["secp"] } +ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } +ckb-error = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } +ckb-script = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } +ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } +ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } +ckb-resource = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } +ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1", features = ["secp"] } ckb-sdk-types = { path = "../ckb-sdk-types" } diff --git a/ckb-sdk/src/rpc/client.rs b/ckb-sdk/src/rpc/client.rs index 058e3dd2..c2ee8133 100644 --- a/ckb-sdk/src/rpc/client.rs +++ b/ckb-sdk/src/rpc/client.rs @@ -1,8 +1,8 @@ use ckb_jsonrpc_types::{ BannedAddr, Block, BlockNumber, BlockReward, BlockTemplate, BlockView, CellWithStatus, ChainInfo, Consensus, Cycle, EpochNumber, EpochView, ExtraLoggerConfig, HeaderView, JsonBytes, - LocalNode, MainLoggerConfig, OutPoint, PeerState, RawTxPool, RemoteNode, Script, Timestamp, - Transaction, TransactionProof, TransactionWithStatus, TxPoolInfo, Uint64, Version, + LocalNode, MainLoggerConfig, OutPoint, RawTxPool, RemoteNode, Script, Timestamp, Transaction, + TransactionProof, TransactionWithStatus, TxPoolInfo, Uint64, Version, }; use super::primitive; @@ -115,7 +115,6 @@ jsonrpc!(pub struct RawHttpRpcClient { // Stats pub fn get_blockchain_info(&mut self) -> ChainInfo; - pub fn get_peers_state(&mut self) -> Vec; // Miner pub fn get_block_template(&mut self, bytes_limit: Option, proposals_limit: Option, max_version: Option) -> BlockTemplate; @@ -367,9 +366,6 @@ impl HttpRpcClient { .map(Into::into) .map_err(|err| err.to_string()) } - pub fn get_peers_state(&mut self) -> Result, String> { - self.client.get_peers_state().map_err(|err| err.to_string()) - } // Miner pub fn get_block_template( diff --git a/ckb-sdk/src/rpc/types.rs b/ckb-sdk/src/rpc/types.rs index 80622f05..e4390bab 100644 --- a/ckb-sdk/src/rpc/types.rs +++ b/ckb-sdk/src/rpc/types.rs @@ -1133,27 +1133,3 @@ impl From for RawTxPool { } } } - -// ========= -// sync.rs -// ========= -//// TODO make PeerState fields public -// #[derive(Deserialize, Serialize, Debug)] -// pub struct PeerState { -// // TODO use peer_id -// // peer session id -// pub peer: Uint32, -// // last updated timestamp -// pub last_updated: Timestamp, -// // blocks count has request but not receive response yet -// pub blocks_in_flight: Uint32, -// } -// impl From for PeerState { -// fn from(json: rpc_types::PeerState) -> PeerState { -// PeerState { -// peer: json.peer.into(), -// last_updated: json.last_updated.into(), -// blocks_in_flight: json.blocks_in_flight.into() -// } -// } -// } diff --git a/plugin-protocol/Cargo.toml b/plugin-protocol/Cargo.toml index 92afcbea..4d21026c 100644 --- a/plugin-protocol/Cargo.toml +++ b/plugin-protocol/Cargo.toml @@ -8,8 +8,8 @@ edition = "2018" [dependencies] ckb-index = { path = "../ckb-index" } -ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } -ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } +ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } +ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } serde = { version = "1.0", features = ["rc"] } serde_derive = "1.0" serde_json = "1.0" diff --git a/src/subcommands/rpc.rs b/src/subcommands/rpc.rs index 08833ad4..855a970b 100644 --- a/src/subcommands/rpc.rs +++ b/src/subcommands/rpc.rs @@ -1,5 +1,5 @@ use ckb_jsonrpc_types::{ - self as rpc_types, BlockNumber, EpochNumber, JsonBytes, PeerState, Script, Transaction, + self as rpc_types, BlockNumber, EpochNumber, JsonBytes, Script, Transaction, }; use ckb_sdk::{ rpc::{ @@ -759,9 +759,6 @@ pub struct OptionH256(pub Option); #[derive(Serialize, Deserialize)] pub struct OptionEpochView(pub Option); -#[derive(Serialize, Deserialize)] -pub struct PeerStates(pub Vec); - #[derive(Serialize, Deserialize)] pub struct BannedAddrList(pub Vec); diff --git a/test/Cargo.toml b/test/Cargo.toml index 34031dca..daea2d45 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cli-test" -version = "0.41.0" +version = "0.42.0" authors = ["Linfeng Qian "] edition = "2018" @@ -14,11 +14,11 @@ env_logger = "0.6" toml = "0.5.0" serde_yaml = "0.8.9" ckb-sdk = { path = "../ckb-sdk" } -ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } -ckb-app-config = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } -ckb-chain-spec = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } -ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1", features = ["secp"] } -ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.41.0-rc1" } +ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } +ckb-app-config = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } +ckb-chain-spec = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } +ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1", features = ["secp"] } +ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } regex = "1.1.6" # Prevent this from interfering with workspaces From d064468ad7db587701fbdbbbd0eb4f9db5ac0fb2 Mon Sep 17 00:00:00 2001 From: Linfeng Qian Date: Tue, 25 May 2021 13:48:04 +0800 Subject: [PATCH 3/5] chore: use ckb dependencies from crates.io --- Cargo.lock | 117 +++++++++++++++++++++--------------- Cargo.toml | 27 +++++---- ckb-index/Cargo.toml | 7 ++- ckb-index/src/kvdb/rocks.rs | 2 +- ckb-sdk-types/Cargo.toml | 13 ++-- ckb-sdk/Cargo.toml | 17 +++--- plugin-protocol/Cargo.toml | 10 +-- test/Cargo.toml | 12 ++-- 8 files changed, 117 insertions(+), 88 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 212336d3..231103ca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -341,13 +341,15 @@ dependencies = [ [[package]] name = "ckb-build-info" -version = "0.42.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aaaaacce0931fa7eb810de6cfc5de4736cf39e3744fd0ba8bff2999858c3d34e" [[package]] name = "ckb-chain-spec" -version = "0.42.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83c3d6d98f6c8592932c061a278e017cd600bdb4d944c93972f2986eafdf2026" dependencies = [ "ckb-crypto", "ckb-dao-utils", @@ -365,8 +367,9 @@ dependencies = [ [[package]] name = "ckb-channel" -version = "0.42.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b3207ab3dc8839b992bdc3abe168de0f66b5264ce433568499ae3ca8e3f043" dependencies = [ "crossbeam-channel", ] @@ -428,7 +431,7 @@ dependencies = [ [[package]] name = "ckb-cli-plugin-protocol" -version = "0.1.0" +version = "0.42.0" dependencies = [ "ckb-index", "ckb-jsonrpc-types", @@ -441,8 +444,9 @@ dependencies = [ [[package]] name = "ckb-crypto" -version = "0.42.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a314bde06f29f906aeba70942cb11bfdd07679a025fa5869e43206b3c306cc" dependencies = [ "ckb-fixed-hash", "faster-hex 0.4.1", @@ -454,8 +458,9 @@ dependencies = [ [[package]] name = "ckb-dao-utils" -version = "0.42.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "259144017b59c2ecfbf3eba9fe0088059a3fb476ca1e029692f937bad74d5529" dependencies = [ "byteorder", "ckb-error", @@ -464,8 +469,9 @@ dependencies = [ [[package]] name = "ckb-error" -version = "0.42.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d95122d1d3a75c7ad02e60dcb7bc1ce43cc23dc6939bfeae340aa088637ea311" dependencies = [ "anyhow", "ckb-occupied-capacity", @@ -475,8 +481,9 @@ dependencies = [ [[package]] name = "ckb-fixed-hash" -version = "0.42.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1767eb66f487a0b1900ba4c81a244885cddac378bccf524c4b94372391241f6b" dependencies = [ "ckb-fixed-hash-core", "ckb-fixed-hash-macros", @@ -484,8 +491,9 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-core" -version = "0.42.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b8398353fbc7a09c67470eafd2aa6decaeb81bb1860dd077c71022abf77bd01" dependencies = [ "faster-hex 0.4.1", "serde", @@ -494,8 +502,9 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-macros" -version = "0.42.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de82af1bf5bd7c202386326fc4fdea481a2d3b737e881a7dffaedce324531b3" dependencies = [ "ckb-fixed-hash-core", "proc-macro2", @@ -505,8 +514,9 @@ dependencies = [ [[package]] name = "ckb-hash" -version = "0.42.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4087c33ba7477417a984f3a742f0d61b79db1ae4e26c3b5ada473cecfc34d609" dependencies = [ "blake2b-ref", "blake2b-rs", @@ -528,8 +538,9 @@ dependencies = [ [[package]] name = "ckb-jsonrpc-types" -version = "0.42.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cee5a15ecb996b7139edd099e58ad7511192ebda9f27917d82922a9423958996" dependencies = [ "ckb-types", "faster-hex 0.4.1", @@ -551,16 +562,18 @@ dependencies = [ [[package]] name = "ckb-logger" -version = "0.42.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "732ae1f9d0b61f68b7cd3bf6eeeb1b2019b950abd8e3e759e2d26226c9212f03" dependencies = [ "log", ] [[package]] name = "ckb-occupied-capacity" -version = "0.42.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0c6f011da1c92a71fe8f6d6819dbe55b7c86c3c589b2557c6b5aa9a9dc3cecd" dependencies = [ "ckb-occupied-capacity-core", "ckb-occupied-capacity-macros", @@ -568,16 +581,18 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity-core" -version = "0.42.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d4ae2960352d5bfef9ac3ba6a4dc4823f688ec63ee2f9d696f6b9fa71ff0fd1" dependencies = [ "serde", ] [[package]] name = "ckb-occupied-capacity-macros" -version = "0.42.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dda2d510805c4046a5fe92b7745eb2a8c348831959511410c61476bacfb681a0" dependencies = [ "ckb-occupied-capacity-core", "quote", @@ -586,8 +601,9 @@ dependencies = [ [[package]] name = "ckb-pow" -version = "0.42.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdef4b2303d2c67b0b1f930a7394c62afdff2758b6dc1f3c0a5bfe0d6174e66c" dependencies = [ "byteorder", "ckb-hash", @@ -599,8 +615,9 @@ dependencies = [ [[package]] name = "ckb-rational" -version = "0.42.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9542a3502fdd076036c31febe172df08a2fab78ee3775ad84401b2e35c42056e" dependencies = [ "numext-fixed-uint", "serde", @@ -608,8 +625,9 @@ dependencies = [ [[package]] name = "ckb-resource" -version = "0.42.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8376b8dba145efc86802923b5576c2b6902ead1b4a5cdff4caec0db7d7b8d3d" dependencies = [ "ckb-system-scripts", "ckb-types", @@ -623,18 +641,20 @@ dependencies = [ [[package]] name = "ckb-rocksdb" -version = "0.13.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f052aeebebfff06901d2d930d8b04181fe79f9fd629972478d2a9d4a62a09247" +checksum = "a645f6745c3519bbcbeed80486e59cb3f74d2ac08a1d9621c399b892508aca6e" dependencies = [ "ckb-librocksdb-sys", "libc", + "tempfile", ] [[package]] name = "ckb-script" -version = "0.42.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a6b279bde94ffe01e77a1a7042d9b9bcb781326c6c9c5132960e745a07f0e6a" dependencies = [ "byteorder", "ckb-chain-spec", @@ -715,16 +735,18 @@ dependencies = [ [[package]] name = "ckb-traits" -version = "0.42.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0b9e189491a26e5a6cea88d8af4ca22a0c6367aef2e0d1881547e482808d12" dependencies = [ "ckb-types", ] [[package]] name = "ckb-types" -version = "0.42.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b20fae4c3f7b4b0fe6d483fb924592f9a26f74fd8598e1e9d5730b34a6fe3066" dependencies = [ "bit-vec", "bytes 0.5.6", @@ -743,8 +765,9 @@ dependencies = [ [[package]] name = "ckb-util" -version = "0.42.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.42.0-rc1#a7416211e4828fa5daa73c5d9d21701a686de3dd" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63404867d81d0f872c15cb6309ba357bb1b305c8dd7bf8bd779b9d485db9ba21" dependencies = [ "linked-hash-map", "parking_lot 0.10.2", diff --git a/Cargo.toml b/Cargo.toml index fb7a3350..5f4632dc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,20 +4,21 @@ version = "0.42.0" license = "MIT" authors = ["Linfeng Qian ", "Nervos Core Dev "] edition = "2018" +description = "ckb command line interface" [dependencies] -ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } -ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } -ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1", features = ["secp"] } -ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } -ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } -ckb-util = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } -ckb-resource = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } -ckb-dao-utils = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } -ckb-chain-spec = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } -ckb-sdk = { path = "ckb-sdk" } -ckb-index = { path = "ckb-index" } -plugin-protocol = { path = "plugin-protocol", package = "ckb-cli-plugin-protocol" } +ckb-jsonrpc-types = "=0.42.0" +ckb-hash = "=0.42.0" +ckb-crypto = { version = "=0.42.0", features = ["secp"] } +ckb-build-info = "=0.42.0" +ckb-types = "=0.42.0" +ckb-util = "=0.42.0" +ckb-resource = "=0.42.0" +ckb-dao-utils = "=0.42.0" +ckb-chain-spec = "=0.42.0" +ckb-sdk = { path = "ckb-sdk", version = "=0.42.0" } +ckb-index = { path = "ckb-index", version = "=0.42.0" } +plugin-protocol = { path = "plugin-protocol", package = "ckb-cli-plugin-protocol", version = "=0.42.0" } jsonrpc-core-client = "17" jsonrpc-core = "17" jsonrpc-derive = "17" @@ -60,7 +61,7 @@ tui = "0.6.0" termion = "1.5" [build-dependencies] -ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } +ckb-build-info = "=0.42.0" [workspace] members = ["ckb-sdk", "ckb-index", "ckb-sdk-types", "plugin-protocol"] diff --git a/ckb-index/Cargo.toml b/ckb-index/Cargo.toml index 9754baba..bef94a17 100644 --- a/ckb-index/Cargo.toml +++ b/ckb-index/Cargo.toml @@ -4,6 +4,7 @@ version = "0.42.0" authors = ["Linfeng Qian ", "Nervos Core Dev "] edition = "2018" license = "MIT" +description = "ckb-cli index database" [dependencies] serde = { version = "1.0", features = ["rc"] } @@ -11,6 +12,6 @@ serde_derive = "1.0" bincode = "1.1.4" log = "0.4.6" failure = "0.1.5" -ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } -ckb-sdk = { path = "../ckb-sdk" } -rocksdb = { package = "ckb-rocksdb", version = "=0.13.0", features = ["snappy"] } +ckb-types = "=0.42.0" +ckb-sdk = { path = "../ckb-sdk", version = "=0.42.0" } +rocksdb = { package = "ckb-rocksdb", version = "=0.15.1", features = ["snappy"] } diff --git a/ckb-index/src/kvdb/rocks.rs b/ckb-index/src/kvdb/rocks.rs index dc53d305..8f29898b 100644 --- a/ckb-index/src/kvdb/rocks.rs +++ b/ckb-index/src/kvdb/rocks.rs @@ -123,7 +123,7 @@ impl<'a> KVTxn<'a> for RocksTxn<'a> { .expect("Put kv to rocks batch failed") } self.db - .write(batch) + .write(&batch) .expect("Commit rocks txn transaction failed"); log::debug!("Rocks txn commited!"); } diff --git a/ckb-sdk-types/Cargo.toml b/ckb-sdk-types/Cargo.toml index 340be8ab..2086a4eb 100644 --- a/ckb-sdk-types/Cargo.toml +++ b/ckb-sdk-types/Cargo.toml @@ -4,16 +4,17 @@ version = "0.42.0" authors = ["Linfeng Qian ", "Nervos Core Dev "] edition = "2018" license = "MIT" +description = "ckb-cli sdk common types" [dependencies] serde = { version = "1.0", features = ["rc"] } serde_derive = "1.0" -ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } -ckb-traits = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } -ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } -ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } -ckb-error = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } +ckb-types = "=0.42.0" +ckb-traits = "=0.42.0" +ckb-jsonrpc-types = "=0.42.0" +ckb-hash = "=0.42.0" +ckb-error = "=0.42.0" [dev-dependencies] -ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1", features = ["secp"] } +ckb-crypto = { version = "=0.42.0", features = ["secp"] } diff --git a/ckb-sdk/Cargo.toml b/ckb-sdk/Cargo.toml index 78858918..0ba4b806 100644 --- a/ckb-sdk/Cargo.toml +++ b/ckb-sdk/Cargo.toml @@ -4,6 +4,7 @@ version = "0.42.0" authors = ["Linfeng Qian ", "Nervos Core Dev "] edition = "2018" license = "MIT" +description = "ckb-cli sdk" [dependencies] serde = { version = "1.0", features = ["rc"] } @@ -29,11 +30,11 @@ tokio = { version = "1" } bytes = "1" futures = "0.3" -ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } -ckb-error = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } -ckb-script = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } -ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } -ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } -ckb-resource = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } -ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1", features = ["secp"] } -ckb-sdk-types = { path = "../ckb-sdk-types" } +ckb-types = "=0.42.0" +ckb-error = "=0.42.0" +ckb-script = "=0.42.0" +ckb-jsonrpc-types = "=0.42.0" +ckb-hash = "=0.42.0" +ckb-resource = "=0.42.0" +ckb-crypto = { version = "=0.42.0", features = ["secp"] } +ckb-sdk-types = { path = "../ckb-sdk-types", version="=0.42.0" } \ No newline at end of file diff --git a/plugin-protocol/Cargo.toml b/plugin-protocol/Cargo.toml index 4d21026c..60566836 100644 --- a/plugin-protocol/Cargo.toml +++ b/plugin-protocol/Cargo.toml @@ -1,15 +1,17 @@ [package] name = "ckb-cli-plugin-protocol" -version = "0.1.0" +version = "0.42.0" authors = ["Nervos Core Dev "] edition = "2018" +license = "MIT" +description = "ckb-cli plugin protocol" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ckb-index = { path = "../ckb-index" } -ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } -ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } +ckb-index = { path = "../ckb-index", version = "=0.42.0" } +ckb-types = "=0.42.0" +ckb-jsonrpc-types = "=0.42.0" serde = { version = "1.0", features = ["rc"] } serde_derive = "1.0" serde_json = "1.0" diff --git a/test/Cargo.toml b/test/Cargo.toml index daea2d45..aea618f5 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -13,12 +13,12 @@ log = "0.4" env_logger = "0.6" toml = "0.5.0" serde_yaml = "0.8.9" -ckb-sdk = { path = "../ckb-sdk" } -ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } -ckb-app-config = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } -ckb-chain-spec = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } -ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1", features = ["secp"] } -ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.42.0-rc1" } +ckb-sdk = { path = "../ckb-sdk", version = "0.42.0" } +ckb-types = "=0.42.0" +ckb-app-config = "=0.42.0" +ckb-chain-spec = "=0.42.0" +ckb-crypto = { version = "=0.42.0", features = ["secp"] } +ckb-hash = "=0.42.0" regex = "1.1.6" # Prevent this from interfering with workspaces From ce7d803358269d2f3a153c6ae2e98f26dd0296f0 Mon Sep 17 00:00:00 2001 From: Linfeng Qian Date: Tue, 25 May 2021 15:05:19 +0800 Subject: [PATCH 4/5] chore: cargo update --- Cargo.lock | 391 ++++++++++++++++++++++++++++------------------------- 1 file changed, 208 insertions(+), 183 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 231103ca..746799d5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,9 +2,9 @@ # It is not intended for manual editing. [[package]] name = "addr2line" -version = "0.14.1" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7" +checksum = "03345e98af8f3d786b6d9f656ccfa6ac316d954e92bc4841f0bba20789d5fb5a" dependencies = [ "gimli", ] @@ -49,9 +49,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.15" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" dependencies = [ "memchr", ] @@ -67,9 +67,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1" +checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" [[package]] name = "arrayref" @@ -108,11 +108,12 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "backtrace" -version = "0.3.56" +version = "0.3.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc" +checksum = "4717cfcbfaa661a0fd48f8453951837ae7e8f81e481fbb136e3202d72805a744" dependencies = [ "addr2line", + "cc", "cfg-if 1.0.0", "libc", "miniz_oxide", @@ -144,11 +145,10 @@ checksum = "58946044516aa9dc922182e0d6e9d124a31aafe6b421614654eb27cf90cec09c" [[package]] name = "bincode" -version = "1.3.2" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d175dfa69e619905c4c3cdb7c3c203fa3bdd5d51184e3afdb2742c0280493772" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" dependencies = [ - "byteorder", "serde", ] @@ -240,9 +240,9 @@ checksum = "c95ee6bba9d950218b6cc910cf62bc9e0a171d0f4537e3627b0f54d08549b188" [[package]] name = "bstr" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d" +checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279" dependencies = [ "memchr", ] @@ -261,9 +261,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "byteorder" -version = "1.3.4" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" @@ -298,9 +298,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" [[package]] name = "cc" -version = "1.0.67" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" +checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787" dependencies = [ "jobserver", ] @@ -403,7 +403,7 @@ dependencies = [ "eaglesong", "env_logger", "faster-hex 0.4.1", - "futures 0.3.13", + "futures 0.3.15", "ipnetwork", "itertools", "jsonrpc-core 17.0.0", @@ -423,7 +423,7 @@ dependencies = [ "serde_yaml", "shell-words", "termion", - "tokio 1.4.0", + "tokio 1.6.0", "tui", "url 1.7.2", "yaml-rust", @@ -691,7 +691,7 @@ dependencies = [ "failure", "faster-hex 0.4.1", "fnv", - "futures 0.3.13", + "futures 0.3.15", "log", "rand 0.6.5", "reqwest", @@ -701,8 +701,8 @@ dependencies = [ "serde_derive", "serde_json", "tiny-keccak", - "tokio 1.4.0", - "tokio-util 0.6.5", + "tokio 1.6.0", + "tokio-util 0.6.7", "uuid", ] @@ -864,6 +864,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + [[package]] name = "core-foundation" version = "0.9.1" @@ -910,9 +916,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49" +checksum = "4feb231f0d4d6af81aed15928e58ecf5816aa62a2393e2c82f46973e92a9a278" dependencies = [ "autocfg 1.0.1", "cfg-if 1.0.0", @@ -952,10 +958,11 @@ checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" [[package]] name = "derive_more" -version = "0.99.11" +version = "0.99.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c" +checksum = "5cc7b9cef1e351660e5443924e4f43ab25fbbed3e9a5f052df3677deb4d6b320" dependencies = [ + "convert_case", "proc-macro2", "quote", "syn", @@ -1134,9 +1141,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f55667319111d593ba876406af7c409c0ebb44dc4be6132a783ccf163ea14c1" +checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27" dependencies = [ "futures-channel", "futures-core", @@ -1149,9 +1156,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939" +checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2" dependencies = [ "futures-core", "futures-sink", @@ -1159,15 +1166,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94" +checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1" [[package]] name = "futures-executor" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9c0ad1" +checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79" dependencies = [ "futures-core", "futures-task", @@ -1177,16 +1184,17 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59" +checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1" [[package]] name = "futures-macro" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea405816a5139fb39af82c2beb921d52143f556038378d6db21183a5c37fbfb7" +checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121" dependencies = [ + "autocfg 1.0.1", "proc-macro-hack", "proc-macro2", "quote", @@ -1195,22 +1203,23 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85754d98985841b7d4f5e8e6fbfa4a4ac847916893ec511a2917ccd8525b8bb3" +checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282" [[package]] name = "futures-task" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80" +checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae" [[package]] name = "futures-util" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1" +checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967" dependencies = [ + "autocfg 1.0.1", "futures 0.1.31", "futures-channel", "futures-core", @@ -1258,9 +1267,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" +checksum = "0e4075386626662786ddb0ec9081e7c7eeb1ba31951f447ca780ef9f5d568189" [[package]] name = "glob" @@ -1314,9 +1323,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d832b01df74254fe364568d6ddc294443f61cbec82816b60904303af87efae78" +checksum = "825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726" dependencies = [ "bytes 1.0.1", "fnv", @@ -1326,8 +1335,8 @@ dependencies = [ "http", "indexmap", "slab", - "tokio 1.4.0", - "tokio-util 0.6.5", + "tokio 1.6.0", + "tokio-util 0.6.7", "tracing", ] @@ -1376,9 +1385,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7245cd7449cc792608c3c8a9eaf69bd4eabbabf802713748fd739c98b82f0747" +checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" dependencies = [ "bytes 1.0.1", "fnv", @@ -1397,19 +1406,20 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2861bd27ee074e5ee891e8b539837a9430012e249d7f0ca2d795650f579c1994" +checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9" dependencies = [ "bytes 1.0.1", "http", + "pin-project-lite 0.2.6", ] [[package]] name = "httparse" -version = "1.3.5" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615caabe2c3160b313d52ccc905335f4ed5f10881dd63dc5699d47e90be85691" +checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" [[package]] name = "httpdate" @@ -1417,6 +1427,12 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" +[[package]] +name = "httpdate" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" + [[package]] name = "humantime" version = "1.3.0" @@ -1440,10 +1456,10 @@ dependencies = [ "http", "http-body 0.3.1", "httparse", - "httpdate", + "httpdate 0.3.2", "itoa", "pin-project", - "socket2", + "socket2 0.3.19", "tokio 0.2.25", "tower-service", "tracing", @@ -1452,23 +1468,23 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.4" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8e946c2b1349055e0b72ae281b238baf1a3ea7307c7e9f9d64673bdd9c26ac7" +checksum = "1e5f105c494081baa3bf9e200b279e27ec1623895cd504c7dbef8d0b080fcf54" dependencies = [ "bytes 1.0.1", "futures-channel", "futures-core", "futures-util", - "h2 0.3.1", + "h2 0.3.3", "http", - "http-body 0.4.0", + "http-body 0.4.2", "httparse", - "httpdate", + "httpdate 1.0.1", "itoa", "pin-project", - "socket2", - "tokio 1.4.0", + "socket2 0.4.0", + "tokio 1.6.0", "tower-service", "tracing", "want", @@ -1481,9 +1497,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes 1.0.1", - "hyper 0.14.4", + "hyper 0.14.7", "native-tls", - "tokio 1.4.0", + "tokio 1.6.0", "tokio-native-tls", ] @@ -1500,9 +1516,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" dependencies = [ "matches", "unicode-bidi", @@ -1590,18 +1606,18 @@ checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" [[package]] name = "jobserver" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2" +checksum = "972f5ae5d1cb9c6ae417789196c803205313edde988685da5e3aae0827b9e7fd" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.48" +version = "0.3.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc9f84f9b115ce7843d60706df1422a916680bfdfcbdb0447c5614ff9d7e4d78" +checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062" dependencies = [ "wasm-bindgen", ] @@ -1613,7 +1629,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15b6c6ad01c7354d60de493148c30ac8a82b759e22ae678c8705e9b8e0c566a4" dependencies = [ "derive_more", - "futures 0.3.13", + "futures 0.3.15", "jsonrpc-core 17.0.0", "jsonrpc-pubsub", "log", @@ -1641,7 +1657,7 @@ version = "17.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07569945133257ff557eb37b015497104cea61a2c9edaf126c1cbd6e8332397f" dependencies = [ - "futures 0.3.13", + "futures 0.3.15", "log", "serde", "serde_derive", @@ -1654,7 +1670,7 @@ version = "17.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ac9d56dc729912796637c30f475bbf834594607b27740dfea6e5fa7ba40d1f1" dependencies = [ - "futures 0.3.13", + "futures 0.3.15", "jsonrpc-client-transports", ] @@ -1676,7 +1692,7 @@ version = "17.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eff2303c4f0562afcbd2dae75e3e21815095f8994749a80fbcd365877e44ed64" dependencies = [ - "futures 0.3.13", + "futures 0.3.15", "hyper 0.13.10", "jsonrpc-core 17.0.0", "jsonrpc-server-utils", @@ -1692,7 +1708,7 @@ version = "17.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c48dbebce7a9c88ab272a4db7d6478aa4c6d9596e6c086366e89efc4e9ed89e" dependencies = [ - "futures 0.3.13", + "futures 0.3.15", "jsonrpc-core 17.0.0", "lazy_static", "log", @@ -1708,7 +1724,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4207cce738bf713a82525065b750a008f28351324f438f56b33d698ada95bb4" dependencies = [ "bytes 0.5.6", - "futures 0.3.13", + "futures 0.3.15", "globset", "jsonrpc-core 17.0.0", "lazy_static", @@ -1742,9 +1758,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.88" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b07a082330a35e43f63177cc01689da34fbffa0105e1246cf0311472cac73a" +checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" [[package]] name = "linked-hash-map" @@ -1763,9 +1779,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" +checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" dependencies = [ "scopeguard", ] @@ -1797,9 +1813,9 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" [[package]] name = "memchr" -version = "2.3.4" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" +checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" [[package]] name = "merkle-cbt" @@ -1847,13 +1863,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.9" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5dede4e2065b3842b8b0af444119f3aa331cc7cc2dd20388bfb0f5d5a38823a" +checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956" dependencies = [ "libc", "log", - "miow 0.3.6", + "miow 0.3.7", "ntapi", "winapi 0.3.9", ] @@ -1872,11 +1888,10 @@ dependencies = [ [[package]] name = "miow" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" +checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" dependencies = [ - "socket2", "winapi 0.3.9", ] @@ -2025,9 +2040,9 @@ checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" [[package]] name = "object" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" +checksum = "1a5b3dd1c072ee7963717671d1ca129f1048fda25edea6b752bfc71ac8854170" [[package]] name = "once_cell" @@ -2049,29 +2064,29 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.32" +version = "0.10.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038d43985d1ddca7a9900630d8cd031b56e4794eecc2e9ea39dd17aa04399a70" +checksum = "6d7830286ad6a3973c0f1d9b73738f69c76b739301d0229c4b96501695cbe4c8" dependencies = [ "bitflags", "cfg-if 1.0.0", "foreign-types", - "lazy_static", "libc", + "once_cell", "openssl-sys", ] [[package]] name = "openssl-probe" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" +checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "openssl-sys" -version = "0.9.60" +version = "0.9.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "921fc71883267538946025deffb622905ecad223c28efbfdef9bb59a0175f3e6" +checksum = "b6b0d6fb7d80f877617dfcb014e605e2b5ab2fb0afdf27935219bb6bd984cb98" dependencies = [ "autocfg 1.0.1", "cc", @@ -2135,7 +2150,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" dependencies = [ "instant", - "lock_api 0.4.2", + "lock_api 0.4.4", "parking_lot_core 0.8.3", ] @@ -2162,7 +2177,7 @@ dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall 0.2.5", + "redox_syscall 0.2.8", "smallvec", "winapi 0.3.9", ] @@ -2229,18 +2244,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.5" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96fa8ebb90271c4477f144354485b8068bd8f6b78b428b01ba892ca26caf0b63" +checksum = "c7509cc106041c40a4518d2af7a61530e1eed0e6285296a3d8c5472806ccc4a4" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.5" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "758669ae3558c6f74bd2a18b41f7ac0b5a195aea6639d6a9b5e5d1ad5ba24c0b" +checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f" dependencies = [ "proc-macro2", "quote", @@ -2330,9 +2345,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" [[package]] name = "proc-macro2" -version = "1.0.24" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" dependencies = [ "unicode-xid", ] @@ -2539,9 +2554,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "redox_syscall" -version = "0.2.5" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" +checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc" dependencies = [ "bitflags", ] @@ -2552,7 +2567,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f" dependencies = [ - "redox_syscall 0.2.5", + "redox_syscall 0.2.8", ] [[package]] @@ -2568,9 +2583,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.4.5" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" dependencies = [ "aho-corasick", "memchr", @@ -2579,9 +2594,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.22" +version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "remove_dir_all" @@ -2594,9 +2609,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf12057f289428dbf5c591c74bf10392e4a8003f993405a902f20117019022d4" +checksum = "2296f2fac53979e8ccbc4a1136b25dcefd37be9ed7e4a1f6b05a6029c84ff124" dependencies = [ "base64 0.13.0", "bytes 1.0.1", @@ -2604,8 +2619,8 @@ dependencies = [ "futures-core", "futures-util", "http", - "http-body 0.4.0", - "hyper 0.14.4", + "http-body 0.4.2", + "hyper 0.14.7", "hyper-tls", "ipnet", "js-sys", @@ -2618,9 +2633,9 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "tokio 1.4.0", + "tokio 1.6.0", "tokio-native-tls", - "url 2.2.1", + "url 2.2.2", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -2647,14 +2662,14 @@ dependencies = [ "base64 0.13.0", "blake2b_simd", "constant_time_eq", - "crossbeam-utils 0.8.3", + "crossbeam-utils 0.8.4", ] [[package]] name = "rustc-demangle" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" +checksum = "410f7acf3cb3a44527c5d9546bad4bf4e6c460915d5f9f2fc524498bfe8f70ce" [[package]] name = "rustyline" @@ -2766,9 +2781,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.1.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d493c5f39e02dfb062cd8f33301f90f9b13b650e8c1b1d0fd75c19dd64bff69d" +checksum = "3670b1d2fdf6084d192bc71ead7aabe6c06aa2ea3fbd9cc3ac111fa5c2b1bd84" dependencies = [ "bitflags", "core-foundation", @@ -2779,9 +2794,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee48cdde5ed250b0d3252818f646e174ab414036edb884dde62d80a3ac6082d" +checksum = "3676258fd3cfe2c9a0ec99ce3038798d847ce3e4bb17746373eb9f0f1ac16339" dependencies = [ "core-foundation-sys", "libc", @@ -2789,18 +2804,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.125" +version = "1.0.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" +checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.125" +version = "1.0.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" +checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" dependencies = [ "proc-macro2", "quote", @@ -2893,9 +2908,9 @@ checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" [[package]] name = "slab" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" +checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" [[package]] name = "smallvec" @@ -2914,6 +2929,16 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "socket2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" +dependencies = [ + "libc", + "winapi 0.3.9", +] + [[package]] name = "strsim" version = "0.10.0" @@ -2928,9 +2953,9 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" [[package]] name = "syn" -version = "1.0.63" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd9bc7ccc2688b3344c2f48b9b546648b25ce0b20fc717ee7fa7981a8ca9717" +checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" dependencies = [ "proc-macro2", "quote", @@ -2980,7 +3005,7 @@ checksum = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" dependencies = [ "libc", "numtoa", - "redox_syscall 0.2.5", + "redox_syscall 0.2.8", "redox_termios", ] @@ -2995,18 +3020,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" +checksum = "fa6f76457f59514c7eeb4e59d891395fab0b2fd1d40723ae737d64153392e9c6" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" +checksum = "8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d" dependencies = [ "proc-macro2", "quote", @@ -3035,9 +3060,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023" +checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" dependencies = [ "tinyvec_macros", ] @@ -3068,15 +3093,15 @@ dependencies = [ [[package]] name = "tokio" -version = "1.4.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134af885d758d645f0f0505c9a8b3f9bf8a348fd822e112ab5248138348f1722" +checksum = "bd3076b5c8cc18138b8f8814895c11eb4de37114a5d127bafdc5e55798ceef37" dependencies = [ "autocfg 1.0.1", "bytes 1.0.1", "libc", "memchr", - "mio 0.7.9", + "mio 0.7.11", "num_cpus", "pin-project-lite 0.2.6", ] @@ -3088,7 +3113,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" dependencies = [ "native-tls", - "tokio 1.4.0", + "tokio 1.6.0", ] [[package]] @@ -3107,16 +3132,16 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.6.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5143d049e85af7fbc36f5454d990e62c2df705b3589f123b71f441b6b59f443f" +checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592" dependencies = [ "bytes 1.0.1", "futures-core", "futures-sink", "log", "pin-project-lite 0.2.6", - "tokio 1.4.0", + "tokio 1.6.0", ] [[package]] @@ -3136,9 +3161,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f" +checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d" dependencies = [ "cfg-if 1.0.0", "log", @@ -3148,9 +3173,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f" +checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052" dependencies = [ "lazy_static", ] @@ -3189,9 +3214,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" +checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" [[package]] name = "unicase" @@ -3204,9 +3229,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" dependencies = [ "matches", ] @@ -3234,9 +3259,9 @@ checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" [[package]] name = "unicode-xid" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" [[package]] name = "unsigned-varint" @@ -3257,12 +3282,12 @@ dependencies = [ [[package]] name = "url" -version = "2.2.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b" +checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" dependencies = [ "form_urlencoded", - "idna 0.2.2", + "idna 0.2.3", "matches", "percent-encoding 2.1.0", ] @@ -3284,9 +3309,9 @@ dependencies = [ [[package]] name = "vcpkg" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb" +checksum = "025ce40a007e1907e58d5bc1a594def78e5573bb0b1160bc389634e8f12e4faa" [[package]] name = "vec_map" @@ -3296,9 +3321,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "version_check" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" [[package]] name = "void" @@ -3308,9 +3333,9 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "walkdir" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" dependencies = [ "same-file", "winapi 0.3.9", @@ -3341,9 +3366,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" -version = "0.2.71" +version = "0.2.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee1280240b7c461d6a0071313e08f34a60b0365f14260362e5a2b17d1d31aa7" +checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd" dependencies = [ "cfg-if 1.0.0", "serde", @@ -3353,9 +3378,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.71" +version = "0.2.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b7d8b6942b8bb3a9b0e73fc79b98095a27de6fa247615e59d096754a3bc2aa8" +checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900" dependencies = [ "bumpalo", "lazy_static", @@ -3368,9 +3393,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.21" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e67a5806118af01f0d9045915676b22aaebecf4178ae7021bc171dab0b897ab" +checksum = "5fba7978c679d53ce2d0ac80c8c175840feb849a161664365d1287b41f2e67f1" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -3380,9 +3405,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.71" +version = "0.2.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ac38da8ef716661f0f36c0d8320b89028efe10c7c0afde65baffb496ce0d3b" +checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3390,9 +3415,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.71" +version = "0.2.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc053ec74d454df287b9374ee8abb36ffd5acb95ba87da3ba5b7d3fe20eb401e" +checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97" dependencies = [ "proc-macro2", "quote", @@ -3403,15 +3428,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.71" +version = "0.2.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d6f8ec44822dd71f5f221a5847fb34acd9060535c1211b70a05844c0f6383b1" +checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f" [[package]] name = "web-sys" -version = "0.3.48" +version = "0.3.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec600b26223b2948cedfde2a0aa6756dcf1fef616f43d7b3097aaf53a6c4d92b" +checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582" dependencies = [ "js-sys", "wasm-bindgen", From 1ce53a0e05105e4d34cb833cf21d220c995bc653 Mon Sep 17 00:00:00 2001 From: Linfeng Qian Date: Tue, 25 May 2021 16:11:07 +0800 Subject: [PATCH 5/5] chore: bump up ckb-cli version --- Cargo.lock | 10 +++++----- Cargo.toml | 8 ++++---- ckb-index/Cargo.toml | 4 ++-- ckb-sdk-types/Cargo.toml | 2 +- ckb-sdk/Cargo.toml | 4 ++-- plugin-protocol/Cargo.toml | 4 ++-- test/Cargo.toml | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 746799d5..72c3e90b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -376,7 +376,7 @@ dependencies = [ [[package]] name = "ckb-cli" -version = "0.42.0" +version = "0.42.1" dependencies = [ "ansi_term", "atty", @@ -431,7 +431,7 @@ dependencies = [ [[package]] name = "ckb-cli-plugin-protocol" -version = "0.42.0" +version = "0.42.1" dependencies = [ "ckb-index", "ckb-jsonrpc-types", @@ -524,7 +524,7 @@ dependencies = [ [[package]] name = "ckb-index" -version = "0.42.0" +version = "0.42.1" dependencies = [ "bincode", "ckb-rocksdb", @@ -672,7 +672,7 @@ dependencies = [ [[package]] name = "ckb-sdk" -version = "0.42.0" +version = "0.42.1" dependencies = [ "aes-ctr", "bech32", @@ -708,7 +708,7 @@ dependencies = [ [[package]] name = "ckb-sdk-types" -version = "0.42.0" +version = "0.42.1" dependencies = [ "ckb-crypto", "ckb-error", diff --git a/Cargo.toml b/Cargo.toml index 5f4632dc..61f3e3ef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-cli" -version = "0.42.0" +version = "0.42.1" license = "MIT" authors = ["Linfeng Qian ", "Nervos Core Dev "] edition = "2018" @@ -16,9 +16,9 @@ ckb-util = "=0.42.0" ckb-resource = "=0.42.0" ckb-dao-utils = "=0.42.0" ckb-chain-spec = "=0.42.0" -ckb-sdk = { path = "ckb-sdk", version = "=0.42.0" } -ckb-index = { path = "ckb-index", version = "=0.42.0" } -plugin-protocol = { path = "plugin-protocol", package = "ckb-cli-plugin-protocol", version = "=0.42.0" } +ckb-sdk = { path = "ckb-sdk", version = "=0.42.1" } +ckb-index = { path = "ckb-index", version = "=0.42.1" } +plugin-protocol = { path = "plugin-protocol", package = "ckb-cli-plugin-protocol", version = "=0.42.1" } jsonrpc-core-client = "17" jsonrpc-core = "17" jsonrpc-derive = "17" diff --git a/ckb-index/Cargo.toml b/ckb-index/Cargo.toml index bef94a17..3f689d37 100644 --- a/ckb-index/Cargo.toml +++ b/ckb-index/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-index" -version = "0.42.0" +version = "0.42.1" authors = ["Linfeng Qian ", "Nervos Core Dev "] edition = "2018" license = "MIT" @@ -13,5 +13,5 @@ bincode = "1.1.4" log = "0.4.6" failure = "0.1.5" ckb-types = "=0.42.0" -ckb-sdk = { path = "../ckb-sdk", version = "=0.42.0" } +ckb-sdk = { path = "../ckb-sdk", version = "=0.42.1" } rocksdb = { package = "ckb-rocksdb", version = "=0.15.1", features = ["snappy"] } diff --git a/ckb-sdk-types/Cargo.toml b/ckb-sdk-types/Cargo.toml index 2086a4eb..1bb8e748 100644 --- a/ckb-sdk-types/Cargo.toml +++ b/ckb-sdk-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-sdk-types" -version = "0.42.0" +version = "0.42.1" authors = ["Linfeng Qian ", "Nervos Core Dev "] edition = "2018" license = "MIT" diff --git a/ckb-sdk/Cargo.toml b/ckb-sdk/Cargo.toml index 0ba4b806..6c6c321a 100644 --- a/ckb-sdk/Cargo.toml +++ b/ckb-sdk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-sdk" -version = "0.42.0" +version = "0.42.1" authors = ["Linfeng Qian ", "Nervos Core Dev "] edition = "2018" license = "MIT" @@ -37,4 +37,4 @@ ckb-jsonrpc-types = "=0.42.0" ckb-hash = "=0.42.0" ckb-resource = "=0.42.0" ckb-crypto = { version = "=0.42.0", features = ["secp"] } -ckb-sdk-types = { path = "../ckb-sdk-types", version="=0.42.0" } \ No newline at end of file +ckb-sdk-types = { path = "../ckb-sdk-types", version="=0.42.1" } \ No newline at end of file diff --git a/plugin-protocol/Cargo.toml b/plugin-protocol/Cargo.toml index 60566836..47816bdf 100644 --- a/plugin-protocol/Cargo.toml +++ b/plugin-protocol/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-cli-plugin-protocol" -version = "0.42.0" +version = "0.42.1" authors = ["Nervos Core Dev "] edition = "2018" license = "MIT" @@ -9,7 +9,7 @@ description = "ckb-cli plugin protocol" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ckb-index = { path = "../ckb-index", version = "=0.42.0" } +ckb-index = { path = "../ckb-index", version = "=0.42.1" } ckb-types = "=0.42.0" ckb-jsonrpc-types = "=0.42.0" serde = { version = "1.0", features = ["rc"] } diff --git a/test/Cargo.toml b/test/Cargo.toml index aea618f5..59a1e3eb 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -13,7 +13,7 @@ log = "0.4" env_logger = "0.6" toml = "0.5.0" serde_yaml = "0.8.9" -ckb-sdk = { path = "../ckb-sdk", version = "0.42.0" } +ckb-sdk = { path = "../ckb-sdk", version = "0.42.1" } ckb-types = "=0.42.0" ckb-app-config = "=0.42.0" ckb-chain-spec = "=0.42.0"