Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@doitian
doitian committed Apr 17, 2020
2 parents 2a7ed95 + a531b3b commit e9f442b
Show file tree
Hide file tree
Showing 14 changed files with 302 additions and 483 deletions.
493 changes: 161 additions & 332 deletions Cargo.lock
View file

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
[package]
name = "ckb-cli"
version = "0.30.0"
version = "0.31.0"
license = "MIT"
authors = ["Linfeng Qian <[email protected]>", "Nervos Core Dev <[email protected]>"]
edition = "2018"

[dependencies]
ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.30.0-rc1" }
ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.30.0-rc1" }
ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.30.0-rc1", features = ["secp"] }
ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.30.0-rc1" }
ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.30.0-rc1" }
ckb-util = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.30.0-rc1" }
ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.31.0-rc1" }
ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.31.0-rc1" }
ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.31.0-rc1", features = ["secp"] }
ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.31.0-rc1" }
ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.31.0-rc1" }
ckb-util = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.31.0-rc1" }
ckb-sdk = { path = "ckb-sdk" }
ckb-index = { path = "ckb-index" }
ckb-resource = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.30.0-rc1" }
ckb-dao-utils = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.30.0-rc1" }
ckb-resource = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.31.0-rc1" }
ckb-dao-utils = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.31.0-rc1" }

jsonrpc-client-core = "0.5.0"
jsonrpc-core = "10.1"
jsonrpc-derive = "10.1"
jsonrpc-http-server = "10.1"
jsonrpc-server-utils = "10.1"
secp256k1 = {version = "0.15.0" }
secp256k1 = {version = "0.17.0" }
faster-hex = "0.4"
env_logger = "0.6"
crossbeam-channel = "0.3"
Expand Down Expand Up @@ -55,7 +55,7 @@ tui = "0.6.0"
termion = "1.5"

[build-dependencies]
ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.30.0-rc1" }
ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.31.0-rc1" }

[workspace]
members = ["ckb-sdk", "ckb-index", "ckb-sdk-types"]
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ci: fmt clippy test security-audit
git diff --exit-code Cargo.lock

integration:
bash devtools/ci/integration.sh v0.30.0-rc1
bash devtools/ci/integration.sh v0.31.0-rc1

prod: ## Build binary with release profile.
cargo build --release
Expand Down
4 changes: 2 additions & 2 deletions ckb-index/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-index"
version = "0.30.0"
version = "0.31.0"
authors = ["Linfeng Qian <[email protected]>", "Nervos Core Dev <[email protected]>"]
edition = "2018"
license = "MIT"
Expand All @@ -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.30.0-rc1" }
ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.31.0-rc1" }
ckb-sdk = { path = "../ckb-sdk" }

[dependencies.rocksdb]
Expand Down
14 changes: 7 additions & 7 deletions ckb-sdk-types/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-sdk-types"
version = "0.30.0"
version = "0.31.0"
authors = ["Linfeng Qian <[email protected]>", "Nervos Core Dev <[email protected]>"]
edition = "2018"
license = "MIT"
Expand All @@ -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.30.0-rc1" }
ckb-script = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.30.0-rc1", default-features = false }
ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.30.0-rc1" }
ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.30.0-rc1" }
ckb-error = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.30.0-rc1" }
ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.31.0-rc1" }
ckb-script = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.31.0-rc1", default-features = false }
ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.31.0-rc1" }
ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.31.0-rc1" }
ckb-error = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.31.0-rc1" }

[dev-dependencies]
ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.30.0-rc1", features = ["secp"] }
ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.31.0-rc1", features = ["secp"] }

[features]
default = ["ckb-script/default"]
Expand Down
20 changes: 9 additions & 11 deletions ckb-sdk/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-sdk"
version = "0.30.0"
version = "0.31.0"
authors = ["Linfeng Qian <[email protected]>", "Nervos Core Dev <[email protected]>"]
edition = "2018"
license = "MIT"
Expand All @@ -11,9 +11,8 @@ serde_derive = "1.0"
serde_json = "1.0"
bech32 = "0.6.0"
log = "0.4.6"
jsonrpc-client-core = "0.5.0"
jsonrpc-client-http = "0.5.0"
secp256k1 = "0.15.0"
reqwest = "0.9"
secp256k1 = "0.17.0"
faster-hex = "0.4"
fnv = "1.0.3"
aes-ctr = "0.3.0"
Expand All @@ -25,12 +24,11 @@ bitcoin_hashes = "0.3.2"
uuid = { version = "0.7.4", features = ["v4"] }
chrono = "0.4.6"
failure = "0.1.5"
lazy_static = "1.4.0"

ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.30.0-rc1" }
ckb-script = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.30.0-rc1" }
ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.30.0-rc1" }
ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.30.0-rc1" }
ckb-resource = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.30.0-rc1" }
ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.30.0-rc1", features = ["secp"] }
ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.31.0-rc1" }
ckb-script = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.31.0-rc1" }
ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.31.0-rc1" }
ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.31.0-rc1" }
ckb-resource = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.31.0-rc1" }
ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.31.0-rc1", features = ["secp"] }
ckb-sdk-types = { path = "../ckb-sdk-types" }
Loading

0 comments on commit e9f442b

Please sign in to comment.