diff --git a/Cargo.lock b/Cargo.lock index 269fcd1e..5b000d2e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,10 +1,5 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -[[package]] -name = "adler32" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "aes-ctr" version = "0.3.0" @@ -216,16 +211,6 @@ dependencies = [ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "build-info" -version = "0.16.0" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16#2178d78f7a87dbc4b9ab0a1cfe95df3fbe05de84" - -[[package]] -name = "build_const" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "byte-tools" version = "0.3.1" @@ -293,29 +278,34 @@ dependencies = [ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "ckb-build-info" +version = "0.17.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?branch=develop#aefe6ecdb5e4b062b5f669042220f9325df66b2d" + [[package]] name = "ckb-cli" version = "0.15.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)", - "build-info 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "ckb-core 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", + "ckb-build-info 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", + "ckb-core 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", + "ckb-crypto 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", + "ckb-hash 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", + "ckb-jsonrpc-types 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", "ckb-sdk 0.15.0", - "ckb-util 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", + "ckb-util 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", "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.8 (registry+https://github.com/rust-lang/crates.io-index)", - "crypto 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "faster-hex 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "hash 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", "jsonrpc-client-core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpc-types 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", "numext-fixed-hash 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -334,31 +324,67 @@ dependencies = [ [[package]] name = "ckb-core" -version = "0.16.0" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16#2178d78f7a87dbc4b9ab0a1cfe95df3fbe05de84" +version = "0.17.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?branch=develop#aefe6ecdb5e4b062b5f669042220f9325df66b2d" dependencies = [ "bincode 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "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-merkle-tree 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", - "ckb-util 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", + "ckb-hash 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", + "ckb-merkle-tree 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", + "ckb-occupied-capacity 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", + "ckb-util 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "crypto 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", "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)", - "hash 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", "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)", - "occupied-capacity 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", "serde 1.0.95 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.95 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "ckb-crypto" +version = "0.17.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?branch=develop#aefe6ecdb5e4b062b5f669042220f9325df66b2d" +dependencies = [ + "crunchy 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", + "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "secp256k1 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "ckb-hash" +version = "0.17.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?branch=develop#aefe6ecdb5e4b062b5f669042220f9325df66b2d" +dependencies = [ + "blake2b-rs 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "ckb-jsonrpc-types" +version = "0.17.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?branch=develop#aefe6ecdb5e4b062b5f669042220f9325df66b2d" +dependencies = [ + "ckb-core 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", + "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)", + "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)", + "serde 1.0.95 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.95 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "ckb-logger" -version = "0.16.0" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16#2178d78f7a87dbc4b9ab0a1cfe95df3fbe05de84" +version = "0.17.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?branch=develop#aefe6ecdb5e4b062b5f669042220f9325df66b2d" dependencies = [ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace 0.3.30 (registry+https://github.com/rust-lang/crates.io-index)", @@ -375,65 +401,77 @@ dependencies = [ [[package]] name = "ckb-merkle-tree" -version = "0.16.0" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16#2178d78f7a87dbc4b9ab0a1cfe95df3fbe05de84" +version = "0.17.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?branch=develop#aefe6ecdb5e4b062b5f669042220f9325df66b2d" dependencies = [ - "hash 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", + "ckb-hash 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", "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.17.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?branch=develop#aefe6ecdb5e4b062b5f669042220f9325df66b2d" +dependencies = [ + "ckb-occupied-capacity-core 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", + "ckb-occupied-capacity-macros 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", + "proc-macro-hack 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "ckb-occupied-capacity-core" +version = "0.17.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?branch=develop#aefe6ecdb5e4b062b5f669042220f9325df66b2d" +dependencies = [ + "serde 1.0.95 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.95 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "ckb-occupied-capacity-macros" +version = "0.17.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?branch=develop#aefe6ecdb5e4b062b5f669042220f9325df66b2d" +dependencies = [ + "ckb-occupied-capacity-core 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", + "proc-macro-hack 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.36 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "ckb-protocol" -version = "0.16.0" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16#2178d78f7a87dbc4b9ab0a1cfe95df3fbe05de84" +version = "0.17.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?branch=develop#aefe6ecdb5e4b062b5f669042220f9325df66b2d" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ckb-core 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", - "ckb-merkle-tree 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", + "ckb-core 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", + "ckb-hash 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", + "ckb-merkle-tree 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "flatbuffers 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "flatbuffers-verifier 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "hash 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", "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)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "siphasher 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "ckb-resource" -version = "0.16.0" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16#2178d78f7a87dbc4b9ab0a1cfe95df3fbe05de84" -dependencies = [ - "ckb-system-scripts 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "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)", - "numext-fixed-hash 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.95 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.95 (registry+https://github.com/rust-lang/crates.io-index)", - "tempfile 3.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "walkdir 2.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "ckb-script" -version = "0.16.0" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16#2178d78f7a87dbc4b9ab0a1cfe95df3fbe05de84" +version = "0.17.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?branch=develop#aefe6ecdb5e4b062b5f669042220f9325df66b2d" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ckb-core 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", - "ckb-logger 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", - "ckb-protocol 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", - "ckb-resource 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", - "ckb-script-data-loader 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", + "ckb-core 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", + "ckb-hash 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", + "ckb-logger 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", + "ckb-protocol 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", + "ckb-script-data-loader 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", "ckb-vm 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", - "dao 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", "faster-hex 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "flatbuffers 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "hash 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", "numext-fixed-hash 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.95 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.95 (registry+https://github.com/rust-lang/crates.io-index)", @@ -441,10 +479,10 @@ dependencies = [ [[package]] name = "ckb-script-data-loader" -version = "0.16.0" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16#2178d78f7a87dbc4b9ab0a1cfe95df3fbe05de84" +version = "0.17.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?branch=develop#aefe6ecdb5e4b062b5f669042220f9325df66b2d" dependencies = [ - "ckb-core 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", + "ckb-core 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", "numext-fixed-hash 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -459,16 +497,16 @@ 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)", "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "ckb-core 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", - "ckb-script 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", - "crypto 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", + "ckb-core 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", + "ckb-crypto 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", + "ckb-hash 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", + "ckb-jsonrpc-types 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", + "ckb-script 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)", "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)", - "hash 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", "jsonrpc-client-core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-client-http 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpc-types 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", "numext-fixed-hash 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -482,22 +520,10 @@ dependencies = [ "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "ckb-system-scripts" -version = "0.1.0" -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)", - "faster-hex 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "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)", -] - [[package]] name = "ckb-util" -version = "0.16.0" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16#2178d78f7a87dbc4b9ab0a1cfe95df3fbe05de84" +version = "0.17.0-pre" +source = "git+https://github.com/nervosnetwork/ckb?branch=develop#aefe6ecdb5e4b062b5f669042220f9325df66b2d" dependencies = [ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "linked-hash-map 0.5.1 (git+https://github.com/nervosnetwork/linked-hash-map?rev=df27f21)", @@ -568,22 +594,6 @@ name = "constant_time_eq" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "crc" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "crc32fast" -version = "1.2.0" -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)", -] - [[package]] name = "crossbeam-channel" version = "0.3.8" @@ -646,20 +656,6 @@ name = "crunchy" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "crypto" -version = "0.16.0" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16#2178d78f7a87dbc4b9ab0a1cfe95df3fbe05de84" -dependencies = [ - "crunchy 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "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)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", - "secp256k1 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "crypto-mac" version = "0.7.0" @@ -678,15 +674,6 @@ dependencies = [ "stream-cipher 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "dao" -version = "0.16.0" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16#2178d78f7a87dbc4b9ab0a1cfe95df3fbe05de84" -dependencies = [ - "ckb-core 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", - "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "digest" version = "0.8.0" @@ -792,17 +779,6 @@ dependencies = [ "flatbuffers 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "flate2" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", - "miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "miniz_oxide_c_api 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "fnv" version = "1.0.6" @@ -864,14 +840,6 @@ dependencies = [ "scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "hash" -version = "0.16.0" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16#2178d78f7a87dbc4b9ab0a1cfe95df3fbe05de84" -dependencies = [ - "blake2b-rs 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "hashbrown" version = "0.1.8" @@ -947,25 +915,6 @@ dependencies = [ "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "includedir" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "flate2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "includedir_codegen" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "flate2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", - "walkdir 2.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "iovec" version = "0.1.2" @@ -1038,21 +987,6 @@ dependencies = [ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "jsonrpc-types" -version = "0.16.0" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16#2178d78f7a87dbc4b9ab0a1cfe95df3fbe05de84" -dependencies = [ - "ckb-core 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", - "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)", - "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)", - "serde 1.0.95 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.95 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "kernel32-sys" version = "0.2.2" @@ -1160,34 +1094,6 @@ dependencies = [ "unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "miniz-sys" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cc 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "miniz_oxide" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "miniz_oxide_c_api" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cc 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", - "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", - "miniz_oxide 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "mio" version = "0.6.19" @@ -1380,36 +1286,6 @@ name = "numtoa" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "occupied-capacity" -version = "0.16.0" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16#2178d78f7a87dbc4b9ab0a1cfe95df3fbe05de84" -dependencies = [ - "occupied-capacity-core 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", - "occupied-capacity-macros 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", - "proc-macro-hack 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "occupied-capacity-core" -version = "0.16.0" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16#2178d78f7a87dbc4b9ab0a1cfe95df3fbe05de84" -dependencies = [ - "serde 1.0.95 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.95 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "occupied-capacity-macros" -version = "0.16.0" -source = "git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16#2178d78f7a87dbc4b9ab0a1cfe95df3fbe05de84" -dependencies = [ - "occupied-capacity-core 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)", - "proc-macro-hack 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.36 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "opaque-debug" version = "0.2.2" @@ -1480,40 +1356,6 @@ dependencies = [ "ordermap 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "phf" -version = "0.7.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "phf_codegen" -version = "0.7.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "phf_generator" -version = "0.7.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "phf_shared" -version = "0.7.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "plain" version = "0.2.3" @@ -1761,14 +1603,6 @@ dependencies = [ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -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)", -] - [[package]] name = "rgb" version = "0.8.13" @@ -1832,14 +1666,6 @@ name = "safemem" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "same-file" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "scoped-tls" version = "0.1.2" @@ -1951,11 +1777,6 @@ name = "shell-words" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "siphasher" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "siphasher" version = "0.3.0" @@ -2030,19 +1851,6 @@ name = "take" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "tempfile" -version = "3.0.8" -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.58 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.54 (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)", -] - [[package]] name = "termcolor" version = "1.0.5" @@ -2439,16 +2247,6 @@ name = "void" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "walkdir" -version = "2.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "want" version = "0.0.4" @@ -2543,7 +2341,6 @@ dependencies = [ ] [metadata] -"checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c" "checksum aes-ctr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d2e5b0458ea3beae0d1d8c0f3946564f8e10f90646cf78c06b4351052058d1ee" "checksum aes-soft 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cfd7e7ae3f9a1fb5c03b389fc6bb9a51400d0c13053f0dca698c832bfd893a0d" "checksum aesni 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2f70a6b5f971e473091ab7cfb5ffac6cde81666c4556751d8d5620ead8abf100" @@ -2568,8 +2365,6 @@ dependencies = [ "checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" "checksum block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774" "checksum block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6d4dc3af3ee2e12f3e5d224e5e1e3d73668abbeb69e566d361f7d5563a4fdf09" -"checksum build-info 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)" = "" -"checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39" "checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" "checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" @@ -2579,15 +2374,20 @@ dependencies = [ "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-core 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)" = "" -"checksum ckb-logger 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)" = "" -"checksum ckb-merkle-tree 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)" = "" -"checksum ckb-protocol 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)" = "" -"checksum ckb-resource 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)" = "" -"checksum ckb-script 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)" = "" -"checksum ckb-script-data-loader 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)" = "" -"checksum ckb-system-scripts 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7467030954f6c711775c39abf2e5e67c3a0c974e00eb77c2ecc0a7eee3896b53" -"checksum ckb-util 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)" = "" +"checksum ckb-build-info 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)" = "" +"checksum ckb-core 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)" = "" +"checksum ckb-crypto 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)" = "" +"checksum ckb-hash 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)" = "" +"checksum ckb-jsonrpc-types 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)" = "" +"checksum ckb-logger 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)" = "" +"checksum ckb-merkle-tree 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)" = "" +"checksum ckb-occupied-capacity 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)" = "" +"checksum ckb-occupied-capacity-core 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)" = "" +"checksum ckb-occupied-capacity-macros 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)" = "" +"checksum ckb-protocol 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)" = "" +"checksum ckb-script 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)" = "" +"checksum ckb-script-data-loader 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)" = "" +"checksum ckb-util 0.17.0-pre (git+https://github.com/nervosnetwork/ckb?branch=develop)" = "" "checksum ckb-vm 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18b51030e40fcedaf36738d9b874565e51265facd279e2024d1d1798b52a17b2" "checksum ckb-vm-definitions 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb652578c56840b6db86364105df9af6cb3413076d06cf55a5b335724da16dea" "checksum clang-sys 0.26.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6ef0c1bcf2e99c649104bd7a7012d8f8802684400e03db0ec0af48583c6fa0e4" @@ -2595,8 +2395,6 @@ dependencies = [ "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" "checksum colored 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6cdb90b60f2927f8d76139c72dbde7e10c3a2bc47c8594c9c7a66529f2687c03" "checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e" -"checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb" -"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" "checksum crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0f0ed1a4de2235cabda8558ff5840bffb97fcb64c97827f354a451307df5f72b" "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" @@ -2604,10 +2402,8 @@ dependencies = [ "checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" "checksum crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c" "checksum crunchy 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" -"checksum crypto 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)" = "" "checksum crypto-mac 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" "checksum ctr 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "022cd691704491df67d25d006fe8eca083098253c4d43516c2206479c58c6736" -"checksum dao 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)" = "" "checksum digest 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05f47366984d3ad862010e22c7ce81a7dbcaebbdfb37241a620f8b6596ee135c" "checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" "checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e" @@ -2622,7 +2418,6 @@ dependencies = [ "checksum fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33" "checksum flatbuffers 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2fc1af59fd8248b59beb048d614a869ce211315c195f5412334e47f5b7e22726" "checksum flatbuffers-verifier 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fb67f9057183996c00b19cd934f9e79f09aecf7c29e4424cf262288f5a2a84ae" -"checksum flate2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f87e68aa82b2de08a6e037f1385455759df6e445a8df5e005b4297191dbf18aa" "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" @@ -2632,7 +2427,6 @@ dependencies = [ "checksum generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c0f28c2f5bfb5960175af447a2da7c18900693738343dc896ffbcabd9839592" "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" "checksum goblin 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)" = "7f55d53401eb2fd30afd025c570b1946b6966344acf21b42e31286f3bf89e6a8" -"checksum hash 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)" = "" "checksum hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da" "checksum heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1679e6ea370dee694f91f1dc469bf94cf8f52051d147aec3e1f9497c6fc22461" "checksum hmac 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f127a908633569f208325f86f71255d3363c79721d7f9fe31cd5569908819771" @@ -2640,8 +2434,6 @@ dependencies = [ "checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" "checksum hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)" = "34a590ca09d341e94cddf8e5af0bbccde205d5fbc2fa3c09dd67c7f85cea59d7" "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -"checksum includedir 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e97402f770a519ebea51b27131c3b6558cfd2375aff21294bad806bad91bf0b6" -"checksum includedir_codegen 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "af7d542be113fd84855692fb536c16cc4c09527724d1dca8953047d71cccadef" "checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08" "checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" "checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" @@ -2649,7 +2441,6 @@ dependencies = [ "checksum jsonrpc-client-http 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2e642eb74423b9dfcb4512fda167148746b76f788a823cd712fadf409f31d302" "checksum jsonrpc-core 10.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dc15eef5f8b6bef5ac5f7440a957ff95d036e2f98706947741bfc93d1976db4c" "checksum jsonrpc-core 8.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ddf83704f4e79979a424d1082dd2c1e52683058056c9280efa19ac5f6bc9033c" -"checksum jsonrpc-types 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)" = "" "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" @@ -2666,9 +2457,6 @@ dependencies = [ "checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3" "checksum merkle-cbt 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d589b5a7ca642540e7ccfbca3bcd0aa18693eb9287e2a6b17c79b1d062d52863" "checksum mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425" -"checksum miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9e3ae51cea1576ceba0dde3d484d30e6e5b86dee0b2d412fe3a16a15c98202" -"checksum miniz_oxide 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c468f2369f07d651a5d0bb2c9079f8488a66d5466efe42d0c5c6466edcb7f71e" -"checksum miniz_oxide_c_api 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b7fe927a42e3807ef71defb191dc87d4e24479b221e67015fe38ae2b7b447bab" "checksum mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "83f51996a3ed004ef184e16818edc51fadffe8e7ca68be67f9dee67d84d0ff23" "checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125" "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" @@ -2688,9 +2476,6 @@ dependencies = [ "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" "checksum numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" -"checksum occupied-capacity 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)" = "" -"checksum occupied-capacity-core 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)" = "" -"checksum occupied-capacity-macros 0.16.0 (git+https://github.com/nervosnetwork/ckb?branch=rc/v0.16)" = "" "checksum opaque-debug 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "93f5bb2e8e8dec81642920ccff6b61f1eb94fa3020c5a325c9851ff604152409" "checksum ordermap 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063" "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" @@ -2700,10 +2485,6 @@ dependencies = [ "checksum peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" "checksum petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f" -"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" -"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" -"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" -"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" "checksum plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" "checksum proc-macro-hack 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0c1dd4172a1e1f96f709341418f49b11ea6c2d95d53dca08c0f74cbd332d9cf3" "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" @@ -2731,7 +2512,6 @@ dependencies = [ "checksum regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "d9d8297cc20bbb6184f8b45ff61c8ee6a9ac56c156cec8e38c3e5084773c44ad" "checksum regex-syntax 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "9d76410686f9e3a17f06128962e0ecc5755870bb890c34820c7af7f1db2e1d48" "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 rgb 0.8.13 (registry+https://github.com/rust-lang/crates.io-index)" = "4f089652ca87f5a82a62935ec6172a534066c7b97be003cc8f702ee9a7a59c92" "checksum rocksdb 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d29e12aab379a49bfbca337132440be73d1de6f328d5635641c2b28ac9dfe514" "checksum rpassword 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c34fa7bcae7fca3c8471e8417088bbc3ad9af8066b0ecf4f3c0d98a0d772716e" @@ -2740,7 +2520,6 @@ dependencies = [ "checksum rustyline 4.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0f47ea1ceb347d2deae482d655dc8eef4bd82363d3329baffa3818bd76fea48b" "checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997" "checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9" -"checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267" "checksum scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28" "checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" @@ -2755,7 +2534,6 @@ dependencies = [ "checksum serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704" "checksum sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d" "checksum shell-words 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "39acde55a154c4cd3ae048ac78cc21c25f3a0145e44111b523279113dce0d94a" -"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" "checksum siphasher 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9913c75df657d84a03fa689c016b0bb2863ff0b497b26a8d6e9703f8d5df03a8" "checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23" "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" @@ -2768,7 +2546,6 @@ dependencies = [ "checksum syn 0.15.36 (registry+https://github.com/rust-lang/crates.io-index)" = "8b4f551a91e2e3848aeef8751d0d4eec9489b6474c720fd4c55958d8d31a430c" "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.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7dc4738f2e68ed2855de5ac9cdbe05c9216773ecde4739b2f095002ab03a13ef" "checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" "checksum termion 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a8fb22f7cde82c8220e5aeacb3258ed7ce996142c77cba193f203515e26c330" "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" @@ -2810,7 +2587,6 @@ dependencies = [ "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" "checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" -"checksum walkdir 2.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c7904a7e2bb3cdf0cf5e783f44204a85a37a93151738fa349f06680f59a98b45" "checksum want 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a05d9d966753fa4b5c8db73fcab5eed4549cfe0e1e4e66911e5564a0085c35d1" "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" diff --git a/Cargo.toml b/Cargo.toml index b403462c..e348f8a8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,12 +7,12 @@ edition = "2018" [dependencies] numext-fixed-hash = "~0.1" -jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", branch = "rc/v0.16" } -hash = { git = "https://github.com/nervosnetwork/ckb", branch = "rc/v0.16" } -crypto = { git = "https://github.com/nervosnetwork/ckb", branch = "rc/v0.16", features = ["secp", "bech32"] } -build-info = { git = "https://github.com/nervosnetwork/ckb", branch = "rc/v0.16" } -ckb-core = { git = "https://github.com/nervosnetwork/ckb", branch = "rc/v0.16" } -ckb-util = { git = "https://github.com/nervosnetwork/ckb", branch = "rc/v0.16" } +ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", branch = "develop" } +ckb-hash = { git = "https://github.com/nervosnetwork/ckb", branch = "develop" } +ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", branch = "develop", features = ["secp", "bech32"] } +ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", branch = "develop" } +ckb-core = { git = "https://github.com/nervosnetwork/ckb", branch = "develop" } +ckb-util = { git = "https://github.com/nervosnetwork/ckb", branch = "develop" } ckb-sdk = { path = "ckb-sdk" } jsonrpc-client-core = "0.5.0" @@ -44,7 +44,7 @@ tui = "0.6.0" termion = "1.5" [build-dependencies] -build-info = { git = "https://github.com/nervosnetwork/ckb", branch = "rc/v0.16" } +ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", branch = "develop" } [workspace] members = ["ckb-sdk"] diff --git a/build.rs b/build.rs index 0102257b..e70cc9ae 100644 --- a/build.rs +++ b/build.rs @@ -2,10 +2,10 @@ fn main() { // forward git repo hashes we build at println!( "cargo:rustc-env=COMMIT_DESCRIBE={}", - build_info::get_commit_describe().unwrap_or_default() + ckb_build_info::get_commit_describe().unwrap_or_default() ); println!( "cargo:rustc-env=COMMIT_DATE={}", - build_info::get_commit_date().unwrap_or_default() + ckb_build_info::get_commit_date().unwrap_or_default() ); } diff --git a/ckb-sdk/Cargo.toml b/ckb-sdk/Cargo.toml index d9fcff9a..68914337 100644 --- a/ckb-sdk/Cargo.toml +++ b/ckb-sdk/Cargo.toml @@ -31,8 +31,8 @@ uuid = { version = "0.7.4", features = ["v4"] } chrono = "0.4.6" failure = "0.1.5" -ckb-core = { git = "https://github.com/nervosnetwork/ckb", branch = "rc/v0.16" } -ckb-script = { git = "https://github.com/nervosnetwork/ckb", branch = "rc/v0.16" } -jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", branch = "rc/v0.16" } -hash = { git = "https://github.com/nervosnetwork/ckb", branch = "rc/v0.16" } -crypto = { git = "https://github.com/nervosnetwork/ckb", branch = "rc/v0.16", features = ["secp", "bech32"] } +ckb-core = { git = "https://github.com/nervosnetwork/ckb", branch = "develop" } +ckb-script = { git = "https://github.com/nervosnetwork/ckb", branch = "develop" } +ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", branch = "develop" } +ckb-hash = { git = "https://github.com/nervosnetwork/ckb", branch = "develop" } +ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", branch = "develop", features = ["secp", "bech32"] } diff --git a/ckb-sdk/src/basic.rs b/ckb-sdk/src/basic.rs index a091dc4b..e31d3f80 100644 --- a/ckb-sdk/src/basic.rs +++ b/ckb-sdk/src/basic.rs @@ -3,9 +3,9 @@ use std::str::FromStr; use bech32::{convert_bits, Bech32, ToBase32}; use bytes::Bytes; -use ckb_core::script::Script as CoreScript; -use crypto::secp::Pubkey; -use hash::blake2b_256; +use ckb_core::script::{Script, ScriptHashType}; +use ckb_crypto::secp::Pubkey; +use ckb_hash::blake2b_256; use numext_fixed_hash::{H160, H256}; use serde_derive::{Deserialize, Serialize}; @@ -106,10 +106,11 @@ impl Address { &self.hash } - pub fn lock_script(&self, code_hash: H256) -> CoreScript { - CoreScript { + pub fn lock_script(&self, code_hash: H256) -> Script { + Script { args: vec![Bytes::from(self.hash.as_bytes())], code_hash, + hash_type: ScriptHashType::Data, } } diff --git a/ckb-sdk/src/chain.rs b/ckb-sdk/src/chain.rs index 2f9547e1..cdfaf032 100644 --- a/ckb-sdk/src/chain.rs +++ b/ckb-sdk/src/chain.rs @@ -6,17 +6,17 @@ use ckb_core::{ transaction::{CellOutPoint, CellOutput, OutPoint, TransactionBuilder}, Capacity, }; -use crypto::secp::SECP256K1; -use hash::blake2b_256; -use jsonrpc_types::Transaction as RpcTransaction; +use ckb_crypto::secp::SECP256K1; +use ckb_hash::blake2b_256; +use ckb_jsonrpc_types::Transaction as RpcTransaction; use numext_fixed_hash::{h256, H256}; pub const ONE_CKB: u64 = 100_000_000; -// H256(secp code hash) + H160 (secp pubkey hash) + u64(capacity) = 32 + 20 + 8 = 60 -pub const MIN_SECP_CELL_CAPACITY: u64 = 60 * ONE_CKB; +// H256(secp code hash) + H160 (secp pubkey hash) + 1 (ScriptHashType) + u64(capacity) = 32 + 20 + 1 + 8 = 61 +pub const MIN_SECP_CELL_CAPACITY: u64 = (32 + 20 + 1 + 8) * ONE_CKB; const SECP_CODE_HASH: H256 = - h256!("0x94334bdda40b69bae067d84937aa6bbccf8acd0df6626d4b9ac70d4612a11933"); + h256!("0x54811ce986d5c3e57eaafab22cdd080e32209e39590e204a99b32935f835a13c"); #[derive(Debug, Clone)] pub struct GenesisInfo { diff --git a/ckb-sdk/src/rpc/client.rs b/ckb-sdk/src/rpc/client.rs index 0a5a0ed2..1dcd3bd5 100644 --- a/ckb-sdk/src/rpc/client.rs +++ b/ckb-sdk/src/rpc/client.rs @@ -1,9 +1,9 @@ -use jsonrpc_client_core::{expand_params, jsonrpc_client}; -use jsonrpc_client_http::{HttpHandle, HttpTransport}; -use jsonrpc_types::{ +use ckb_jsonrpc_types::{ BlockNumber, BlockView, CellOutputWithOutPoint, CellWithStatus, ChainInfo, EpochNumber, EpochView, HeaderView, Node, OutPoint, Transaction, TransactionWithStatus, TxPoolInfo, }; +use jsonrpc_client_core::{expand_params, jsonrpc_client}; +use jsonrpc_client_http::{HttpHandle, HttpTransport}; use serde_derive::{Deserialize, Serialize}; use numext_fixed_hash::H256; diff --git a/ckb-sdk/src/rpc/mod.rs b/ckb-sdk/src/rpc/mod.rs index c93563b2..dbaa3a0a 100644 --- a/ckb-sdk/src/rpc/mod.rs +++ b/ckb-sdk/src/rpc/mod.rs @@ -1,10 +1,10 @@ mod client; +pub use ckb_jsonrpc_types::{ + BlockNumber, BlockView, CellOutputWithOutPoint, CellWithStatus, ChainInfo, EpochNumber, + EpochView, HeaderView, Node, OutPoint, Transaction, TransactionWithStatus, TxPoolInfo, +}; pub use client::{ CellOutputWithOutPoints, HttpRpcClient, Nodes, OptionBlockView, OptionEpochView, OptionH256, OptionTransactionWithStatus, RpcClient, }; -pub use jsonrpc_types::{ - BlockNumber, BlockView, CellOutputWithOutPoint, CellWithStatus, ChainInfo, EpochNumber, - EpochView, HeaderView, Node, OutPoint, Transaction, TransactionWithStatus, TxPoolInfo, -}; diff --git a/ckb-sdk/src/transaction/tx.rs b/ckb-sdk/src/transaction/tx.rs index 34a87c47..a94a3927 100644 --- a/ckb-sdk/src/transaction/tx.rs +++ b/ckb-sdk/src/transaction/tx.rs @@ -10,9 +10,9 @@ use ckb_core::{ transaction::{CellOutPoint, CellOutput, OutPoint, Transaction, TransactionBuilder, Witness}, Cycle, }; +use ckb_hash::blake2b_256; use ckb_script::{DataLoader, ScriptConfig, TransactionScriptsVerifier}; use fnv::FnvHashSet; -use hash::blake2b_256; use numext_fixed_hash::{H160, H256}; use rocksdb::{ColumnFamily, IteratorMode, Options, DB}; use serde_derive::{Deserialize, Serialize}; @@ -245,6 +245,7 @@ impl Resource { block_info = Some(BlockInfo { number: header.number(), epoch: header.epoch(), + hash: header.hash().clone(), }); required_headers.insert(hash.clone(), header); out_point_blocks.insert(cell_out_point.clone(), hash.clone()); diff --git a/ckb-sdk/src/wallet/keystore/mod.rs b/ckb-sdk/src/wallet/keystore/mod.rs index d3e0fddb..92cacfa5 100644 --- a/ckb-sdk/src/wallet/keystore/mod.rs +++ b/ckb-sdk/src/wallet/keystore/mod.rs @@ -11,9 +11,9 @@ use std::path::{Path, PathBuf}; use std::time::{Duration, Instant}; use chrono::{Datelike, Timelike, Utc}; -use crypto::secp::SECP256K1; +use ckb_crypto::secp::SECP256K1; +use ckb_hash::blake2b_256; use faster_hex::hex_decode; -use hash::blake2b_256; use numext_fixed_hash::{H160, H256}; use rand::Rng; use uuid::Uuid; diff --git a/src/interactive.rs b/src/interactive.rs index 52458af8..c1c1ee78 100644 --- a/src/interactive.rs +++ b/src/interactive.rs @@ -5,7 +5,7 @@ use std::time::{Duration, Instant}; use ansi_term::Colour::Green; use ckb_core::{block::Block, service::Request}; -use jsonrpc_types::BlockNumber; +use ckb_jsonrpc_types::BlockNumber; use regex::Regex; use rustyline::config::Configurer; use rustyline::error::ReadlineError; diff --git a/src/main.rs b/src/main.rs index bfe7354d..6bea43bb 100644 --- a/src/main.rs +++ b/src/main.rs @@ -6,7 +6,7 @@ use std::iter::FromIterator; use std::process; use std::sync::Arc; -use build_info::Version; +use ckb_build_info::Version; use ckb_sdk::HttpRpcClient; use ckb_util::RwLock; use clap::crate_version; diff --git a/src/subcommands/account.rs b/src/subcommands/account.rs index 5643b18b..b4b7b2b6 100644 --- a/src/subcommands/account.rs +++ b/src/subcommands/account.rs @@ -4,12 +4,12 @@ use std::path::{Path, PathBuf}; use std::time::Duration; use ckb_core::block::Block; +use ckb_jsonrpc_types::BlockNumber; use ckb_sdk::{ wallet::{Key, KeyStore, MasterPrivKey}, Address, GenesisInfo, HttpRpcClient, NetworkType, }; use clap::{App, Arg, ArgMatches, SubCommand}; -use jsonrpc_types::BlockNumber; use numext_fixed_hash::{H160, H256}; use super::CliSubCommand; diff --git a/src/subcommands/local/cell.rs b/src/subcommands/local/cell.rs index 8d7d61d2..2743cd3c 100644 --- a/src/subcommands/local/cell.rs +++ b/src/subcommands/local/cell.rs @@ -7,13 +7,13 @@ use ckb_core::{ transaction::{CellOutPoint, CellOutput}, Capacity, }; +use ckb_hash::blake2b_256; +use ckb_jsonrpc_types::{CellOutPoint as RpcCellOutPoint, CellOutput as RpcCellOutput}; use ckb_sdk::{ to_local_cell_out_point, with_rocksdb, CellAliasManager, CellManager, HttpRpcClient, ScriptManager, }; use clap::{App, Arg, ArgMatches, SubCommand}; -use hash::blake2b_256; -use jsonrpc_types::{CellOutPoint as RpcCellOutPoint, CellOutput as RpcCellOutput}; use numext_fixed_hash::H256; use super::super::CliSubCommand; diff --git a/src/subcommands/local/cell_input.rs b/src/subcommands/local/cell_input.rs index 8ebaf622..8eb025fa 100644 --- a/src/subcommands/local/cell_input.rs +++ b/src/subcommands/local/cell_input.rs @@ -1,9 +1,9 @@ use std::path::PathBuf; use ckb_core::transaction::{CellInput, CellOutPoint, OutPoint}; +use ckb_jsonrpc_types::{BlockNumber as RpcBlockNumber, CellInput as RpcCellInput}; use ckb_sdk::{to_local_cell_out_point, with_rocksdb, CellInputManager, HttpRpcClient}; use clap::{App, Arg, ArgMatches, SubCommand}; -use jsonrpc_types::{BlockNumber as RpcBlockNumber, CellInput as RpcCellInput}; use numext_fixed_hash::H256; use super::super::CliSubCommand; diff --git a/src/subcommands/local/mod.rs b/src/subcommands/local/mod.rs index c3cef6c1..b17d693e 100644 --- a/src/subcommands/local/mod.rs +++ b/src/subcommands/local/mod.rs @@ -11,9 +11,9 @@ pub use tx::LocalTxSubCommand; use std::path::PathBuf; use ckb_core::block::Block; +use ckb_jsonrpc_types::BlockNumber; use ckb_sdk::{wallet::KeyStore, GenesisInfo, HttpRpcClient}; use clap::{App, ArgMatches, SubCommand}; -use jsonrpc_types::BlockNumber; use super::CliSubCommand; use crate::utils::printer::{OutputFormat, Printable}; diff --git a/src/subcommands/local/script.rs b/src/subcommands/local/script.rs index b255d204..a6a79eaa 100644 --- a/src/subcommands/local/script.rs +++ b/src/subcommands/local/script.rs @@ -1,11 +1,11 @@ use std::path::PathBuf; use bytes::Bytes; -use ckb_core::script::Script; +use ckb_core::script::{Script, ScriptHashType}; +use ckb_jsonrpc_types::Script as RpcScript; use ckb_sdk::{with_rocksdb, HttpRpcClient, ScriptManager}; use clap::{App, Arg, ArgMatches, SubCommand}; use faster_hex::hex_decode; -use jsonrpc_types::Script as RpcScript; use numext_fixed_hash::H256; use super::super::CliSubCommand; @@ -103,7 +103,7 @@ impl<'a> CliSubCommand for LocalScriptSubCommand<'a> { }) .collect(); let args = args_result?; - let script = Script::new(args, code_hash); + let script = Script::new(args, code_hash, ScriptHashType::Data); let script_hash = script.hash(); with_rocksdb(&self.db_path, None, move |db| { ScriptManager::new(db).add(script).map_err(Into::into) diff --git a/src/subcommands/local/tx.rs b/src/subcommands/local/tx.rs index 8a5329ea..0a426434 100644 --- a/src/subcommands/local/tx.rs +++ b/src/subcommands/local/tx.rs @@ -5,12 +5,12 @@ use ckb_core::{ block::Block, transaction::{CellInput, CellOutPoint, CellOutput, OutPoint, TransactionBuilder, Witness}, }; +use ckb_jsonrpc_types::{BlockNumber, TransactionView}; use ckb_sdk::{ wallet::KeyStore, with_rocksdb, CellInputManager, CellManager, GenesisInfo, HttpRpcClient, TransactionManager, }; use clap::{App, Arg, ArgMatches, SubCommand}; -use jsonrpc_types::{BlockNumber, TransactionView}; use numext_fixed_hash::H256; use super::super::CliSubCommand; diff --git a/src/subcommands/rpc.rs b/src/subcommands/rpc.rs index 3af1e467..9c7ec37a 100644 --- a/src/subcommands/rpc.rs +++ b/src/subcommands/rpc.rs @@ -1,6 +1,6 @@ +use ckb_jsonrpc_types::{BlockNumber, CellOutPoint, EpochNumber, OutPoint, Unsigned}; use ckb_sdk::HttpRpcClient; use clap::{App, Arg, ArgMatches, SubCommand}; -use jsonrpc_types::{BlockNumber, CellOutPoint, EpochNumber, OutPoint, Unsigned}; use numext_fixed_hash::H256; use super::CliSubCommand; diff --git a/src/subcommands/tui/mod.rs b/src/subcommands/tui/mod.rs index 1dbda07c..c30c7016 100644 --- a/src/subcommands/tui/mod.rs +++ b/src/subcommands/tui/mod.rs @@ -20,8 +20,8 @@ use tui::widgets::{Block, Borders, Paragraph, SelectableList, Text, Widget}; use tui::{Frame, Terminal}; // use chrono::{Local, DateTime, TimeZone}; use ckb_core::service::Request; +use ckb_jsonrpc_types::BlockNumber; use ckb_sdk::{with_index_db, GenesisInfo, HttpRpcClient, IndexDatabase, NetworkType, ONE_CKB}; -use jsonrpc_types::BlockNumber; use super::wallet::{IndexController, IndexRequest}; use state::{start_rpc_thread, State, SummaryInfo}; diff --git a/src/subcommands/tui/state.rs b/src/subcommands/tui/state.rs index ec8604eb..04259617 100644 --- a/src/subcommands/tui/state.rs +++ b/src/subcommands/tui/state.rs @@ -4,9 +4,9 @@ use std::thread; use std::time::Duration; use ckb_core::{header::Header, script::Script}; +use ckb_jsonrpc_types::{BlockNumber, BlockView, ChainInfo, Node, TxPoolInfo}; use ckb_util::RwLock; use jsonrpc_client_core::Error as RpcError; -use jsonrpc_types::{BlockNumber, BlockView, ChainInfo, Node, TxPoolInfo}; use super::util::ts_now; use ckb_sdk::HttpRpcClient; diff --git a/src/subcommands/wallet/index.rs b/src/subcommands/wallet/index.rs index 4257b890..b70f7e8b 100644 --- a/src/subcommands/wallet/index.rs +++ b/src/subcommands/wallet/index.rs @@ -6,10 +6,10 @@ use std::thread; use std::time::{Duration, Instant}; use ckb_core::{block::Block, header::Header, service::Request}; +use ckb_jsonrpc_types::BlockNumber; use ckb_sdk::{GenesisInfo, NetworkType}; use ckb_util::RwLock; use crossbeam_channel::{Receiver, Sender}; -use jsonrpc_types::BlockNumber; use numext_fixed_hash::H256; use serde_derive::{Deserialize, Serialize}; diff --git a/src/subcommands/wallet/mod.rs b/src/subcommands/wallet/mod.rs index 797d4caa..3162a4a3 100644 --- a/src/subcommands/wallet/mod.rs +++ b/src/subcommands/wallet/mod.rs @@ -8,11 +8,11 @@ use std::time::Duration; use bytes::Bytes; use ckb_core::{block::Block, service::Request}; +use ckb_crypto::secp::SECP256K1; +use ckb_hash::blake2b_256; +use ckb_jsonrpc_types::BlockNumber; use clap::{App, Arg, ArgMatches, SubCommand}; -use crypto::secp::SECP256K1; use faster_hex::hex_string; -use hash::blake2b_256; -use jsonrpc_types::BlockNumber; use numext_fixed_hash::{H160, H256}; use serde_json::json;