From fa3a99b105e17ae56073768a44c4e143278f9e54 Mon Sep 17 00:00:00 2001 From: Linfeng Qian Date: Tue, 3 Sep 2019 21:32:49 +0800 Subject: [PATCH 1/6] refactor: Compatible with ckb v0.20 --- Cargo.lock | 485 ++++++++++++++--------------- Cargo.toml | 18 +- ckb-index/Cargo.toml | 4 +- ckb-index/src/index/key.rs | 33 +- ckb-index/src/index/mod.rs | 61 ++-- ckb-index/src/index/types.rs | 34 +- ckb-sdk/Cargo.toml | 14 +- ckb-sdk/src/basic.rs | 16 +- ckb-sdk/src/chain.rs | 27 +- ckb-sdk/src/wallet/keystore/mod.rs | 6 +- src/subcommands/account.rs | 14 +- src/subcommands/tui/state.rs | 6 +- src/subcommands/util.rs | 8 +- src/subcommands/wallet/mod.rs | 30 +- src/utils/arg_parser.rs | 10 +- src/utils/other.rs | 2 +- 16 files changed, 380 insertions(+), 388 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index df7e7dad..863d2ac1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -49,7 +49,7 @@ name = "ansi_term" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -76,7 +76,7 @@ version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -100,7 +100,7 @@ name = "backtrace-sys" version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -148,12 +148,12 @@ dependencies = [ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (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)", "peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "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)", - "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -181,7 +181,7 @@ name = "blake2b-rs" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -247,7 +247,7 @@ name = "c2-chacha" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -258,10 +258,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cc" -version = "1.0.40" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -289,7 +289,7 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", @@ -301,25 +301,25 @@ dependencies = [ [[package]] name = "ckb-build-info" -version = "0.19.2" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19#f8d4dc72c3c32ac23cf27609bc7bcb4ae6ab9d50" +version = "0.20.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1#1087071ea433821026965f87b7879ac110f439ec" [[package]] name = "ckb-cli" -version = "0.19.0" +version = "0.20.0" dependencies = [ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "ckb-build-info 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", - "ckb-crypto 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", - "ckb-hash 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", - "ckb-index 0.19.0", - "ckb-jsonrpc-types 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", - "ckb-resource 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", - "ckb-sdk 0.19.0", - "ckb-types 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", - "ckb-util 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", + "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", + "ckb-build-info 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", + "ckb-crypto 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", + "ckb-hash 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", + "ckb-index 0.20.0", + "ckb-jsonrpc-types 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", + "ckb-resource 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", + "ckb-sdk 0.20.0", + "ckb-types 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", + "ckb-util 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "colored 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -329,7 +329,7 @@ dependencies = [ "faster-hex 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-client-core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "rpassword 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustyline 4.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "secp256k1 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -346,32 +346,64 @@ dependencies = [ [[package]] name = "ckb-crypto" -version = "0.19.2" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19#f8d4dc72c3c32ac23cf27609bc7bcb4ae6ab9d50" +version = "0.20.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1#1087071ea433821026965f87b7879ac110f439ec" dependencies = [ + "ckb-fixed-hash 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "faster-hex 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "numext-fixed-hash 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "secp256k1 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "ckb-fixed-hash" +version = "0.20.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1#1087071ea433821026965f87b7879ac110f439ec" +dependencies = [ + "ckb-fixed-hash-core 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", + "ckb-fixed-hash-hack 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", + "proc-macro-hack 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "ckb-fixed-hash-core" +version = "0.20.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1#1087071ea433821026965f87b7879ac110f439ec" +dependencies = [ + "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "faster-hex 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "ckb-fixed-hash-hack" +version = "0.20.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1#1087071ea433821026965f87b7879ac110f439ec" +dependencies = [ + "ckb-fixed-hash-core 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", + "proc-macro-hack 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", + "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "ckb-hash" -version = "0.19.2" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19#f8d4dc72c3c32ac23cf27609bc7bcb4ae6ab9d50" +version = "0.20.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1#1087071ea433821026965f87b7879ac110f439ec" dependencies = [ "blake2b-rs 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "ckb-index" -version = "0.19.0" +version = "0.20.0" dependencies = [ "bincode 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "ckb-sdk 0.19.0", - "ckb-types 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", + "ckb-sdk 0.20.0", + "ckb-types 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "rocksdb 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -381,10 +413,10 @@ dependencies = [ [[package]] name = "ckb-jsonrpc-types" -version = "0.19.2" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19#f8d4dc72c3c32ac23cf27609bc7bcb4ae6ab9d50" +version = "0.20.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1#1087071ea433821026965f87b7879ac110f439ec" dependencies = [ - "ckb-types 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", + "ckb-types 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", "faster-hex 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-core 10.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", @@ -394,47 +426,37 @@ dependencies = [ [[package]] name = "ckb-logger" -version = "0.19.2" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19#f8d4dc72c3c32ac23cf27609bc7bcb4ae6ab9d50" +version = "0.20.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1#1087071ea433821026965f87b7879ac110f439ec" dependencies = [ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)", - "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (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)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "sentry 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "ckb-merkle-tree" -version = "0.19.2" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19#f8d4dc72c3c32ac23cf27609bc7bcb4ae6ab9d50" -dependencies = [ - "ckb-hash 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", - "merkle-cbt 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "numext-fixed-hash 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "ckb-occupied-capacity" -version = "0.19.2" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19#f8d4dc72c3c32ac23cf27609bc7bcb4ae6ab9d50" +version = "0.20.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1#1087071ea433821026965f87b7879ac110f439ec" dependencies = [ - "ckb-occupied-capacity-core 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", - "ckb-occupied-capacity-macros 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", + "ckb-occupied-capacity-core 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", + "ckb-occupied-capacity-macros 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", "proc-macro-hack 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "ckb-occupied-capacity-core" -version = "0.19.2" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19#f8d4dc72c3c32ac23cf27609bc7bcb4ae6ab9d50" +version = "0.20.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1#1087071ea433821026965f87b7879ac110f439ec" dependencies = [ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", @@ -442,10 +464,10 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity-macros" -version = "0.19.2" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19#f8d4dc72c3c32ac23cf27609bc7bcb4ae6ab9d50" +version = "0.20.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1#1087071ea433821026965f87b7879ac110f439ec" dependencies = [ - "ckb-occupied-capacity-core 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", + "ckb-occupied-capacity-core 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", "proc-macro-hack 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", @@ -453,11 +475,11 @@ dependencies = [ [[package]] name = "ckb-resource" -version = "0.19.2" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19#f8d4dc72c3c32ac23cf27609bc7bcb4ae6ab9d50" +version = "0.20.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1#1087071ea433821026965f87b7879ac110f439ec" dependencies = [ - "ckb-system-scripts 0.3.1-alpha.3 (registry+https://github.com/rust-lang/crates.io-index)", - "ckb-types 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", + "ckb-system-scripts 0.3.2-alpha.2+refactor-schema (registry+https://github.com/rust-lang/crates.io-index)", + "ckb-types 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", "includedir 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "includedir_codegen 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", @@ -469,14 +491,14 @@ dependencies = [ [[package]] name = "ckb-script" -version = "0.19.2" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19#f8d4dc72c3c32ac23cf27609bc7bcb4ae6ab9d50" +version = "0.20.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1#1087071ea433821026965f87b7879ac110f439ec" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ckb-hash 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", - "ckb-logger 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", - "ckb-script-data-loader 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", - "ckb-types 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", + "ckb-hash 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", + "ckb-logger 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", + "ckb-script-data-loader 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", + "ckb-types 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", "ckb-vm 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", "faster-hex 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", @@ -485,27 +507,27 @@ dependencies = [ [[package]] name = "ckb-script-data-loader" -version = "0.19.2" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19#f8d4dc72c3c32ac23cf27609bc7bcb4ae6ab9d50" +version = "0.20.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1#1087071ea433821026965f87b7879ac110f439ec" dependencies = [ - "ckb-types 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", + "ckb-types 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", ] [[package]] name = "ckb-sdk" -version = "0.19.0" +version = "0.20.0" dependencies = [ "aes-ctr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bech32 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitcoin_hashes 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "ckb-crypto 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", - "ckb-hash 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", - "ckb-jsonrpc-types 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", - "ckb-resource 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", - "ckb-script 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", - "ckb-types 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", + "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", + "ckb-crypto 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", + "ckb-hash 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", + "ckb-jsonrpc-types 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", + "ckb-resource 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", + "ckb-script 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", + "ckb-types 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "faster-hex 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -524,7 +546,7 @@ dependencies = [ [[package]] name = "ckb-system-scripts" -version = "0.3.1-alpha.3" +version = "0.3.2-alpha.2+refactor-schema" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "blake2b-rs 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -536,25 +558,25 @@ dependencies = [ [[package]] name = "ckb-types" -version = "0.19.2" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19#f8d4dc72c3c32ac23cf27609bc7bcb4ae6ab9d50" +version = "0.20.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1#1087071ea433821026965f87b7879ac110f439ec" dependencies = [ "bit-vec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "ckb-hash 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", - "ckb-merkle-tree 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", - "ckb-occupied-capacity 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)", + "ckb-fixed-hash 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", + "ckb-hash 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", + "ckb-occupied-capacity 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)", "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "merkle-cbt 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "molecule 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "numext-fixed-hash 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "numext-fixed-uint 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "ckb-util" -version = "0.19.2" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19#f8d4dc72c3c32ac23cf27609bc7bcb4ae6ab9d50" +version = "0.20.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1#1087071ea433821026965f87b7879ac110f439ec" dependencies = [ "linked-hash-map 0.5.1 (git+https://github.com/nervosnetwork/linked-hash-map?rev=df27f21)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -567,7 +589,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 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)", - "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "ckb-vm-definitions 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "goblin 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", @@ -616,7 +638,7 @@ name = "colored" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winconsole 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -681,15 +703,6 @@ dependencies = [ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "crossbeam-deque" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "crossbeam-deque" version = "0.7.1" @@ -707,7 +720,7 @@ dependencies = [ "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -726,7 +739,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -757,8 +770,8 @@ name = "debugid" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -778,7 +791,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -807,7 +820,7 @@ dependencies = [ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -845,11 +858,6 @@ name = "fake-simd" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "faster-hex" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "faster-hex" version = "0.3.1" @@ -935,12 +943,12 @@ name = "generic-array" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "getrandom" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -985,7 +993,7 @@ name = "heapsize" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1067,7 +1075,7 @@ dependencies = [ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-proto 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "want 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1139,7 +1147,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "sized-chunks 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1254,7 +1262,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "lazy_static" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1267,8 +1275,8 @@ name = "libloading" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1277,7 +1285,7 @@ version = "6.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bindgen 0.49.2 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1333,7 +1341,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1354,7 +1362,7 @@ name = "mime" version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1363,7 +1371,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", - "unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1371,7 +1379,7 @@ name = "miniz-sys" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1435,7 +1443,7 @@ name = "native-tls" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lazy_static 1.3.0 (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.62 (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.24 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1454,7 +1462,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1463,7 +1471,7 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1526,42 +1534,6 @@ dependencies = [ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "numext-fixed-hash" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "numext-fixed-hash-core 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "numext-fixed-hash-hack 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro-hack 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "numext-fixed-hash-core" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "faster-hex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "numext-constructor 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "numext-fixed-uint 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "numext-fixed-hash-hack" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "numext-fixed-hash-core 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro-hack 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", - "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)", - "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "numext-fixed-uint" version = "0.1.4" @@ -1614,7 +1586,7 @@ dependencies = [ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.9 (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.3.0 (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.62 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1630,7 +1602,7 @@ version = "0.9.49" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1670,7 +1642,7 @@ dependencies = [ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", "thread-id 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1760,9 +1732,9 @@ name = "proc-macro-hack" version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.2 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1775,7 +1747,7 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1788,8 +1760,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1811,7 +1783,7 @@ name = "quote" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1832,7 +1804,7 @@ dependencies = [ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.1 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1844,7 +1816,7 @@ dependencies = [ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1862,7 +1834,7 @@ dependencies = [ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1870,10 +1842,10 @@ name = "rand" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "getrandom 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.62 (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.0 (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)", ] @@ -1892,7 +1864,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1910,10 +1882,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "rand_core" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "getrandom 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1929,7 +1901,7 @@ name = "rand_hc" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1947,7 +1919,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.62 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1960,7 +1932,7 @@ dependencies = [ "libc 0.2.62 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1982,23 +1954,23 @@ dependencies = [ [[package]] name = "rayon" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rayon-core 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rayon-core" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2036,18 +2008,18 @@ dependencies = [ [[package]] name = "regex" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "regex-syntax 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", + "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "regex-syntax" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -2063,7 +2035,7 @@ name = "remove_dir_all" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2159,7 +2131,7 @@ dependencies = [ "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "utf8parse 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2185,8 +2157,8 @@ name = "schannel" version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2243,7 +2215,7 @@ name = "secp256k1" version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2290,11 +2262,11 @@ dependencies = [ "hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "httpdate 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "im 12.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (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.62 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "sentry-types 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2307,7 +2279,7 @@ name = "sentry-types" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "debugid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2330,9 +2302,9 @@ name = "serde_derive" version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.2 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2398,7 +2370,7 @@ name = "sized-chunks" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2464,10 +2436,10 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2498,7 +2470,7 @@ dependencies = [ "rand 0.7.0 (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)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2535,7 +2507,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.62 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2543,7 +2515,7 @@ name = "thread_local" version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2553,7 +2525,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.62 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2583,7 +2555,7 @@ dependencies = [ "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-threadpool 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-udp 0.1.3 (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)", ] @@ -2687,7 +2659,7 @@ 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.28 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (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)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2757,7 +2729,7 @@ dependencies = [ [[package]] name = "tokio-udp" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2821,7 +2793,7 @@ dependencies = [ [[package]] name = "typenum" -version = "1.10.0" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -2834,7 +2806,7 @@ dependencies = [ [[package]] name = "unicase" -version = "2.4.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2945,7 +2917,7 @@ version = "2.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2990,7 +2962,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "winapi" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3012,7 +2984,7 @@ name = "winapi-util" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3025,7 +2997,7 @@ name = "wincolor" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3035,9 +3007,9 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgmath 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rgb 0.8.14 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3045,7 +3017,7 @@ name = "winreg" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3053,7 +3025,7 @@ name = "winutil" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3105,26 +3077,28 @@ dependencies = [ "checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" "checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" "checksum cassowary 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" -"checksum cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "b548a4ee81fccb95919d4e22cfea83c7693ebfd78f0495493178db20b3139da7" +"checksum cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "8dae9c4b8fedcae85592ba623c4fd08cfdab3e3b72d6df780c6ead964a69bfff" "checksum cexpr 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a7fa24eb00d5ffab90eaeaf1092ac85c04c64aaf358ea6f84505b8116d24c6af" "checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" "checksum cgmath 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)" = "64a4b57c8f4e3a2e9ac07e0f6abc9c24b6fc9e1b54c3478cfb598f3d0023e51c" -"checksum chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "77d81f58b7301084de3b958691458a53c3f7e0b1d702f77e550b6a88e3a88abe" -"checksum ckb-build-info 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)" = "" -"checksum ckb-crypto 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)" = "" -"checksum ckb-hash 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)" = "" -"checksum ckb-jsonrpc-types 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)" = "" -"checksum ckb-logger 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)" = "" -"checksum ckb-merkle-tree 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)" = "" -"checksum ckb-occupied-capacity 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)" = "" -"checksum ckb-occupied-capacity-core 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)" = "" -"checksum ckb-occupied-capacity-macros 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)" = "" -"checksum ckb-resource 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)" = "" -"checksum ckb-script 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)" = "" -"checksum ckb-script-data-loader 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)" = "" -"checksum ckb-system-scripts 0.3.1-alpha.3 (registry+https://github.com/rust-lang/crates.io-index)" = "883238970134264e5ad69ecf8120f6e0de117306a89a31e7dd4d3ba945d469eb" -"checksum ckb-types 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)" = "" -"checksum ckb-util 0.19.2 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.19)" = "" +"checksum chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68" +"checksum ckb-build-info 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)" = "" +"checksum ckb-crypto 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)" = "" +"checksum ckb-fixed-hash 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)" = "" +"checksum ckb-fixed-hash-core 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)" = "" +"checksum ckb-fixed-hash-hack 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)" = "" +"checksum ckb-hash 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)" = "" +"checksum ckb-jsonrpc-types 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)" = "" +"checksum ckb-logger 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)" = "" +"checksum ckb-occupied-capacity 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)" = "" +"checksum ckb-occupied-capacity-core 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)" = "" +"checksum ckb-occupied-capacity-macros 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)" = "" +"checksum ckb-resource 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)" = "" +"checksum ckb-script 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)" = "" +"checksum ckb-script-data-loader 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)" = "" +"checksum ckb-system-scripts 0.3.2-alpha.2+refactor-schema (registry+https://github.com/rust-lang/crates.io-index)" = "956a5e5323071dfdd0ea1f9d073c8ebb8fb29ba05d57f0fff217d1ccd7c3c20f" +"checksum ckb-types 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)" = "" +"checksum ckb-util 0.20.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.20.0-rc1)" = "" "checksum ckb-vm 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f089b008f8fa02e44b409b2c24ee9a9f65216f24cebeccc598162d3a44a675ad" "checksum ckb-vm-definitions 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd297669e4783ddca472fa00e7d2117b2d1dcb67cca814d5dd222852b8dba088" "checksum clang-sys 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)" = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853" @@ -3138,7 +3112,6 @@ dependencies = [ "checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" "checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" "checksum crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa" -"checksum crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13" "checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71" "checksum crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9" "checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" @@ -3157,7 +3130,6 @@ dependencies = [ "checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2" "checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1" "checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" -"checksum faster-hex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ea2e4ecc921ec2cbb8b10f0d400fe448554779d2ac5e0bfbb065836d9d8483a" "checksum faster-hex 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b8cccaafb5aae8c282692e5590f341925edea6c696e8715ff0d973320b2646" "checksum fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33" "checksum flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "2adaffba6388640136149e18ed080b77a78611c1e1d6de75aedcdf78df5d4682" @@ -3171,7 +3143,7 @@ dependencies = [ "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" "checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" "checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" -"checksum getrandom 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "6171a6cc63fbabbe27c2b5ee268e8b7fe5dc1eb0dd2dfad537c1dfed6f69117e" +"checksum getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "fc344b02d3868feb131e8b5fe2b9b0a1cc42942679af493061fc13b853243872" "checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" "checksum goblin 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)" = "7f55d53401eb2fd30afd025c570b1946b6966344acf21b42e31286f3bf89e6a8" "checksum h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" @@ -3201,7 +3173,7 @@ dependencies = [ "checksum jsonrpc-core 8.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ddf83704f4e79979a424d1082dd2c1e52683058056c9280efa19ac5f6bc9033c" "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.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" +"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" "checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba" "checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" "checksum librocksdb-sys 6.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6af56e6599bce586321e8ba8acf8a0a5e97431fd9ab49f9b69f92d93fe642c6" @@ -3233,9 +3205,6 @@ dependencies = [ "checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" "checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273" "checksum numext-constructor 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "983983b13ec50f55d5b9536faa553d7fadaa12fae9e0dfda76ba74aebfcc7522" -"checksum numext-fixed-hash 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bf7afb548bd13ad63ea8c5ee58584a1f359f3a7764ee9f5dd4a5235c393b9621" -"checksum numext-fixed-hash-core 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "55343264b8c0dceb93706d32d556284f63b17561cc191e0bbb8211901198bf53" -"checksum numext-fixed-hash-hack 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "726093af3c5e12020dd953ba9413a1352b40616dbec03cf72ef11c4a0734fdab" "checksum numext-fixed-uint 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "84f38aa6a49599f6cf38edbf3af3da0eda190ed3f3889afa5f4cb13be5673259" "checksum numext-fixed-uint-core 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "dbae90b098c4ac5d5fd2fb48430c9141b7fac42e5fee31ee008c7880ec83adac" "checksum numext-fixed-uint-hack 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "aba196a4ea541560fb7e44d328c87f25f024c727eeb09df4bb53610a575cfed7" @@ -3262,7 +3231,7 @@ dependencies = [ "checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" "checksum proc-macro-hack 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e688f31d92ffd7c1ddc57a1b4e6d773c0f2a14ee437a4b0a4f5a69c80eb221c8" "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -"checksum proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4c5c2380ae88876faae57698be9e9775e3544decad214599c3a6266cca6ac802" +"checksum proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "175a40b9cf564ce9bf050654633dbf339978706b8ead1a907bb970b63185dd95" "checksum publicsuffix 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9bf259a81de2b2eb9850ec990ec78e6a25319715584fd7652b9b26f96fcb1510" "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" @@ -3276,7 +3245,7 @@ dependencies = [ "checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" "checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" "checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" -"checksum rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "615e683324e75af5d43d8f7a39ffe3ee4a9dc42c5c701167a71dc59c3a493aca" +"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" "checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" "checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" "checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" @@ -3284,14 +3253,14 @@ dependencies = [ "checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" "checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" "checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -"checksum rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a4b0186e22767d5b9738a05eab7c6ac90b15db17e5b5f9bd87976dd7d89a10a4" -"checksum rayon-core 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ebbe0df8435ac0c397d467b6cad6d25543d06e8a019ef3f6af3c384597515bd2" +"checksum rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "83a27732a533a1be0a0035a111fe76db89ad312f6f0347004c220c57f209a123" +"checksum rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "98dcf634205083b17d0861252431eb2acbfb698ab7478a2d20de07954f47ec7b" "checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" "checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" "checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d" -"checksum regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88c3d9193984285d544df4a30c23a4e62ead42edf70a4452ceb76dac1ce05c26" -"checksum regex-syntax 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b143cceb2ca5e56d5671988ef8b15615733e7ee16cd348e064333b251b89343f" +"checksum regex 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc98360d9e6ad383647702acc90f80b0582eac3ea577ab47d96325d3575de908" +"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" "checksum relay 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1576e382688d7e9deecea24417e350d3062d97e32e45d70b1cde65994ff1489a" "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" "checksum reqwest 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)" = "0f6d896143a583047512e59ac54a215cb203c29cc941917343edea3be8df9c78" @@ -3339,7 +3308,7 @@ dependencies = [ "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" "checksum subtle 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" "checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -"checksum syn 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "158521e6f544e7e3dcfc370ac180794aa38cb34a1b1e07609376d4adcf429b93" +"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf" "checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f" "checksum take 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b157868d8ac1f56b64604539990685fa7611d8fa9e5476cf0c02cf34d32917c5" "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" @@ -3365,15 +3334,15 @@ dependencies = [ "checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119" "checksum tokio-threadpool 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "90ca01319dea1e376a001e8dc192d42ebde6dd532532a5bad988ac37db365b19" "checksum tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e" -"checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92" +"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" "checksum try-lock 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee2aa4715743892880f70885373966c83d73ef1b0838a664ef0c76fffd35e7c2" "checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" "checksum try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b" "checksum tui 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "73b422ff4986065d33272b587907654f918a3fe8702786a8110bf68dede0d8ee" -"checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169" +"checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" "checksum uname 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" -"checksum unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a84e5511b2a947f3ae965dcb29b13b7b1691b6e7332cf5dbc1744138d5acb7f6" +"checksum unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2e2e6bd1e59e56598518beb94fd6db628ded570326f0a98c679a304bd9f00150" "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" "checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426" "checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" @@ -3395,7 +3364,7 @@ dependencies = [ "checksum wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd5442abcac6525a045cc8c795aedb60da7a2e5e89c7bf18a0d5357849bb23c7" "checksum which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" -"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" +"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" "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" "checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" diff --git a/Cargo.toml b/Cargo.toml index be352d14..58194255 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,20 +1,20 @@ [package] name = "ckb-cli" -version = "0.19.0" +version = "0.20.0" license = "MIT" authors = ["Linfeng Qian ", "Nervos Core Dev "] edition = "2018" [dependencies] -ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", branch = "rc/v0.19" } -ckb-hash = { git = "https://github.com/nervosnetwork/ckb", branch = "rc/v0.19" } -ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", branch = "rc/v0.19", features = ["secp"] } -ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", branch = "rc/v0.19" } -ckb-types = { git = "https://github.com/nervosnetwork/ckb", branch = "rc/v0.19" } -ckb-util = { git = "https://github.com/nervosnetwork/ckb", branch = "rc/v0.19" } +ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.20.0-rc1" } +ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.20.0-rc1" } +ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.20.0-rc1", features = ["secp"] } +ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.20.0-rc1" } +ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.20.0-rc1" } +ckb-util = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.20.0-rc1" } ckb-sdk = { path = "ckb-sdk" } ckb-index = { path = "ckb-index" } -ckb-resource = { git = "https://github.com/nervosnetwork/ckb", branch = "rc/v0.19" } +ckb-resource = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.20.0-rc1" } jsonrpc-client-core = "0.5.0" secp256k1 = {version = "0.15.0" } @@ -45,7 +45,7 @@ tui = "0.6.0" termion = "1.5" [build-dependencies] -ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", branch = "rc/v0.19" } +ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.20.0-rc1" } [workspace] members = ["ckb-sdk", "ckb-index"] diff --git a/ckb-index/Cargo.toml b/ckb-index/Cargo.toml index b723320c..1acab02b 100644 --- a/ckb-index/Cargo.toml +++ b/ckb-index/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-index" -version = "0.19.0" +version = "0.20.0" authors = ["Linfeng Qian ", "Nervos Core Dev "] edition = "2018" license = "MIT" @@ -13,5 +13,5 @@ log = "0.4.6" rocksdb = { version = "0.12.2", default-features = false } failure = "0.1.5" -ckb-types = { git = "https://github.com/nervosnetwork/ckb", branch = "rc/v0.19" } +ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.20.0-rc1" } ckb-sdk = { path = "../ckb-sdk" } diff --git a/ckb-index/src/index/key.rs b/ckb-index/src/index/key.rs index 841a3c23..58494fa8 100644 --- a/ckb-index/src/index/key.rs +++ b/ckb-index/src/index/key.rs @@ -131,12 +131,12 @@ impl Key { Key::TotalCapacity => KeyType::TotalCapacity.to_bytes(), Key::GlobalHash(hash) => { let mut bytes = KeyType::GlobalHash.to_bytes(); - bytes.extend(hash.to_vec()); + bytes.extend(hash.as_bytes().to_vec()); bytes } Key::TxMap(tx_hash) => { let mut bytes = KeyType::TxMap.to_bytes(); - bytes.extend(tx_hash.to_vec()); + bytes.extend(tx_hash.as_bytes().to_vec()); bytes } Key::SecpAddrLock(address) => { @@ -168,12 +168,12 @@ impl Key { } Key::LockScript(lock_hash) => { let mut bytes = KeyType::LockScript.to_bytes(); - bytes.extend(lock_hash.to_vec()); + bytes.extend(lock_hash.as_bytes().to_vec()); bytes } Key::LockTotalCapacity(lock_hash) => { let mut bytes = KeyType::LockTotalCapacity.to_bytes(); - bytes.extend(lock_hash.to_vec()); + bytes.extend(lock_hash.as_bytes().to_vec()); bytes } Key::LockTotalCapacityIndex(capacity, lock_hash) => { @@ -181,12 +181,12 @@ impl Key { let capacity = std::u64::MAX - capacity; let mut bytes = KeyType::LockTotalCapacityIndex.to_bytes(); bytes.extend(capacity.to_be_bytes().to_vec()); - bytes.extend(lock_hash.to_vec()); + bytes.extend(lock_hash.as_bytes().to_vec()); bytes } Key::LockLiveCellIndexPrefix(lock_hash, number_opt) => { let mut bytes = KeyType::LockLiveCellIndex.to_bytes(); - bytes.extend(lock_hash.to_vec()); + bytes.extend(lock_hash.as_bytes().to_vec()); if let Some(number) = number_opt { bytes.extend(number.to_be_bytes().to_vec()); } @@ -194,7 +194,7 @@ impl Key { } Key::LockLiveCellIndex(lock_hash, number, cell_index) => { let mut bytes = KeyType::LockLiveCellIndex.to_bytes(); - bytes.extend(lock_hash.to_vec()); + bytes.extend(lock_hash.as_bytes().to_vec()); // Must use big endian for sort bytes.extend(number.to_be_bytes().to_vec()); bytes.extend(cell_index.to_bytes()); @@ -202,7 +202,7 @@ impl Key { } Key::LockTx(lock_hash, number, tx_index) => { let mut bytes = KeyType::LockTx.to_bytes(); - bytes.extend(lock_hash.to_vec()); + bytes.extend(lock_hash.as_bytes().to_vec()); // Must use big endian for sort bytes.extend(number.to_be_bytes().to_vec()); bytes.extend(tx_index.to_be_bytes().to_vec()); @@ -211,7 +211,7 @@ impl Key { Key::TypeLiveCellIndexPrefix(type_hash, number_opt) => { let mut bytes = KeyType::TypeLiveCellIndex.to_bytes(); - bytes.extend(type_hash.to_vec()); + bytes.extend(type_hash.as_bytes().to_vec()); if let Some(number) = number_opt { bytes.extend(number.to_be_bytes().to_vec()); } @@ -219,7 +219,7 @@ impl Key { } Key::TypeLiveCellIndex(type_hash, number, cell_index) => { let mut bytes = KeyType::TypeLiveCellIndex.to_bytes(); - bytes.extend(type_hash.to_vec()); + bytes.extend(type_hash.as_bytes().to_vec()); // Must use big endian for sort bytes.extend(number.to_be_bytes().to_vec()); bytes.extend(cell_index.to_bytes()); @@ -228,7 +228,7 @@ impl Key { Key::CodeLiveCellIndexPrefix(code_hash, number_opt) => { let mut bytes = KeyType::CodeLiveCellIndex.to_bytes(); - bytes.extend(code_hash.to_vec()); + bytes.extend(code_hash.as_bytes().to_vec()); if let Some(number) = number_opt { bytes.extend(number.to_be_bytes().to_vec()); } @@ -236,7 +236,7 @@ impl Key { } Key::CodeLiveCellIndex(code_hash, number, cell_index) => { let mut bytes = KeyType::CodeLiveCellIndex.to_bytes(); - bytes.extend(code_hash.to_vec()); + bytes.extend(code_hash.as_bytes().to_vec()); // Must use big endian for sort bytes.extend(number.to_be_bytes().to_vec()); bytes.extend(cell_index.to_bytes()); @@ -383,7 +383,7 @@ impl Key { } pub(crate) fn pair_genesis_hash(value: &H256) -> (Vec, Vec) { - (Key::GenesisHash.to_bytes(), value.to_vec()) + (Key::GenesisHash.to_bytes(), value.as_bytes().to_vec()) } pub(crate) fn pair_network(value: NetworkType) -> (Vec, Vec) { (Key::Network.to_bytes(), vec![value as u8]) @@ -405,7 +405,10 @@ impl Key { ) } pub(crate) fn pair_secp_addr_lock(address: Address, value: &H256) -> (Vec, Vec) { - (Key::SecpAddrLock(address).to_bytes(), value.to_vec()) + ( + Key::SecpAddrLock(address).to_bytes(), + value.as_bytes().to_vec(), + ) } pub(crate) fn pair_recent_header(value: &HeaderInfo) -> (Vec, Vec) { ( @@ -475,7 +478,7 @@ impl Key { ) -> (Vec, Vec) { ( Key::LockTx(lock_hash, number, tx_index).to_bytes(), - value.to_vec(), + value.as_bytes().to_vec(), ) } diff --git a/ckb-index/src/index/mod.rs b/ckb-index/src/index/mod.rs index 530e4cd8..7e0f1074 100644 --- a/ckb-index/src/index/mod.rs +++ b/ckb-index/src/index/mod.rs @@ -9,9 +9,8 @@ use ckb_sdk::{Address, GenesisInfo, NetworkType}; use ckb_types::{ bytes::Bytes, core::{BlockView, HeaderView}, - packed::{Header, OutPoint, Script}, + packed::{Byte32, Header, OutPoint, Script}, prelude::*, - H256, }; use rocksdb::{ColumnFamily, DB}; @@ -46,11 +45,11 @@ impl<'a> IndexDatabase<'a> { let genesis_header = genesis_info.header().clone(); assert_eq!(genesis_header.number(), 0); - let (genesis_hash_opt, network_opt): (Option, Option) = { + let (genesis_hash_opt, network_opt): (Option, Option) = { let reader = RocksReader::new(db, cf); let genesis_hash_opt = reader .get(&Key::GenesisHash.to_bytes()) - .map(|bytes| H256::from_slice(&bytes).unwrap()); + .map(|bytes| Byte32::from_slice(&bytes).unwrap()); let network_opt = reader .get(&Key::Network.to_bytes()) .map(|bytes| NetworkType::from_u8(bytes[0]).unwrap()); @@ -63,7 +62,7 @@ impl<'a> IndexDatabase<'a> { network, network_opt ))); } - let hash: H256 = genesis_header.hash().unpack(); + let hash: Byte32 = genesis_header.hash(); if genesis_hash != hash { return Err(IndexError::InvalidGenesis(format!( "{:#x}, expected: {:#x}", @@ -95,12 +94,12 @@ impl<'a> IndexDatabase<'a> { pub fn apply_next_block(&mut self, block: BlockView) -> Result<(), IndexError> { let number = block.header().number(); - let block_hash: H256 = block.header().hash().unpack(); + let block_hash = block.header().hash(); if let Some(last_header) = self.last_header.clone() { if number != last_header.number() + 1 { return Err(IndexError::InvalidBlockNumber(number)); } - if block.header().parent_hash() != last_header.hash().unpack() { + if block.header().parent_hash() != last_header.hash() { if number == 1 { return Err(IndexError::IllegalBlock(block_hash)); } @@ -131,7 +130,7 @@ impl<'a> IndexDatabase<'a> { self.apply_block_unchecked(block); Ok(()) } else if number == 0 { - let genesis_hash = self.genesis_info.header().hash().unpack(); + let genesis_hash = self.genesis_info.header().hash(); if block_hash != genesis_hash { Err(IndexError::InvalidGenesis(format!( "{:#x}, expected: {:#x}", @@ -162,9 +161,9 @@ impl<'a> IndexDatabase<'a> { self.last_number().map(|number| number + 1) } - fn get_address_inner(&self, reader: &RocksReader, lock_hash: H256) -> Option
{ + fn get_address_inner(&self, reader: &RocksReader, lock_hash: Byte32) -> Option
{ reader - .get(&Key::LockScript(lock_hash).to_bytes()) + .get(&Key::LockScript(lock_hash.unpack()).to_bytes()) .and_then(|bytes| { let script = Script::new_unchecked(bytes.into()); script.args().get(0).and_then(|arg| { @@ -174,10 +173,10 @@ impl<'a> IndexDatabase<'a> { }) } - pub fn get_capacity(&self, lock_hash: H256) -> Option { + pub fn get_capacity(&self, lock_hash: Byte32) -> Option { let reader = RocksReader::new(self.db, self.cf); reader - .get(&Key::LockTotalCapacity(lock_hash).to_bytes()) + .get(&Key::LockTotalCapacity(lock_hash.unpack()).to_bytes()) .map(|bytes| { let mut data = [0u8; 8]; data.copy_from_slice(&bytes[..8]); @@ -185,55 +184,55 @@ impl<'a> IndexDatabase<'a> { }) } - pub fn get_lock_hash_by_address(&self, address: Address) -> Option { + pub fn get_lock_hash_by_address(&self, address: Address) -> Option { let reader = RocksReader::new(self.db, self.cf); reader .get(&Key::SecpAddrLock(address).to_bytes()) - .map(|bytes| H256::from_slice(&bytes).unwrap()) + .map(|bytes| Byte32::from_slice(&bytes).unwrap()) } - pub fn get_lock_script_by_hash(&self, lock_hash: H256) -> Option