From 394b18de08a4a6711274f0340e252a2d7c6e3067 Mon Sep 17 00:00:00 2001 From: Linfeng Qian Date: Mon, 23 Dec 2019 11:52:02 +0800 Subject: [PATCH] chore: Update ckb dependency to v0.26.1 --- Cargo.lock | 273 ++++++++++++------------ Cargo.toml | 18 +- Makefile | 2 +- ckb-index/Cargo.toml | 4 +- ckb-sdk-types/Cargo.toml | 14 +- ckb-sdk/Cargo.toml | 14 +- devtools/azure/windows-dependencies.yml | 14 +- 7 files changed, 168 insertions(+), 171 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 831eeb55..8cacb59d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -304,45 +304,44 @@ dependencies = [ [[package]] name = "ckb-build-info" -version = "0.26.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2#9d0f54bf9ef84a4173b993f20979c7dc199f1340" +version = "0.26.1-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1#04c00b0398d7e47ccebae951b3f01a28183672d1" [[package]] name = "ckb-chain-spec" -version = "0.26.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2#9d0f54bf9ef84a4173b993f20979c7dc199f1340" -dependencies = [ - "ckb-crypto 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-dao-utils 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-error 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-hash 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-jsonrpc-types 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-pow 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-rational 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-resource 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-types 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", +version = "0.26.1-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1#04c00b0398d7e47ccebae951b3f01a28183672d1" +dependencies = [ + "ckb-crypto 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-dao-utils 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-error 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-hash 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-jsonrpc-types 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-pow 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-rational 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-resource 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-types 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "ckb-cli" -version = "0.26.0" +version = "0.26.1" 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.10 (registry+https://github.com/rust-lang/crates.io-index)", - "ckb-build-info 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-crypto 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-hash 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-index 0.26.0", - "ckb-jsonrpc-types 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-resource 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-sdk 0.26.0", - "ckb-types 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-util 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", + "ckb-build-info 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-crypto 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-hash 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-index 0.26.1", + "ckb-jsonrpc-types 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-resource 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-sdk 0.26.1", + "ckb-types 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-util 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "colored 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -372,10 +371,10 @@ dependencies = [ [[package]] name = "ckb-crypto" -version = "0.26.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2#9d0f54bf9ef84a4173b993f20979c7dc199f1340" +version = "0.26.1-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1#04c00b0398d7e47ccebae951b3f01a28183672d1" dependencies = [ - "ckb-fixed-hash 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", + "ckb-fixed-hash 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "faster-hex 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -385,40 +384,40 @@ dependencies = [ [[package]] name = "ckb-dao-utils" -version = "0.26.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2#9d0f54bf9ef84a4173b993f20979c7dc199f1340" +version = "0.26.1-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1#04c00b0398d7e47ccebae951b3f01a28183672d1" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ckb-error 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-types 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", + "ckb-error 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-types 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", "enum-display-derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "ckb-error" -version = "0.26.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2#9d0f54bf9ef84a4173b993f20979c7dc199f1340" +version = "0.26.1-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1#04c00b0398d7e47ccebae951b3f01a28183672d1" dependencies = [ - "ckb-occupied-capacity 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", + "ckb-occupied-capacity 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", "enum-display-derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "ckb-fixed-hash" -version = "0.26.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2#9d0f54bf9ef84a4173b993f20979c7dc199f1340" +version = "0.26.1-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1#04c00b0398d7e47ccebae951b3f01a28183672d1" dependencies = [ - "ckb-fixed-hash-core 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-fixed-hash-hack 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", + "ckb-fixed-hash-core 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-fixed-hash-hack 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "ckb-fixed-hash-core" -version = "0.26.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2#9d0f54bf9ef84a4173b993f20979c7dc199f1340" +version = "0.26.1-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1#04c00b0398d7e47ccebae951b3f01a28183672d1" dependencies = [ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "faster-hex 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -427,10 +426,10 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-hack" -version = "0.26.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2#9d0f54bf9ef84a4173b993f20979c7dc199f1340" +version = "0.26.1-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1#04c00b0398d7e47ccebae951b3f01a28183672d1" dependencies = [ - "ckb-fixed-hash-core 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", + "ckb-fixed-hash-core 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", "proc-macro-hack 0.5.11 (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)", @@ -439,19 +438,19 @@ dependencies = [ [[package]] name = "ckb-hash" -version = "0.26.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2#9d0f54bf9ef84a4173b993f20979c7dc199f1340" +version = "0.26.1-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1#04c00b0398d7e47ccebae951b3f01a28183672d1" dependencies = [ "blake2b-rs 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "ckb-index" -version = "0.26.0" +version = "0.26.1" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "ckb-sdk 0.26.0", - "ckb-types 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", + "ckb-sdk 0.26.1", + "ckb-types 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", "failure 0.1.6 (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.2 (git+https://github.com/nervosnetwork/rust-rocksdb?rev=14d2991)", @@ -461,21 +460,20 @@ dependencies = [ [[package]] name = "ckb-jsonrpc-types" -version = "0.26.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2#9d0f54bf9ef84a4173b993f20979c7dc199f1340" +version = "0.26.1-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1#04c00b0398d7e47ccebae951b3f01a28183672d1" dependencies = [ - "ckb-types 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", + "ckb-types 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", "faster-hex 0.4.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.103 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "ckb-logger" -version = "0.26.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2#9d0f54bf9ef84a4173b993f20979c7dc199f1340" +version = "0.26.1-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1#04c00b0398d7e47ccebae951b3f01a28183672d1" dependencies = [ "ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)", @@ -488,34 +486,32 @@ dependencies = [ "regex 1.3.1 (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.103 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "ckb-occupied-capacity" -version = "0.26.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2#9d0f54bf9ef84a4173b993f20979c7dc199f1340" +version = "0.26.1-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1#04c00b0398d7e47ccebae951b3f01a28183672d1" dependencies = [ - "ckb-occupied-capacity-core 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-occupied-capacity-macros 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", + "ckb-occupied-capacity-core 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-occupied-capacity-macros 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "ckb-occupied-capacity-core" -version = "0.26.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2#9d0f54bf9ef84a4173b993f20979c7dc199f1340" +version = "0.26.1-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1#04c00b0398d7e47ccebae951b3f01a28183672d1" dependencies = [ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "ckb-occupied-capacity-macros" -version = "0.26.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2#9d0f54bf9ef84a4173b993f20979c7dc199f1340" +version = "0.26.1-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1#04c00b0398d7e47ccebae951b3f01a28183672d1" dependencies = [ - "ckb-occupied-capacity-core 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", + "ckb-occupied-capacity-core 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", "proc-macro-hack 0.5.11 (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)", @@ -523,83 +519,80 @@ dependencies = [ [[package]] name = "ckb-pow" -version = "0.26.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2#9d0f54bf9ef84a4173b993f20979c7dc199f1340" +version = "0.26.1-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1#04c00b0398d7e47ccebae951b3f01a28183672d1" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ckb-types 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", + "ckb-types 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", "eaglesong 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "ckb-rational" -version = "0.26.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2#9d0f54bf9ef84a4173b993f20979c7dc199f1340" +version = "0.26.1-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1#04c00b0398d7e47ccebae951b3f01a28183672d1" dependencies = [ "numext-fixed-uint 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "ckb-resource" -version = "0.26.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2#9d0f54bf9ef84a4173b993f20979c7dc199f1340" +version = "0.26.1-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1#04c00b0398d7e47ccebae951b3f01a28183672d1" dependencies = [ "ckb-system-scripts 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "ckb-types 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", + "ckb-types 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-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)", "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "ckb-script" -version = "0.26.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2#9d0f54bf9ef84a4173b993f20979c7dc199f1340" +version = "0.26.1-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1#04c00b0398d7e47ccebae951b3f01a28183672d1" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ckb-chain-spec 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-error 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-hash 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-logger 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-script-data-loader 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-types 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-vm 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ckb-chain-spec 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-error 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-hash 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-logger 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-script-data-loader 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-types 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-vm 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "faster-hex 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "ckb-script-data-loader" -version = "0.26.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2#9d0f54bf9ef84a4173b993f20979c7dc199f1340" +version = "0.26.1-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1#04c00b0398d7e47ccebae951b3f01a28183672d1" dependencies = [ - "ckb-types 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", + "ckb-types 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", ] [[package]] name = "ckb-sdk" -version = "0.26.0" +version = "0.26.1" 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.10 (registry+https://github.com/rust-lang/crates.io-index)", - "ckb-crypto 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-hash 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-jsonrpc-types 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-resource 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-script 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-sdk-types 0.26.0", - "ckb-types 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", + "ckb-crypto 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-hash 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-jsonrpc-types 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-resource 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-script 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-sdk-types 0.26.1", + "ckb-types 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", "failure 0.1.6 (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)", @@ -619,14 +612,14 @@ dependencies = [ [[package]] name = "ckb-sdk-types" -version = "0.26.0" -dependencies = [ - "ckb-crypto 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-error 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-hash 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-jsonrpc-types 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-script 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-types 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", +version = "0.26.1" +dependencies = [ + "ckb-crypto 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-error 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-hash 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-jsonrpc-types 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-script 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-types 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -645,16 +638,16 @@ dependencies = [ [[package]] name = "ckb-types" -version = "0.26.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2#9d0f54bf9ef84a4173b993f20979c7dc199f1340" +version = "0.26.1-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1#04c00b0398d7e47ccebae951b3f01a28183672d1" 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-error 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-fixed-hash 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-hash 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-occupied-capacity 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", - "ckb-rational 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)", + "ckb-error 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-fixed-hash 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-hash 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-occupied-capacity 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", + "ckb-rational 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)", "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "merkle-cbt 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -664,8 +657,8 @@ dependencies = [ [[package]] name = "ckb-util" -version = "0.26.0-pre" -source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2#9d0f54bf9ef84a4173b993f20979c7dc199f1340" +version = "0.26.1-pre" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1#04c00b0398d7e47ccebae951b3f01a28183672d1" 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)", @@ -673,13 +666,13 @@ dependencies = [ [[package]] name = "ckb-vm" -version = "0.18.1" +version = "0.18.2" 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.41 (registry+https://github.com/rust-lang/crates.io-index)", - "ckb-vm-definitions 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ckb-vm-definitions 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "goblin 0.0.24 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", @@ -688,7 +681,7 @@ dependencies = [ [[package]] name = "ckb-vm-definitions" -version = "0.18.1" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -3362,30 +3355,30 @@ dependencies = [ "checksum cexpr 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fce5b5fb86b0c57c20c834c1b412fd09c77c8a59b9473f86272709e78874cd1d" "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" "checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01" -"checksum ckb-build-info 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)" = "" -"checksum ckb-chain-spec 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)" = "" -"checksum ckb-crypto 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)" = "" -"checksum ckb-dao-utils 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)" = "" -"checksum ckb-error 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)" = "" -"checksum ckb-fixed-hash 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)" = "" -"checksum ckb-fixed-hash-core 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)" = "" -"checksum ckb-fixed-hash-hack 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)" = "" -"checksum ckb-hash 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)" = "" -"checksum ckb-jsonrpc-types 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)" = "" -"checksum ckb-logger 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)" = "" -"checksum ckb-occupied-capacity 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)" = "" -"checksum ckb-occupied-capacity-core 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)" = "" -"checksum ckb-occupied-capacity-macros 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)" = "" -"checksum ckb-pow 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)" = "" -"checksum ckb-rational 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)" = "" -"checksum ckb-resource 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)" = "" -"checksum ckb-script 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)" = "" -"checksum ckb-script-data-loader 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)" = "" +"checksum ckb-build-info 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)" = "" +"checksum ckb-chain-spec 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)" = "" +"checksum ckb-crypto 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)" = "" +"checksum ckb-dao-utils 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)" = "" +"checksum ckb-error 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)" = "" +"checksum ckb-fixed-hash 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)" = "" +"checksum ckb-fixed-hash-core 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)" = "" +"checksum ckb-fixed-hash-hack 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)" = "" +"checksum ckb-hash 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)" = "" +"checksum ckb-jsonrpc-types 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)" = "" +"checksum ckb-logger 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)" = "" +"checksum ckb-occupied-capacity 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)" = "" +"checksum ckb-occupied-capacity-core 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)" = "" +"checksum ckb-occupied-capacity-macros 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)" = "" +"checksum ckb-pow 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)" = "" +"checksum ckb-rational 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)" = "" +"checksum ckb-resource 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)" = "" +"checksum ckb-script 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)" = "" +"checksum ckb-script-data-loader 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)" = "" "checksum ckb-system-scripts 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "261dd95a93c09ea24397c85b4fbca061e1da2d6573189749aeb99fe840aaf0c9" -"checksum ckb-types 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)" = "" -"checksum ckb-util 0.26.0-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.0-rc2)" = "" -"checksum ckb-vm 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4a645990a41708a9a55ea8a90c42c98d20ce9b2d2dd457f51fce33bca8854474" -"checksum ckb-vm-definitions 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bd01bf493cff1315fd73a3be4a3ec135afe04503b81ebc1b531fcb061b42de6c" +"checksum ckb-types 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)" = "" +"checksum ckb-util 0.26.1-pre (git+https://github.com/nervosnetwork/ckb?tag=v0.26.1-rc1)" = "" +"checksum ckb-vm 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)" = "684aca846d958bc5c2196b10839b69ec573cc693b14dc701986adda123ffbef0" +"checksum ckb-vm-definitions 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5b4a65696efd8974a3c785619f2bfc4c40f2cf318ac184c30aa72d0f539a4a4f" "checksum clang-sys 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)" = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853" "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" diff --git a/Cargo.toml b/Cargo.toml index 5dd92b99..44694984 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,20 +1,20 @@ [package] name = "ckb-cli" -version = "0.26.0" +version = "0.26.1" license = "MIT" authors = ["Linfeng Qian ", "Nervos Core Dev "] edition = "2018" [dependencies] -ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" } -ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" } -ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2", features = ["secp"] } -ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" } -ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" } -ckb-util = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" } +ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" } +ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" } +ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1", features = ["secp"] } +ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" } +ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" } +ckb-util = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" } ckb-sdk = { path = "ckb-sdk" } ckb-index = { path = "ckb-index" } -ckb-resource = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" } +ckb-resource = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" } jsonrpc-client-core = "0.5.0" secp256k1 = {version = "0.15.0" } @@ -48,7 +48,7 @@ tui = "0.6.0" termion = "1.5" [build-dependencies] -ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" } +ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" } [workspace] members = ["ckb-sdk", "ckb-index", "ckb-sdk-types"] diff --git a/Makefile b/Makefile index fe2811db..12a43d94 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ ci: fmt clippy test security-audit git diff --exit-code Cargo.lock integration: - bash devtools/ci/integration.sh v0.25.1 + bash devtools/ci/integration.sh v0.26.1-rc1 prod: ## Build binary with release profile. cargo build --release diff --git a/ckb-index/Cargo.toml b/ckb-index/Cargo.toml index 3492f205..4ce1d8e6 100644 --- a/ckb-index/Cargo.toml +++ b/ckb-index/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-index" -version = "0.26.0" +version = "0.26.1" authors = ["Linfeng Qian ", "Nervos Core Dev "] edition = "2018" license = "MIT" @@ -11,7 +11,7 @@ serde_derive = "1.0" bincode = "1.1.4" log = "0.4.6" failure = "0.1.5" -ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" } +ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" } ckb-sdk = { path = "../ckb-sdk" } [dependencies.rocksdb] diff --git a/ckb-sdk-types/Cargo.toml b/ckb-sdk-types/Cargo.toml index 53ddb5a8..3933bffe 100644 --- a/ckb-sdk-types/Cargo.toml +++ b/ckb-sdk-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-sdk-types" -version = "0.26.0" +version = "0.26.1" authors = ["Linfeng Qian ", "Nervos Core Dev "] edition = "2018" license = "MIT" @@ -9,14 +9,14 @@ license = "MIT" serde = { version = "1.0", features = ["rc"] } serde_derive = "1.0" -ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" } -ckb-script = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2", default-features = false } -ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" } -ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" } -ckb-error = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" } +ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" } +ckb-script = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1", default-features = false } +ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" } +ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" } +ckb-error = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" } [dev-dependencies] -ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2", features = ["secp"] } +ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1", features = ["secp"] } [features] default = ["ckb-script/default"] diff --git a/ckb-sdk/Cargo.toml b/ckb-sdk/Cargo.toml index 3619321c..40f6d51d 100644 --- a/ckb-sdk/Cargo.toml +++ b/ckb-sdk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-sdk" -version = "0.26.0" +version = "0.26.1" authors = ["Linfeng Qian ", "Nervos Core Dev "] edition = "2018" license = "MIT" @@ -27,10 +27,10 @@ chrono = "0.4.6" failure = "0.1.5" lazy_static = "1.4.0" -ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" } -ckb-script = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" } -ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" } -ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" } -ckb-resource = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" } -ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2", features = ["secp"] } +ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" } +ckb-script = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" } +ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" } +ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" } +ckb-resource = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" } +ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1", features = ["secp"] } ckb-sdk-types = { path = "../ckb-sdk-types" } diff --git a/devtools/azure/windows-dependencies.yml b/devtools/azure/windows-dependencies.yml index bb1a71dc..779e28d7 100644 --- a/devtools/azure/windows-dependencies.yml +++ b/devtools/azure/windows-dependencies.yml @@ -1,14 +1,18 @@ parameters: rustup_toolchain: '' steps: +- powershell: Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh') + displayName: Install scoop - script: | - choco install -y llvm - set "PATH=%PATH%;C:\Program Files\LLVM\bin" - echo "##vso[task.setvariable variable=PATH;]%PATH%;C:\Program Files\LLVM\bin" + set PATH=%PATH%;%USERPROFILE%\scoop\shims + echo "##vso[task.setvariable variable=PATH;]%PATH%;%USERPROFILE%\scoop\shims" + scoop help + displayName: Add scoop to path +- script: scoop install llvm displayName: Install LLVM -- script: choco install -y msys2 +- script: scoop install msys2 displayName: Install msys2 -- script: choco install --allow-empty-checksums -y yasm +- script: scoop install yasm displayName: Install yasm - script: | curl -sSf -o rustup-init.exe https://win.rustup.rs