From 57696c0778887daaa58b7a03d7958a6f1c21f7c2 Mon Sep 17 00:00:00 2001 From: driftluo Date: Wed, 23 Sep 2020 13:39:10 +0800 Subject: [PATCH 01/11] chore: in order to use the latest stable api, upgrade the toolchain --- .travis.yml | 6 +++--- azure-pipelines.yml | 6 +++--- docker/hub/Dockerfile | 2 +- network/src/protocols/mod.rs | 2 ++ network/src/protocols/ping.rs | 2 +- network/src/services/outbound_peer.rs | 2 +- rust-toolchain | 2 +- util/app-config/src/sentry_config.rs | 3 +-- 8 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index d703a7bc0e4..5797539a3d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: rust -rust: 1.45.2 +rust: 1.46.0 dist: xenial sudo: true cache: @@ -155,7 +155,7 @@ matrix: if: 'tag IS present AND env(GITHUB_TOKEN) IS present' language: ruby addons: { apt: { packages: [] } } - env: REL_PKG=x86_64-unknown-linux-gnu.tar.gz BUILDER_IMAGE=nervos/ckb-docker-builder:xenial-rust-1.45.2 + env: REL_PKG=x86_64-unknown-linux-gnu.tar.gz BUILDER_IMAGE=nervos/ckb-docker-builder:xenial-rust-1.46.0 script: - mkdir -p $HOME/.cargo - docker run --rm -it -w /ckb -v $(pwd):/ckb -v $HOME/.cargo:/root/.cargo -e OPENSSL_STATIC=1 -e OPENSSL_LIB_DIR=/usr/local/lib -e OPENSSL_INCLUDE_DIR=/usr/local/include/openssl $BUILDER_IMAGE make prod @@ -167,7 +167,7 @@ matrix: if: 'tag IS present AND env(GITHUB_TOKEN) IS present' language: ruby addons: { apt: { packages: [] } } - env: REL_PKG=x86_64-unknown-centos-gnu.tar.gz BUILDER_IMAGE=nervos/ckb-docker-builder:centos-7-rust-1.45.2 + env: REL_PKG=x86_64-unknown-centos-gnu.tar.gz BUILDER_IMAGE=nervos/ckb-docker-builder:centos-7-rust-1.46.0 script: - mkdir -p $HOME/.cargo - docker run --rm -it -w /ckb -v $(pwd):/ckb -v $HOME/.cargo:/root/.cargo $BUILDER_IMAGE scl enable llvm-toolset-7 'make prod' diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2860226f176..0d153e57cc2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -27,7 +27,7 @@ jobs: steps: - template: devtools/azure/windows-dependencies.yml parameters: - rustup_toolchain: '1.45.2-x86_64-pc-windows-msvc' + rustup_toolchain: '1.46.0-x86_64-pc-windows-msvc' - pwsh: devtools/windows/make test displayName: Run unit tests env: @@ -49,7 +49,7 @@ jobs: steps: - template: devtools/azure/windows-dependencies.yml parameters: - rustup_toolchain: '1.45.2-x86_64-pc-windows-msvc' + rustup_toolchain: '1.46.0-x86_64-pc-windows-msvc' - pwsh: devtools/windows/make CKB_TEST_SEC_COEFFICIENT=5 CKB_TEST_ARGS="--max-time 1200 -c 4" integration displayName: Run integration tests env: @@ -63,7 +63,7 @@ jobs: steps: - template: devtools/azure/windows-dependencies.yml parameters: - rustup_toolchain: '1.45.2-x86_64-pc-windows-msvc' + rustup_toolchain: '1.46.0-x86_64-pc-windows-msvc' - pwsh: devtools/windows/make prod displayName: Build - script: | diff --git a/docker/hub/Dockerfile b/docker/hub/Dockerfile index 52e7c62fb85..f66df69358c 100644 --- a/docker/hub/Dockerfile +++ b/docker/hub/Dockerfile @@ -1,4 +1,4 @@ -FROM nervos/ckb-docker-builder:bionic-rust-1.45.2 as ckb-docker-builder +FROM nervos/ckb-docker-builder:bionic-rust-1.46.0 as ckb-docker-builder WORKDIR /ckb COPY ./ . diff --git a/network/src/protocols/mod.rs b/network/src/protocols/mod.rs index 227c11b9a27..a4e9c3c8113 100644 --- a/network/src/protocols/mod.rs +++ b/network/src/protocols/mod.rs @@ -148,6 +148,8 @@ impl CKBProtocol { protocol_name: format!("/ckb/{}", protocol_name), supported_versions: { let mut versions: Vec<_> = versions.to_vec(); + // TODO: https://github.com/rust-lang/rust-clippy/issues/6001 + #[allow(clippy::unnecessary_sort_by)] versions.sort_by(|a, b| b.cmp(a)); versions.to_vec() }, diff --git a/network/src/protocols/ping.rs b/network/src/protocols/ping.rs index f1fc212585b..f0884f2dfb3 100644 --- a/network/src/protocols/ping.rs +++ b/network/src/protocols/ping.rs @@ -127,7 +127,7 @@ impl PingStatus { /// Time duration since we last send ping. fn elapsed(&self) -> Duration { - self.last_ping.elapsed().unwrap_or(Duration::from_secs(0)) + self.last_ping.elapsed().unwrap_or_default() } } diff --git a/network/src/services/outbound_peer.rs b/network/src/services/outbound_peer.rs index 0b4033ac8b6..004d25b5829 100644 --- a/network/src/services/outbound_peer.rs +++ b/network/src/services/outbound_peer.rs @@ -112,7 +112,7 @@ impl Future for OutboundPeerService { let last_connect = self .last_connect .map(|time| time.elapsed()) - .unwrap_or(Duration::from_secs(std::u64::MAX)); + .unwrap_or_else(|| Duration::from_secs(std::u64::MAX)); if last_connect > self.try_connect_interval { let status = self.network_state.connection_status(); let new_outbound = status diff --git a/rust-toolchain b/rust-toolchain index 0fb53d6a6a2..0a3db35b241 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.45.2 +1.46.0 diff --git a/util/app-config/src/sentry_config.rs b/util/app-config/src/sentry_config.rs index e24ad5f2dfa..bd3a1a0519e 100644 --- a/util/app-config/src/sentry_config.rs +++ b/util/app-config/src/sentry_config.rs @@ -68,8 +68,7 @@ fn before_send(mut event: Event<'static>) -> Option> { let ex = match event .exception .values - .iter() - .next() + .get(0) .and_then(|ex| ex.value.as_ref()) { Some(ex) => ex, From 37a6cab9a29c13916219fb494b5550a3d66c1382 Mon Sep 17 00:00:00 2001 From: Boyu Yang Date: Sat, 10 Oct 2020 10:29:38 +0800 Subject: [PATCH 02/11] ci: use cargo-deny to replace cargo-audit --- .travis.yml | 6 ++++-- Makefile | 24 +++++++++++------------- deny.toml | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 15 deletions(-) create mode 100644 deny.toml diff --git a/.travis.yml b/.travis.yml index adbeeb7abd1..29151f7c449 100644 --- a/.travis.yml +++ b/.travis.yml @@ -114,13 +114,15 @@ matrix: rust: stable script: - devtools/ci/check-cyclic-dependencies.py --dev - - name: Security Audit + - name: Security Audit & Licenses if: 'tag IS NOT present AND (type = pull_request OR branch in (master, staging, staging2, trying) OR repo != nervosnetwork/ckb)' os: linux install: - - cargo audit --version || travis_retry cargo install cargo-audit --locked + - cargo deny --version || travis_retry cargo install cargo-deny --locked script: - make security-audit + - make check-crates + - make check-licenses - name: WASM build if: 'tag IS NOT present AND (type = pull_request OR branch in (master, staging, staging2, trying) OR repo != nervosnetwork/ckb)' diff --git a/Makefile b/Makefile index 357e71020e2..0de78104dc1 100644 --- a/Makefile +++ b/Makefile @@ -123,18 +123,16 @@ clippy: setup-ckb-test ## Run linter to examine Rust source codes. cd test && cargo clippy ${VERBOSE} --all --all-targets --all-features -- ${CLIPPY_OPTS} .PHONY: security-audit -security-audit: ## Use cargo-audit to audit Cargo.lock for crates with security vulnerabilities. - # https://rustsec.org/advisories/RUSTSEC-2019-0031: spin is no longer actively maintained, it's not a problem - # https://rustsec.org/advisories/RUSTSEC-2020-0016: net2 has been deprecated, but still a lot of required crates are dependent on it - # https://rustsec.org/advisories/RUSTSEC-2020-0036: failure is officially deprecated/unmaintained, but still a lot of required crates are dependent on it - # https://rustsec.org/advisories/RUSTSEC-2020-0043: ws allows remote attacker to run the process out of memory, since it is no longer actively maintained, we couldn't fix it in the short term - cargo audit \ - --ignore RUSTSEC-2019-0031 \ - --ignore RUSTSEC-2020-0016 \ - --ignore RUSTSEC-2020-0036 \ - --ignore RUSTSEC-2020-0043 \ - --deny-warnings - # expecting to see "Success No vulnerable packages found" +security-audit: ## Use cargo-deny to audit Cargo.lock for crates with security vulnerabilities. + cargo deny check --hide-inclusion-graph --show-stats advisories sources + +.PHONY: check-crates +check-crates: ## Use cargo-deny to check specific crates, detect and handle multiple versions of the same crate and wildcards version requirement. + cargo deny check --hide-inclusion-graph --show-stats bans + +.PHONY: check-licenses +check-licenses: ## Use cargo-deny to check licenses for all dependencies. + cargo deny check --hide-inclusion-graph --show-stats licenses .PHONY: bench-test bench-test: @@ -144,7 +142,7 @@ bench-test: .PHONY: ci ci: ## Run recipes for CI. -ci: fmt clippy test bench-test check-cargotoml check-whitespaces check-dirty-rpc-doc security-audit +ci: fmt clippy test bench-test check-cargotoml check-whitespaces check-dirty-rpc-doc security-audit check-crates check-licenses git diff --exit-code Cargo.lock .PHONY: check-cargotoml diff --git a/deny.toml b/deny.toml new file mode 100644 index 00000000000..165be2be1b6 --- /dev/null +++ b/deny.toml @@ -0,0 +1,49 @@ +[advisories] +vulnerability = "deny" +unmaintained = "deny" +yanked = "deny" +notice = "deny" +ignore = [ + "RUSTSEC-2020-0016", # TODO net2 has been deprecated, but still a lot of required crates are dependent on it + "RUSTSEC-2020-0036", # TODO failure is officially deprecated/unmaintained, but still a lot of required crates are dependent on it + "RUSTSEC-2020-0043", # TODO ws allows remote attacker to run the process out of memory, since it is no longer actively maintained, we couldn't fix it in the short term +] + +[licenses] +unlicensed = "deny" +allow = [ + "Apache-2.0", + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "ISC", + "MIT", +] +copyleft = "deny" +default = "deny" +exceptions = [ + { allow = ["BSD-3-Clause", "Zlib"], name = "adler32", version = "*" }, + { allow = ["MPL-2.0"], name = "attohttpc", version = "*" }, + { allow = ["MIT", "ISC", "OpenSSL"], name = "ring", version = "*" }, +] + +[[licenses.clarify]] +name = "ring" +version = "*" +expression = "MIT AND ISC AND OpenSSL" +license-files = [ + { path = "LICENSE", hash = 0xbd0eed23 } +] + +[bans] +multiple-versions = "warn" +wildcards = "deny" + +[sources] +unknown-registry = "deny" +unknown-git = "deny" +allow-git = [ + # TODO fix RUSTSEC-2020-0041 temporarily + "https://github.com/nervosnetwork/metrics-rs", + "https://github.com/nervosnetwork/sentry-rust", +] From f4744b709d8078e6ee61b1842ff085c3b555782a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 13 Oct 2020 21:23:45 +0000 Subject: [PATCH 03/11] chore(deps): bump ctrlc from 3.1.6 to 3.1.7 Bumps [ctrlc](https://github.com/Detegr/rust-ctrlc) from 3.1.6 to 3.1.7. - [Release notes](https://github.com/Detegr/rust-ctrlc/releases) - [Commits](https://github.com/Detegr/rust-ctrlc/compare/3.1.6...v3.1.7) Signed-off-by: dependabot-preview[bot] --- Cargo.lock | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 742bad9fdac..ad2f33cfd50 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1573,11 +1573,11 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.1.6" +version = "3.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b676fa23f995faf587496dcd1c80fead847ed58d2da52ac1caca9a72790dd2" +checksum = "b57a92e9749e10f25a171adcebfafe72991d45e7ec2dcb853e8f83d9dafaeb08" dependencies = [ - "nix", + "nix 0.18.0", "winapi 0.3.8", ] @@ -2098,7 +2098,7 @@ dependencies = [ "lazy_static", "libc", "mach", - "nix", + "nix 0.17.0", "pin-utils", "uom", "winapi 0.3.8", @@ -2180,7 +2180,7 @@ dependencies = [ "hex", "libc", "macaddr", - "nix", + "nix 0.17.0", ] [[package]] @@ -3049,6 +3049,18 @@ dependencies = [ "void", ] +[[package]] +name = "nix" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055" +dependencies = [ + "bitflags", + "cc", + "cfg-if", + "libc", +] + [[package]] name = "nodrop" version = "0.1.13" From 792daf5ec86ba933692dd7ed70baf261f073b855 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 13 Oct 2020 21:26:24 +0000 Subject: [PATCH 04/11] chore(deps): bump regex from 1.3.9 to 1.4.1 Bumps [regex](https://github.com/rust-lang/regex) from 1.3.9 to 1.4.1. - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/regex/compare/1.3.9...1.4.1) Signed-off-by: dependabot-preview[bot] --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 742bad9fdac..acce40a5b94 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3874,9 +3874,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.3.9" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" +checksum = "8963b85b8ce3074fecffde43b4b0dded83ce2f367dc8d363afc56679f3ee820b" dependencies = [ "aho-corasick 0.7.9", "memchr", @@ -3895,9 +3895,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" +checksum = "8cab7a364d15cde1e505267766a2d3c4e22a843e1a601f0fa7564c0f82ced11c" [[package]] name = "remove_dir_all" From 2339ab2f69c0ff5e12d313b7fff0741c9770d465 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 13 Oct 2020 21:26:55 +0000 Subject: [PATCH 05/11] chore(deps): bump toml from 0.5.6 to 0.5.7 Bumps [toml](https://github.com/alexcrichton/toml-rs) from 0.5.6 to 0.5.7. - [Release notes](https://github.com/alexcrichton/toml-rs/releases) - [Commits](https://github.com/alexcrichton/toml-rs/compare/0.5.6...0.5.7) Signed-off-by: dependabot-preview[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 742bad9fdac..598e8ea33d0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4824,9 +4824,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" +checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645" dependencies = [ "serde", ] From 6c7d7549daa8f9ac05de5ce582bb9b019b5ec508 Mon Sep 17 00:00:00 2001 From: ian Date: Wed, 14 Oct 2020 11:18:42 +0800 Subject: [PATCH 06/11] doc: fix missing type U256 in RPC doc. U256 is not documented so the python script fails to parse it as a type. This PR added special logic to handle U256 in the RPC doc. --- devtools/doc/rpc.py | 37 +++++++++++++++++++--------- rpc/README.md | 31 ++++++++++++++--------- util/jsonrpc-types/src/chain_info.rs | 2 +- 3 files changed, 46 insertions(+), 24 deletions(-) diff --git a/devtools/doc/rpc.py b/devtools/doc/rpc.py index 90b1aa4f5df..e75104f147b 100755 --- a/devtools/doc/rpc.py +++ b/devtools/doc/rpc.py @@ -278,6 +278,10 @@ def handle_endtag(self, tag): def handle_data(self, data): if self.ty is None: self.name = self.sanitize_name(data) + if self.name.endswith(': U256'): + parts = self.name.split(': ') + self.name = parts[0] + self.ty = '[`U256`](#type-u256)' def completed(self): return self.ty is not None and (len(self.children) == 0 or self.children[-1].completed()) @@ -595,13 +599,33 @@ def write(self, file): file.write('\n') +class DummyRPCType(): + def __init__(self, name, module_doc): + super().__init__() + self.name = name + self.module_doc = module_doc + + def write(self, file): + file.write('\n') + file.write(self.module_doc) + file.write('\n') + + class RPCDoc(object): def __init__(self): self.modules = [] - self.types = [] self.errors = RPCErrorParser() self.parsed_types = set() + self.types = [ + DummyRPCType( + "SerializedHeader", "This is a 0x-prefix hex string. It is the block header serialized by molecule using the schema `table Header`."), + DummyRPCType( + "SerializedBlock", "This is a 0x-prefix hex string. It is the block serialized by molecule using the schema `table Block`."), + DummyRPCType( + "U256", "The 256-bit unsigned integer type encoded as the 0x-prefixed hex string in JSON.") + ] + def collect(self): for path in sorted(glob.glob("target/doc/ckb_rpc/module/trait.*Rpc.html")): module_name = path.split('.')[1][:-3] @@ -663,10 +687,6 @@ def write(self, file): for t in self.types: file.write( " * [Type `{}`](#type-{})\n".format(t.name, t.name.lower())) - file.write( - " * [Type `SerializedHeader`](#type-serializedheader)\n") - file.write( - " * [Type `SerializedBlock`](#type-serializedblock)\n") file.write("\n## RPC Methods\n\n") @@ -682,13 +702,6 @@ def write(self, file): file.write("\n### Type `{}`\n".format(ty.name)) ty.write(file) - file.write("\n### Type `SerializedHeader`\n\n") - file.write( - "This is a 0x-prefix hex string. It is the block header serialized by molecule using the schema `table Header`.\n") - file.write("\n### Type `SerializedBlock`\n\n") - file.write( - "This is a 0x-prefix hex string. It is the block serialized by molecule using the schema `table Block`.\n") - def main(): if not os.path.exists("target/doc/ckb_rpc/module/index.html"): diff --git a/rpc/README.md b/rpc/README.md index 4c51ff64b3d..f0e96aa93c0 100644 --- a/rpc/README.md +++ b/rpc/README.md @@ -136,6 +136,8 @@ For example, a method is marked as deprecated in 0.35.0, it can be disabled in 0 * [Type `RemoteNodeProtocol`](#type-remotenodeprotocol) * [Type `Script`](#type-script) * [Type `ScriptHashType`](#type-scripthashtype) + * [Type `SerializedBlock`](#type-serializedblock) + * [Type `SerializedHeader`](#type-serializedheader) * [Type `Status`](#type-status) * [Type `SyncState`](#type-syncstate) * [Type `Timestamp`](#type-timestamp) @@ -147,6 +149,7 @@ For example, a method is marked as deprecated in 0.35.0, it can be disabled in 0 * [Type `TransactionWithStatus`](#type-transactionwithstatus) * [Type `TxPoolInfo`](#type-txpoolinfo) * [Type `TxStatus`](#type-txstatus) + * [Type `U256`](#type-u256) * [Type `Uint128`](#type-uint128) * [Type `Uint32`](#type-uint32) * [Type `Uint64`](#type-uint64) @@ -154,8 +157,6 @@ For example, a method is marked as deprecated in 0.35.0, it can be disabled in 0 * [Type `UncleBlockView`](#type-uncleblockview) * [Type `UncleTemplate`](#type-uncletemplate) * [Type `Version`](#type-version) - * [Type `SerializedHeader`](#type-serializedheader) - * [Type `SerializedBlock`](#type-serializedblock) ## RPC Methods @@ -4033,7 +4034,11 @@ Chain information. * `epoch`: [`EpochNumber`](#type-epochnumber) - Current epoch number. -* `difficulty`: `boolean` - Whether the local node is in IBD, Initial Block Download. +* `difficulty`: [`U256`](#type-u256) - Current difficulty. + + Decoded from the epoch `compact_target`. + +* `is_initial_block_download`: `boolean` - Whether the local node is in IBD, Initial Block Download. When a node starts and its chain tip timestamp is far behind the wall clock, it will enter the IBD until it catches up the synchronization. @@ -4706,6 +4711,14 @@ Refer to the section [Code Locating](https://github.com/nervosnetwork/rfcs/blob/ * Type "type" matches script code via cell type script hash. +### Type `SerializedBlock` + +This is a 0x-prefix hex string. It is the block serialized by molecule using the schema `table Block`. + +### Type `SerializedHeader` + +This is a 0x-prefix hex string. It is the block header serialized by molecule using the schema `table Header`. + ### Type `Status` Status for transaction @@ -4989,6 +5002,10 @@ Transaction status and the block hash if it is committed. * `block_hash`: [`H256`](#type-h256) `|` `null` - The block hash of the block which has committed this transaction in the canonical chain. +### Type `U256` + +The 256-bit unsigned integer type encoded as the 0x-prefixed hex string in JSON. + ### Type `Uint128` The 128-bit unsigned integer type encoded as the 0x-prefixed hex string in JSON. @@ -5104,11 +5121,3 @@ The uncle block template of the new block for miners. The simple increasing integer version. This is a 32-bit unsigned integer type encoded as the 0x-prefixed hex string in JSON. See examples of [Uint32](#type-uint32). - -### Type `SerializedHeader` - -This is a 0x-prefix hex string. It is the block header serialized by molecule using the schema `table Header`. - -### Type `SerializedBlock` - -This is a 0x-prefix hex string. It is the block serialized by molecule using the schema `table Block`. diff --git a/util/jsonrpc-types/src/chain_info.rs b/util/jsonrpc-types/src/chain_info.rs index a5997c6832f..2225e715bde 100644 --- a/util/jsonrpc-types/src/chain_info.rs +++ b/util/jsonrpc-types/src/chain_info.rs @@ -18,7 +18,7 @@ pub struct ChainInfo { pub epoch: EpochNumber, /// Current difficulty. /// - /// The 256-bit unsigned integer type encoded as the 0x-prefixed hex string in JSON. + /// Decoded from the epoch `compact_target`. pub difficulty: U256, /// Whether the local node is in IBD, Initial Block Download. /// From 0a3ae019e17e19b5f76ae3b9d99cd2ded6775b71 Mon Sep 17 00:00:00 2001 From: ian Date: Wed, 14 Oct 2020 11:22:05 +0800 Subject: [PATCH 07/11] doc: fix Array schema markdown syntax in RPC doc --- devtools/doc/rpc.py | 2 +- rpc/README.md | 74 ++++++++++++++++++++++----------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/devtools/doc/rpc.py b/devtools/doc/rpc.py index e75104f147b..c8967512fdb 100755 --- a/devtools/doc/rpc.py +++ b/devtools/doc/rpc.py @@ -263,7 +263,7 @@ def handle_starttag(self, tag, attrs): if self.ty == 'https://doc.rust-lang.org/nightly/core/option/enum.Option.html': self.ty = '{} `|` `null`'.format(self.children[0].ty) elif self.ty == 'https://doc.rust-lang.org/nightly/alloc/vec/struct.Vec.html': - self.ty = '`Array<`{}`>`'.format(self.children[0].ty) + self.ty = '`Array<` {} `>`'.format(self.children[0].ty) elif self.ty == '../../ckb_jsonrpc_types/enum.ResponseFormat.html': molecule_name = self.children[1].ty.split( '`](')[0][2:] diff --git a/rpc/README.md b/rpc/README.md index f0e96aa93c0..de20d458425 100644 --- a/rpc/README.md +++ b/rpc/README.md @@ -820,7 +820,7 @@ The response looks like below when `verbosity` is 0. * `lock_hash`: [`H256`](#type-h256) * `from`: [`BlockNumber`](#type-blocknumber) * `to`: [`BlockNumber`](#type-blocknumber) -* result: `Array<`[`CellOutputWithOutPoint`](#type-celloutputwithoutpoint)`>` +* result: `Array<` [`CellOutputWithOutPoint`](#type-celloutputwithoutpoint) `>` 👎 Deprecated since 0.36.0: (Disabled since 0.36.0) This method is deprecated for reasons of flexibility. Please use [ckb-indexer](https://github.com/nervosnetwork/ckb-indexer) as an alternate solution @@ -1133,7 +1133,7 @@ Response #### Method `get_transaction_proof` * `get_transaction_proof(tx_hashes, block_hash)` - * `tx_hashes`: `Array<`[`H256`](#type-h256)`>` + * `tx_hashes`: `Array<` [`H256`](#type-h256) `>` * `block_hash`: [`H256`](#type-h256) `|` `null` * result: [`TransactionProof`](#type-transactionproof) @@ -1180,7 +1180,7 @@ Response #### Method `verify_transaction_proof` * `verify_transaction_proof(tx_proof)` * `tx_proof`: [`TransactionProof`](#type-transactionproof) -* result: `Array<`[`H256`](#type-h256)`>` +* result: `Array<` [`H256`](#type-h256) `>` Verifies that a proof points to transactions in a block, returning the transaction hashes it commits to. @@ -1507,7 +1507,7 @@ The index is disabled by default, which **must** be enabled by calling [`index_l * `page`: [`Uint64`](#type-uint64) * `per_page`: [`Uint64`](#type-uint64) * `reverse_order`: `boolean` `|` `null` -* result: `Array<`[`LiveCell`](#type-livecell)`>` +* result: `Array<` [`LiveCell`](#type-livecell) `>` 👎 Deprecated since 0.36.0: Please use [ckb-indexer](https://github.com/nervosnetwork/ckb-indexer) as an alternate solution. @@ -1814,7 +1814,7 @@ Response * `page`: [`Uint64`](#type-uint64) * `per_page`: [`Uint64`](#type-uint64) * `reverse_order`: `boolean` `|` `null` -* result: `Array<`[`CellTransaction`](#type-celltransaction)`>` +* result: `Array<` [`CellTransaction`](#type-celltransaction) `>` 👎 Deprecated since 0.36.0: Please use [ckb-indexer](https://github.com/nervosnetwork/ckb-indexer) as an alternate solution. @@ -2071,7 +2071,7 @@ Response #### Method `get_lock_hash_index_states` * `get_lock_hash_index_states()` -* result: `Array<`[`LockHashIndexState`](#type-lockhashindexstate)`>` +* result: `Array<` [`LockHashIndexState`](#type-lockhashindexstate) `>` 👎 Deprecated since 0.36.0: Please use [ckb-indexer](https://github.com/nervosnetwork/ckb-indexer) as an alternate solution. @@ -2415,7 +2415,7 @@ Response #### Method `get_peers` * `get_peers()` -* result: `Array<`[`RemoteNode`](#type-remotenode)`>` +* result: `Array<` [`RemoteNode`](#type-remotenode) `>` Returns the connected peers' information. @@ -2561,7 +2561,7 @@ Response #### Method `get_banned_addresses` * `get_banned_addresses()` -* result: `Array<`[`BannedAddr`](#type-bannedaddr)`>` +* result: `Array<` [`BannedAddr`](#type-bannedaddr) `>` Returns all banned IPs/Subnets. @@ -3112,7 +3112,7 @@ Response #### Method `get_peers_state` * `get_peers_state()` -* result: `Array<`[`PeerState`](#type-peerstate)`>` +* result: `Array<` [`PeerState`](#type-peerstate) `>` 👎 Deprecated since 0.12.0: Please use RPC [`get_peers`](#method-get_peers) instead @@ -3485,7 +3485,7 @@ An example in JSON * `message`: `string` - Alert message. -* `signatures`: `Array<`[`JsonBytes`](#type-jsonbytes)`>` - The list of required signatures. +* `signatures`: `Array<` [`JsonBytes`](#type-jsonbytes) `>` - The list of required signatures. ### Type `AlertId` @@ -3546,11 +3546,11 @@ The JSON view of a Block used as a parameter in the RPC. * `header`: [`Header`](#type-header) - The block header. -* `uncles`: `Array<`[`UncleBlock`](#type-uncleblock)`>` - The uncles blocks in the block body. +* `uncles`: `Array<` [`UncleBlock`](#type-uncleblock) `>` - The uncles blocks in the block body. -* `transactions`: `Array<`[`Transaction`](#type-transaction)`>` - The transactions in the block body. +* `transactions`: `Array<` [`Transaction`](#type-transaction) `>` - The transactions in the block body. -* `proposals`: `Array<`[`ProposalShortId`](#type-proposalshortid)`>` - The proposal IDs in the block body. +* `proposals`: `Array<` [`ProposalShortId`](#type-proposalshortid) `>` - The proposal IDs in the block body. ### Type `BlockEconomicState` @@ -3651,15 +3651,15 @@ Miners optional pick transactions and then assemble the final block. Miners must keep the uncles count below this limit, otherwise, the CKB node will reject the block submission. -* `uncles`: `Array<`[`UncleTemplate`](#type-uncletemplate)`>` - Provided valid uncle blocks candidates for the new block. +* `uncles`: `Array<` [`UncleTemplate`](#type-uncletemplate) `>` - Provided valid uncle blocks candidates for the new block. Miners must include the uncles marked as `required` in the assembled new block. -* `transactions`: `Array<`[`TransactionTemplate`](#type-transactiontemplate)`>` - Provided valid transactions which can be committed in the new block. +* `transactions`: `Array<` [`TransactionTemplate`](#type-transactiontemplate) `>` - Provided valid transactions which can be committed in the new block. Miners must include the transactions marked as `required` in the assembled new block. -* `proposals`: `Array<`[`ProposalShortId`](#type-proposalshortid)`>` - Provided proposal ids list of transactions for the new block. +* `proposals`: `Array<` [`ProposalShortId`](#type-proposalshortid) `>` - Provided proposal ids list of transactions for the new block. * `cellbase`: [`CellbaseTemplate`](#type-cellbasetemplate) - Provided cellbase transaction template. @@ -3688,11 +3688,11 @@ The JSON view of a Block including header and body. * `header`: [`HeaderView`](#type-headerview) - The block header. -* `uncles`: `Array<`[`UncleBlockView`](#type-uncleblockview)`>` - The uncles blocks in the block body. +* `uncles`: `Array<` [`UncleBlockView`](#type-uncleblockview) `>` - The uncles blocks in the block body. -* `transactions`: `Array<`[`TransactionView`](#type-transactionview)`>` - The transactions in the block body. +* `transactions`: `Array<` [`TransactionView`](#type-transactionview) `>` - The transactions in the block body. -* `proposals`: `Array<`[`ProposalShortId`](#type-proposalshortid)`>` - The proposal IDs in the block body. +* `proposals`: `Array<` [`ProposalShortId`](#type-proposalshortid) `>` - The proposal IDs in the block body. ### Type `Byte32` @@ -4044,7 +4044,7 @@ Chain information. During IBD, the local node only synchronizes the chain with one selected remote node and stops responding the most P2P requests. -* `alerts`: `Array<`[`AlertMessage`](#type-alertmessage)`>` - Active alerts stored in the local node. +* `alerts`: `Array<` [`AlertMessage`](#type-alertmessage) `>` - Active alerts stored in the local node. ### Type `Cycle` @@ -4346,11 +4346,11 @@ The information of the node itself. An inactive node ignores incoming p2p messages and drops outgoing messages. -* `addresses`: `Array<`[`NodeAddress`](#type-nodeaddress)`>` - P2P addresses of this node. +* `addresses`: `Array<` [`NodeAddress`](#type-nodeaddress) `>` - P2P addresses of this node. A node can have multiple addresses. -* `protocols`: `Array<`[`LocalNodeProtocol`](#type-localnodeprotocol)`>` - Supported protocols. +* `protocols`: `Array<` [`LocalNodeProtocol`](#type-localnodeprotocol) `>` - Supported protocols. * `connections`: [`Uint64`](#type-uint64) - Count of currently connected peers. @@ -4367,7 +4367,7 @@ The information of a P2P protocol that is supported by the local node. * `name`: `string` - Readable protocol name. -* `support_versions`: `Array<``string``>` - Supported versions. +* `support_versions`: `Array<` `string` `>` - Supported versions. See [Semantic Version](https://semver.org/) about how to specify a version. @@ -4414,11 +4414,11 @@ CKB Merkle Tree is a [CBMT](https://github.com/nervosnetwork/rfcs/blob/master/rf `MerkleProof` is a JSON object with the following fields. -* `indices`: `Array<`[`Uint32`](#type-uint32)`>` - Leaves indices in the CBMT that are proved present in the block. +* `indices`: `Array<` [`Uint32`](#type-uint32) `>` - Leaves indices in the CBMT that are proved present in the block. These are indices in the CBMT tree not the transaction indices in the block. -* `lemmas`: `Array<`[`H256`](#type-h256)`>` - Hashes of all siblings along the paths to root. +* `lemmas`: `Array<` [`H256`](#type-h256) `>` - Hashes of all siblings along the paths to root. ### Type `MinerReward` @@ -4636,7 +4636,7 @@ A remote node connects to the local node via the P2P network. It is often called * `node_id`: `string` - The remote node ID which is derived from its P2P private key. -* `addresses`: `Array<`[`NodeAddress`](#type-nodeaddress)`>` - The remote node addresses. +* `addresses`: `Array<` [`NodeAddress`](#type-nodeaddress) `>` - The remote node addresses. * `is_outbound`: `boolean` - Whether this is an outbound remote node. @@ -4652,7 +4652,7 @@ A remote node connects to the local node via the P2P network. It is often called Null means chain sync has not started with this remote node yet. -* `protocols`: `Array<`[`RemoteNodeProtocol`](#type-remotenodeprotocol)`>` - Active protocols. +* `protocols`: `Array<` [`RemoteNodeProtocol`](#type-remotenodeprotocol) `>` - Active protocols. CKB uses Tentacle multiplexed network framework. Multiple protocols are running simultaneously in the connection. @@ -4787,29 +4787,29 @@ Refer to RFC [CKB Transaction Structure](https://github.com/nervosnetwork/rfcs/b * `version`: [`Version`](#type-version) - Reserved for future usage. It must equal 0 in current version. -* `cell_deps`: `Array<`[`CellDep`](#type-celldep)`>` - An array of cell deps. +* `cell_deps`: `Array<` [`CellDep`](#type-celldep) `>` - An array of cell deps. CKB locates lock script and type script code via cell deps. The script also can uses syscalls to read the cells here. Unlike inputs, the live cells can be used as cell deps in multiple transactions. -* `header_deps`: `Array<`[`H256`](#type-h256)`>` - An array of header deps. +* `header_deps`: `Array<` [`H256`](#type-h256) `>` - An array of header deps. The block must already be in the canonical chain. Lock script and type script can read the header information of blocks listed here. -* `inputs`: `Array<`[`CellInput`](#type-cellinput)`>` - An array of input cells. +* `inputs`: `Array<` [`CellInput`](#type-cellinput) `>` - An array of input cells. In the canonical chain, any cell can only appear as an input once. -* `outputs`: `Array<`[`CellOutput`](#type-celloutput)`>` - An array of output cells. +* `outputs`: `Array<` [`CellOutput`](#type-celloutput) `>` - An array of output cells. -* `outputs_data`: `Array<`[`JsonBytes`](#type-jsonbytes)`>` - Output cells data. +* `outputs_data`: `Array<` [`JsonBytes`](#type-jsonbytes) `>` - Output cells data. This is a parallel array of outputs. The cell capacity, lock, and type of the output i is`outputs[i]` and its data is `outputs_data[i]`. -* `witnesses`: `Array<`[`JsonBytes`](#type-jsonbytes)`>` - An array of variable-length binaries. +* `witnesses`: `Array<` [`JsonBytes`](#type-jsonbytes) `>` - An array of variable-length binaries. Lock script and type script can read data here to verify the transaction. @@ -4862,7 +4862,7 @@ Transaction template which is ready to be committed in the new block. Miners can utilize this field to ensure that the total cycles do not exceed the limit while selecting transactions. -* `depends`: `Array<`[`Uint64`](#type-uint64)`>` `|` `null` - Transaction dependencies. +* `depends`: `Array<` [`Uint64`](#type-uint64) `>` `|` `null` - Transaction dependencies. This is a hint to help miners selecting transactions. @@ -5067,7 +5067,7 @@ A block B1 is considered to be the uncle of another block B2 if all the followin * `header`: [`Header`](#type-header) - The uncle block header. -* `proposals`: `Array<`[`ProposalShortId`](#type-proposalshortid)`>` - Proposal IDs in the uncle block body. +* `proposals`: `Array<` [`ProposalShortId`](#type-proposalshortid) `>` - Proposal IDs in the uncle block body. ### Type `UncleBlockView` @@ -5092,7 +5092,7 @@ A block B1 is considered to be the uncle of another block B2 if all the followin * `header`: [`HeaderView`](#type-headerview) - The uncle block header. -* `proposals`: `Array<`[`ProposalShortId`](#type-proposalshortid)`>` - Proposal IDs in the uncle block body. +* `proposals`: `Array<` [`ProposalShortId`](#type-proposalshortid) `>` - Proposal IDs in the uncle block body. ### Type `UncleTemplate` @@ -5107,7 +5107,7 @@ The uncle block template of the new block for miners. * `required`: `boolean` - Whether miners must include this uncle in the submit block. -* `proposals`: `Array<`[`ProposalShortId`](#type-proposalshortid)`>` - The proposals of the uncle block. +* `proposals`: `Array<` [`ProposalShortId`](#type-proposalshortid) `>` - The proposals of the uncle block. Miners must keep this unchanged when including this uncle in the new block. From 6b508110f262363307e67d3c99baaa89b67dab39 Mon Sep 17 00:00:00 2001 From: zhangsoledad <787953403@qq.com> Date: Fri, 16 Oct 2020 03:16:53 +0800 Subject: [PATCH 08/11] feat: configurable block proposals limit --- spec/src/consensus.rs | 9 ++++++++- spec/src/lib.rs | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/spec/src/consensus.rs b/spec/src/consensus.rs index 351761929b6..47278825fdb 100644 --- a/spec/src/consensus.rs +++ b/spec/src/consensus.rs @@ -68,7 +68,7 @@ pub(crate) const DEFAULT_PRIMARY_EPOCH_REWARD_HALVING_INTERVAL: EpochNumber = pub const MAX_BLOCK_BYTES: u64 = TWO_IN_TWO_OUT_BYTES * TWO_IN_TWO_OUT_COUNT; pub(crate) const MAX_BLOCK_CYCLES: u64 = TWO_IN_TWO_OUT_CYCLES * TWO_IN_TWO_OUT_COUNT; // 1.5 * TWO_IN_TWO_OUT_COUNT -const MAX_BLOCK_PROPOSALS_LIMIT: u64 = 1_500; +pub const MAX_BLOCK_PROPOSALS_LIMIT: u64 = 1_500; const PROPOSER_REWARD_RATIO: Ratio = Ratio(4, 10); // Satoshi's pubkey hash in Bitcoin genesis. @@ -396,10 +396,17 @@ impl ConsensusBuilder { self } + #[must_use] pub fn permanent_difficulty_in_dummy(mut self, permanent: bool) -> Self { self.inner.permanent_difficulty_in_dummy = permanent; self } + + #[must_use] + pub fn max_block_proposals_limit(mut self, max_block_proposals_limit: u64) -> Self { + self.inner.max_block_proposals_limit = max_block_proposals_limit; + self + } } #[derive(Clone, Debug)] diff --git a/spec/src/lib.rs b/spec/src/lib.rs index 17848ac4d40..6b146fb9393 100644 --- a/spec/src/lib.rs +++ b/spec/src/lib.rs @@ -66,6 +66,7 @@ pub mod default_params { CELLBASE_MATURITY, DEFAULT_EPOCH_DURATION_TARGET, DEFAULT_PRIMARY_EPOCH_REWARD_HALVING_INTERVAL, DEFAULT_SECONDARY_EPOCH_REWARD, GENESIS_EPOCH_LENGTH, INITIAL_PRIMARY_EPOCH_REWARD, MAX_BLOCK_BYTES, MAX_BLOCK_CYCLES, + MAX_BLOCK_PROPOSALS_LIMIT, }; use ckb_types::core::{Capacity, Cycle, EpochNumber}; @@ -100,6 +101,10 @@ pub mod default_params { pub fn genesis_epoch_length() -> u64 { GENESIS_EPOCH_LENGTH } + + pub fn max_block_proposals_limit() -> u64 { + MAX_BLOCK_PROPOSALS_LIMIT + } } #[derive(Clone, PartialEq, Eq, Debug, Serialize, Deserialize)] @@ -122,6 +127,8 @@ pub struct Params { pub genesis_epoch_length: BlockNumber, #[serde(default)] pub permanent_difficulty_in_dummy: bool, + #[serde(default = "default_params::max_block_proposals_limit")] + pub max_block_proposals_limit: u64, } impl Default for Params { @@ -137,6 +144,7 @@ impl Default for Params { epoch_duration_target: default_params::epoch_duration_target(), genesis_epoch_length: default_params::genesis_epoch_length(), permanent_difficulty_in_dummy: false, + max_block_proposals_limit: default_params::max_block_proposals_limit(), } } } @@ -291,6 +299,7 @@ impl ChainSpec { .initial_primary_epoch_reward(self.params.initial_primary_epoch_reward) .epoch_duration_target(self.params.epoch_duration_target) .permanent_difficulty_in_dummy(self.params.permanent_difficulty_in_dummy) + .max_block_proposals_limit(self.params.max_block_proposals_limit) .build(); Ok(consensus) @@ -891,5 +900,15 @@ pub mod test { expected.max_block_bytes = 100; assert_eq!(params, expected); + + let test_params: &str = r#" + max_block_proposals_limit = 100 + "#; + + let params: Params = toml::from_str(&test_params).unwrap(); + let mut expected = Params::default(); + expected.max_block_proposals_limit = 100; + + assert_eq!(params, expected); } } From 44a3587be66579ab52ca52f59530c1974fffbd80 Mon Sep 17 00:00:00 2001 From: zhangsoledad <787953403@qq.com> Date: Fri, 16 Oct 2020 03:57:04 +0800 Subject: [PATCH 09/11] feat: migrate subcommand --- ckb-bin/src/lib.rs | 1 + ckb-bin/src/subcommand/migrate.rs | 12 ++++++++++++ ckb-bin/src/subcommand/mod.rs | 2 ++ util/app-config/src/args.rs | 4 ++++ util/app-config/src/cli.rs | 6 ++++++ util/app-config/src/lib.rs | 10 ++++++++-- 6 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 ckb-bin/src/subcommand/migrate.rs diff --git a/ckb-bin/src/lib.rs b/ckb-bin/src/lib.rs index 08fa29560ce..43c8673b6ce 100644 --- a/ckb-bin/src/lib.rs +++ b/ckb-bin/src/lib.rs @@ -45,6 +45,7 @@ pub fn run_app(version: Version) -> Result<(), ExitCode> { (cli::CMD_IMPORT, Some(matches)) => subcommand::import(setup.import(&matches)?), (cli::CMD_STATS, Some(matches)) => subcommand::stats(setup.stats(&matches)?), (cli::CMD_RESET_DATA, Some(matches)) => subcommand::reset_data(setup.reset_data(&matches)?), + (cli::CMD_MIGRATE, Some(matches)) => subcommand::migrate(setup.migrate(&matches)?), _ => unreachable!(), } } diff --git a/ckb-bin/src/subcommand/migrate.rs b/ckb-bin/src/subcommand/migrate.rs new file mode 100644 index 00000000000..51864a66caa --- /dev/null +++ b/ckb-bin/src/subcommand/migrate.rs @@ -0,0 +1,12 @@ +use ckb_app_config::{ExitCode, MigrateArgs}; +use ckb_shared::shared::SharedBuilder; + +pub fn migrate(args: MigrateArgs) -> Result<(), ExitCode> { + let (_shared, _table) = SharedBuilder::with_db_config(&args.config.db) + .build() + .map_err(|err| { + eprintln!("Run error: {:?}", err); + ExitCode::Failure + })?; + Ok(()) +} diff --git a/ckb-bin/src/subcommand/mod.rs b/ckb-bin/src/subcommand/mod.rs index cf2d53bf655..6940ac17045 100644 --- a/ckb-bin/src/subcommand/mod.rs +++ b/ckb-bin/src/subcommand/mod.rs @@ -2,6 +2,7 @@ mod export; mod import; mod init; mod list_hashes; +mod migrate; mod miner; mod peer_id; mod replay; @@ -13,6 +14,7 @@ pub use self::export::export; pub use self::import::import; pub use self::init::init; pub use self::list_hashes::list_hashes; +pub use self::migrate::migrate; pub use self::miner::miner; pub use self::peer_id::peer_id; pub use self::replay::replay; diff --git a/util/app-config/src/args.rs b/util/app-config/src/args.rs index 66f8e3cd1cf..f69412ffabb 100644 --- a/util/app-config/src/args.rs +++ b/util/app-config/src/args.rs @@ -85,3 +85,7 @@ pub struct ResetDataArgs { pub struct PeerIDArgs { pub peer_id: secio::PeerId, } + +pub struct MigrateArgs { + pub config: Box, +} diff --git a/util/app-config/src/cli.rs b/util/app-config/src/cli.rs index fd648fe1df9..9b38c59ffbc 100644 --- a/util/app-config/src/cli.rs +++ b/util/app-config/src/cli.rs @@ -14,6 +14,7 @@ pub const CMD_RESET_DATA: &str = "reset-data"; pub const CMD_PEERID: &str = "peer-id"; pub const CMD_GEN_SECRET: &str = "gen"; pub const CMD_FROM_SECRET: &str = "from-secret"; +pub const CMD_MIGRATE: &str = "migrate"; pub const ARG_CONFIG_DIR: &str = "config-dir"; pub const ARG_FORMAT: &str = "format"; @@ -77,6 +78,7 @@ fn basic_app<'b>() -> App<'static, 'b> { .subcommand(stats()) .subcommand(reset_data()) .subcommand(peer_id()) + .subcommand(migrate()) } pub fn get_matches(version: &Version) -> ArgMatches<'static> { @@ -242,6 +244,10 @@ fn import() -> App<'static, 'static> { ) } +fn migrate() -> App<'static, 'static> { + SubCommand::with_name(CMD_MIGRATE).about("Runs ckb migration") +} + fn list_hashes() -> App<'static, 'static> { SubCommand::with_name(CMD_LIST_HASHES) .about("Lists well known hashes") diff --git a/util/app-config/src/lib.rs b/util/app-config/src/lib.rs index 643e479d166..713fb338c27 100644 --- a/util/app-config/src/lib.rs +++ b/util/app-config/src/lib.rs @@ -7,8 +7,8 @@ mod sentry_config; pub use app_config::{AppConfig, CKBAppConfig, MinerAppConfig}; pub use args::{ - ExportArgs, ImportArgs, InitArgs, MinerArgs, PeerIDArgs, ReplayArgs, ResetDataArgs, RunArgs, - StatsArgs, + ExportArgs, ImportArgs, InitArgs, MigrateArgs, MinerArgs, PeerIDArgs, ReplayArgs, + ResetDataArgs, RunArgs, StatsArgs, }; pub use configs::*; pub use exit_code::ExitCode; @@ -56,6 +56,12 @@ impl Setup { }) } + pub fn migrate<'m>(self, _matches: &ArgMatches<'m>) -> Result { + let config = self.config.into_ckb()?; + + Ok(MigrateArgs { config }) + } + pub fn miner<'m>(self, matches: &ArgMatches<'m>) -> Result { let spec = self.chain_spec()?; let memory_tracker = self.config.memory_tracker().to_owned(); From 6663581ed086b27f1c0147ff8d1ca8621b0e33bb Mon Sep 17 00:00:00 2001 From: ian Date: Tue, 20 Oct 2020 09:31:44 +0800 Subject: [PATCH 10/11] chore: bump to 0.38.0-pre --- Cargo.lock | 116 +++++++++++------------ Cargo.toml | 8 +- README.md | 2 +- benches/Cargo.toml | 30 +++--- chain/Cargo.toml | 38 ++++---- ckb-bin/Cargo.toml | 48 +++++----- db-migration/Cargo.toml | 10 +- db/Cargo.toml | 8 +- error/Cargo.toml | 4 +- indexer/Cargo.toml | 26 ++--- miner/Cargo.toml | 18 ++-- network/Cargo.toml | 14 +-- notify/Cargo.toml | 12 +-- pow/Cargo.toml | 6 +- resource/Cargo.toml | 6 +- rpc/Cargo.toml | 56 +++++------ script/Cargo.toml | 22 ++--- shared/Cargo.toml | 26 ++--- spec/Cargo.toml | 20 ++-- store/Cargo.toml | 16 ++-- sync/Cargo.toml | 42 ++++---- test/Cargo.toml | 32 +++---- traits/Cargo.toml | 4 +- tx-pool/Cargo.toml | 34 +++---- util/Cargo.toml | 4 +- util/app-config/Cargo.toml | 22 ++--- util/build-info/Cargo.toml | 2 +- util/chain-iter/Cargo.toml | 6 +- util/channel/Cargo.toml | 2 +- util/crypto/Cargo.toml | 4 +- util/dao/Cargo.toml | 16 ++-- util/dao/utils/Cargo.toml | 6 +- util/fee-estimator/Cargo.toml | 6 +- util/fixed-hash/Cargo.toml | 6 +- util/fixed-hash/core/Cargo.toml | 2 +- util/fixed-hash/macros/Cargo.toml | 4 +- util/hash/Cargo.toml | 2 +- util/instrument/Cargo.toml | 12 +-- util/jsonrpc-types/Cargo.toml | 4 +- util/logger-config/Cargo.toml | 2 +- util/logger-service/Cargo.toml | 8 +- util/logger/Cargo.toml | 2 +- util/memory-tracker/Cargo.toml | 8 +- util/metrics-config/Cargo.toml | 2 +- util/metrics-service/Cargo.toml | 10 +- util/metrics/Cargo.toml | 2 +- util/multisig/Cargo.toml | 6 +- util/network-alert/Cargo.toml | 20 ++-- util/occupied-capacity/Cargo.toml | 6 +- util/occupied-capacity/core/Cargo.toml | 2 +- util/occupied-capacity/macros/Cargo.toml | 4 +- util/proposal-table/Cargo.toml | 8 +- util/rational/Cargo.toml | 2 +- util/reward-calculator/Cargo.toml | 18 ++-- util/runtime/Cargo.toml | 2 +- util/rust-unstable-port/Cargo.toml | 2 +- util/snapshot/Cargo.toml | 18 ++-- util/stop-handler/Cargo.toml | 6 +- util/test-chain-utils/Cargo.toml | 18 ++-- util/types/Cargo.toml | 14 +-- verification/Cargo.toml | 34 +++---- wasm-build-test/Cargo.toml | 6 +- 62 files changed, 448 insertions(+), 448 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e04b67e97df..d505542ede8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -313,7 +313,7 @@ dependencies = [ [[package]] name = "ckb" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-bin", "ckb-build-info", @@ -322,7 +322,7 @@ dependencies = [ [[package]] name = "ckb-app-config" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-build-info", "ckb-chain-spec", @@ -348,14 +348,14 @@ dependencies = [ [[package]] name = "ckb-async-runtime" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "tokio 0.2.22", ] [[package]] name = "ckb-benches" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-app-config", "ckb-chain", @@ -380,7 +380,7 @@ dependencies = [ [[package]] name = "ckb-bin" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "base64", "ckb-app-config", @@ -418,11 +418,11 @@ dependencies = [ [[package]] name = "ckb-build-info" -version = "0.37.0-pre" +version = "0.38.0-pre" [[package]] name = "ckb-chain" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "bitflags", "ckb-app-config", @@ -449,7 +449,7 @@ dependencies = [ [[package]] name = "ckb-chain-iter" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-store", "ckb-types", @@ -457,7 +457,7 @@ dependencies = [ [[package]] name = "ckb-chain-spec" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-crypto", "ckb-dao-utils", @@ -475,14 +475,14 @@ dependencies = [ [[package]] name = "ckb-channel" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "crossbeam-channel 0.3.9", ] [[package]] name = "ckb-crypto" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-fixed-hash", "failure", @@ -494,7 +494,7 @@ dependencies = [ [[package]] name = "ckb-dao" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "byteorder", "ckb-chain-spec", @@ -508,7 +508,7 @@ dependencies = [ [[package]] name = "ckb-dao-utils" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "byteorder", "ckb-error", @@ -519,7 +519,7 @@ dependencies = [ [[package]] name = "ckb-db" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-app-config", "ckb-error", @@ -531,7 +531,7 @@ dependencies = [ [[package]] name = "ckb-db-migration" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-app-config", "ckb-db", @@ -544,7 +544,7 @@ dependencies = [ [[package]] name = "ckb-error" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-occupied-capacity", "enum-display-derive", @@ -554,7 +554,7 @@ dependencies = [ [[package]] name = "ckb-fee-estimator" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-logger", "ckb-types", @@ -563,7 +563,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-fixed-hash-core", "ckb-fixed-hash-macros", @@ -571,7 +571,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-core" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "failure", "faster-hex 0.4.1", @@ -580,7 +580,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-macros" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-fixed-hash-core", "proc-macro2 0.4.27", @@ -590,14 +590,14 @@ dependencies = [ [[package]] name = "ckb-hash" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "blake2b-rs", ] [[package]] name = "ckb-indexer" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-app-config", "ckb-chain", @@ -616,7 +616,7 @@ dependencies = [ [[package]] name = "ckb-instrument" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-chain", "ckb-chain-iter", @@ -629,7 +629,7 @@ dependencies = [ [[package]] name = "ckb-jsonrpc-types" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-types", "faster-hex 0.4.1", @@ -654,21 +654,21 @@ dependencies = [ [[package]] name = "ckb-logger" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "log 0.4.11", ] [[package]] name = "ckb-logger-config" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "serde", ] [[package]] name = "ckb-logger-service" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ansi_term 0.12.1", "backtrace", @@ -685,7 +685,7 @@ dependencies = [ [[package]] name = "ckb-memory-tracker" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-db", "ckb-logger", @@ -698,14 +698,14 @@ dependencies = [ [[package]] name = "ckb-metrics" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "metrics", ] [[package]] name = "ckb-metrics-config" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "log 0.4.11", "serde", @@ -713,7 +713,7 @@ dependencies = [ [[package]] name = "ckb-metrics-service" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-async-runtime", "ckb-metrics-config", @@ -727,7 +727,7 @@ dependencies = [ [[package]] name = "ckb-miner" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-app-config", "ckb-channel", @@ -752,7 +752,7 @@ dependencies = [ [[package]] name = "ckb-multisig" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-crypto", "ckb-logger", @@ -762,7 +762,7 @@ dependencies = [ [[package]] name = "ckb-network" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "bloom-filters", "bs58", @@ -795,7 +795,7 @@ dependencies = [ [[package]] name = "ckb-network-alert" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-app-config", "ckb-crypto", @@ -814,7 +814,7 @@ dependencies = [ [[package]] name = "ckb-notify" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-app-config", "ckb-channel", @@ -825,7 +825,7 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-occupied-capacity-core", "ckb-occupied-capacity-macros", @@ -833,14 +833,14 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity-core" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "serde", ] [[package]] name = "ckb-occupied-capacity-macros" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-occupied-capacity-core", "quote 0.6.11", @@ -849,7 +849,7 @@ dependencies = [ [[package]] name = "ckb-pow" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "byteorder", "ckb-hash", @@ -861,7 +861,7 @@ dependencies = [ [[package]] name = "ckb-proposal-table" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-chain-spec", "ckb-logger", @@ -870,7 +870,7 @@ dependencies = [ [[package]] name = "ckb-rational" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "numext-fixed-uint", "proptest", @@ -878,7 +878,7 @@ dependencies = [ [[package]] name = "ckb-resource" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-system-scripts", "ckb-types", @@ -892,7 +892,7 @@ dependencies = [ [[package]] name = "ckb-reward-calculator" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-chain-spec", "ckb-dao", @@ -917,7 +917,7 @@ dependencies = [ [[package]] name = "ckb-rpc" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-app-config", "ckb-chain", @@ -966,14 +966,14 @@ dependencies = [ [[package]] name = "ckb-rust-unstable-port" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "is_sorted", ] [[package]] name = "ckb-script" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "byteorder", "ckb-chain-spec", @@ -998,7 +998,7 @@ dependencies = [ [[package]] name = "ckb-shared" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "arc-swap", "ckb-app-config", @@ -1018,7 +1018,7 @@ dependencies = [ [[package]] name = "ckb-snapshot" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "arc-swap", "ckb-chain-spec", @@ -1033,7 +1033,7 @@ dependencies = [ [[package]] name = "ckb-stop-handler" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-channel", "ckb-logger", @@ -1044,7 +1044,7 @@ dependencies = [ [[package]] name = "ckb-store" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -1058,7 +1058,7 @@ dependencies = [ [[package]] name = "ckb-sync" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "bitflags", "ckb-app-config", @@ -1106,7 +1106,7 @@ dependencies = [ [[package]] name = "ckb-test-chain-utils" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-chain-spec", "ckb-dao-utils", @@ -1122,14 +1122,14 @@ dependencies = [ [[package]] name = "ckb-traits" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-types", ] [[package]] name = "ckb-tx-pool" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1155,7 +1155,7 @@ dependencies = [ [[package]] name = "ckb-types" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "bit-vec", "bytes 0.5.6", @@ -1175,7 +1175,7 @@ dependencies = [ [[package]] name = "ckb-util" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-fixed-hash", "linked-hash-map", @@ -1185,7 +1185,7 @@ dependencies = [ [[package]] name = "ckb-verification" -version = "0.37.0-pre" +version = "0.38.0-pre" dependencies = [ "ckb-async-runtime", "ckb-chain", diff --git a/Cargo.toml b/Cargo.toml index 990c9471bea..46c814d866a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -10,11 +10,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [build-dependencies] -ckb-build-info = { path = "util/build-info", version = "= 0.37.0-pre" } +ckb-build-info = { path = "util/build-info", version = "= 0.38.0-pre" } [dependencies] -ckb-build-info = { path = "util/build-info", version = "= 0.37.0-pre" } -ckb-bin = { path = "ckb-bin", version = "= 0.37.0-pre" } +ckb-build-info = { path = "util/build-info", version = "= 0.38.0-pre" } +ckb-bin = { path = "ckb-bin", version = "= 0.38.0-pre" } [dev-dependencies] diff --git a/README.md b/README.md index 1f2a6b2b21e..22dbfb7989e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # [Nervos CKB](https://www.nervos.org/) - The Common Knowledge Base -[![Version](https://img.shields.io/badge/version-0.37.0--pre-orange.svg)](https://github.com/nervosnetwork/ckb/releases) +[![Version](https://img.shields.io/badge/version-0.38.0--pre-orange.svg)](https://github.com/nervosnetwork/ckb/releases) [![Telegram Group](https://cdn.jsdelivr.net/gh/Patrolavia/telegram-badge@8fe3382b3fd3a1c533ba270e608035a27e430c2e/chat.svg)](https://t.me/nervosnetwork) [![Nervos Talk](https://img.shields.io/badge/discuss-on%20Nervos%20Talk-3CC68A.svg)](https://talk.nervos.org/) diff --git a/benches/Cargo.toml b/benches/Cargo.toml index b52c74f22a2..87972dc1e9b 100644 --- a/benches/Cargo.toml +++ b/benches/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-benches" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -13,24 +13,24 @@ repository = "https://github.com/nervosnetwork/ckb" [dev-dependencies] criterion = "0.3" -ckb-chain = { path = "../chain", version = "= 0.37.0-pre" } -ckb-types = { path = "../util/types", version = "= 0.37.0-pre" } -ckb-shared = { path = "../shared", version = "= 0.37.0-pre" } -ckb-store = { path = "../store", version = "= 0.37.0-pre" } -ckb-chain-spec = { path = "../spec", version = "= 0.37.0-pre" } +ckb-chain = { path = "../chain", version = "= 0.38.0-pre" } +ckb-types = { path = "../util/types", version = "= 0.38.0-pre" } +ckb-shared = { path = "../shared", version = "= 0.38.0-pre" } +ckb-store = { path = "../store", version = "= 0.38.0-pre" } +ckb-chain-spec = { path = "../spec", version = "= 0.38.0-pre" } rand = "0.6" -ckb-hash = {path = "../util/hash", version = "= 0.37.0-pre"} -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.37.0-pre" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.37.0-pre" } -ckb-dao = { path = "../util/dao", version = "= 0.37.0-pre" } +ckb-hash = {path = "../util/hash", version = "= 0.38.0-pre"} +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.38.0-pre" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.38.0-pre" } +ckb-dao = { path = "../util/dao", version = "= 0.38.0-pre" } ckb-system-scripts = { version = "= 0.5.1" } lazy_static = "1.3.0" -ckb-crypto = { path = "../util/crypto", version = "= 0.37.0-pre" } +ckb-crypto = { path = "../util/crypto", version = "= 0.38.0-pre" } faketime = "0.2.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.37.0-pre" } -ckb-verification = { path = "../verification", version = "= 0.37.0-pre" } -ckb-app-config = { path = "../util/app-config", version = "= 0.37.0-pre" } -ckb-fee-estimator = { path = "../util/fee-estimator", version = "= 0.37.0-pre" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.38.0-pre" } +ckb-verification = { path = "../verification", version = "= 0.38.0-pre" } +ckb-app-config = { path = "../util/app-config", version = "= 0.38.0-pre" } +ckb-fee-estimator = { path = "../util/fee-estimator", version = "= 0.38.0-pre" } [[bench]] name = "bench_main" diff --git a/chain/Cargo.toml b/chain/Cargo.toml index 3c7d8d2a93f..84e1abf0ad5 100644 --- a/chain/Cargo.toml +++ b/chain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -9,26 +9,26 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.37.0-pre" } -ckb-metrics = { path = "../util/metrics", version = "= 0.37.0-pre" } -ckb-types = { path = "../util/types", version = "= 0.37.0-pre" } -ckb-shared = { path = "../shared", version = "= 0.37.0-pre" } -ckb-chain-spec = { path = "../spec", version = "= 0.37.0-pre" } -ckb-store = { path = "../store", version = "= 0.37.0-pre" } -ckb-verification = { path = "../verification", version = "= 0.37.0-pre" } +ckb-logger = { path = "../util/logger", version = "= 0.38.0-pre" } +ckb-metrics = { path = "../util/metrics", version = "= 0.38.0-pre" } +ckb-types = { path = "../util/types", version = "= 0.38.0-pre" } +ckb-shared = { path = "../shared", version = "= 0.38.0-pre" } +ckb-chain-spec = { path = "../spec", version = "= 0.38.0-pre" } +ckb-store = { path = "../store", version = "= 0.38.0-pre" } +ckb-verification = { path = "../verification", version = "= 0.38.0-pre" } faketime = "0.2.0" -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.37.0-pre" } -ckb-dao = { path = "../util/dao", version = "= 0.37.0-pre" } -ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.37.0-pre" } -ckb-error = { path = "../error", version = "= 0.37.0-pre" } -ckb-app-config = { path = "../util/app-config", version = "= 0.37.0-pre" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.38.0-pre" } +ckb-dao = { path = "../util/dao", version = "= 0.38.0-pre" } +ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.38.0-pre" } +ckb-error = { path = "../error", version = "= 0.38.0-pre" } +ckb-app-config = { path = "../util/app-config", version = "= 0.38.0-pre" } bitflags = "1.0" -ckb-rust-unstable-port = { path = "../util/rust-unstable-port", version = "= 0.37.0-pre" } -ckb-channel = { path = "../util/channel", version = "= 0.37.0-pre" } +ckb-rust-unstable-port = { path = "../util/rust-unstable-port", version = "= 0.38.0-pre" } +ckb-channel = { path = "../util/channel", version = "= 0.38.0-pre" } [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.37.0-pre" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.37.0-pre" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.37.0-pre" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.37.0-pre" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.38.0-pre" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.38.0-pre" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.38.0-pre" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.38.0-pre" } lazy_static = "1.4" diff --git a/ckb-bin/Cargo.toml b/ckb-bin/Cargo.toml index 7d17699a85c..e852dc1958e 100644 --- a/ckb-bin/Cargo.toml +++ b/ckb-bin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-bin" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -13,30 +13,30 @@ clap = { version = "2" } serde = { version = "1.0", features = ["derive"] } serde_plain = "0.3.0" toml = "0.5" -ckb-app-config = { path = "../util/app-config", version = "= 0.37.0-pre" } -ckb-logger = { path = "../util/logger", version = "= 0.37.0-pre" } -ckb-logger-service = { path = "../util/logger-service", version = "= 0.37.0-pre" } -ckb-metrics-service = { path = "../util/metrics-service", version = "= 0.37.0-pre" } -ckb-util = { path = "../util", version = "= 0.37.0-pre" } -ckb-types = { path = "../util/types", version = "= 0.37.0-pre" } -ckb-channel = { path = "../util/channel", version = "= 0.37.0-pre" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.37.0-pre" } -ckb-chain = { path = "../chain", version = "= 0.37.0-pre" } -ckb-shared = { path = "../shared", version = "= 0.37.0-pre" } -ckb-store = { path = "../store", version = "= 0.37.0-pre" } -ckb-chain-spec = {path = "../spec", version = "= 0.37.0-pre"} -ckb-miner = { path = "../miner", version = "= 0.37.0-pre" } -ckb-network = { path = "../network", version = "= 0.37.0-pre"} -ckb-rpc = { path = "../rpc", version = "= 0.37.0-pre"} -ckb-resource = { path = "../resource", version = "= 0.37.0-pre"} -ckb-network-alert = { path = "../util/network-alert", version = "= 0.37.0-pre" } +ckb-app-config = { path = "../util/app-config", version = "= 0.38.0-pre" } +ckb-logger = { path = "../util/logger", version = "= 0.38.0-pre" } +ckb-logger-service = { path = "../util/logger-service", version = "= 0.38.0-pre" } +ckb-metrics-service = { path = "../util/metrics-service", version = "= 0.38.0-pre" } +ckb-util = { path = "../util", version = "= 0.38.0-pre" } +ckb-types = { path = "../util/types", version = "= 0.38.0-pre" } +ckb-channel = { path = "../util/channel", version = "= 0.38.0-pre" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.38.0-pre" } +ckb-chain = { path = "../chain", version = "= 0.38.0-pre" } +ckb-shared = { path = "../shared", version = "= 0.38.0-pre" } +ckb-store = { path = "../store", version = "= 0.38.0-pre" } +ckb-chain-spec = {path = "../spec", version = "= 0.38.0-pre"} +ckb-miner = { path = "../miner", version = "= 0.38.0-pre" } +ckb-network = { path = "../network", version = "= 0.38.0-pre"} +ckb-rpc = { path = "../rpc", version = "= 0.38.0-pre"} +ckb-resource = { path = "../resource", version = "= 0.38.0-pre"} +ckb-network-alert = { path = "../util/network-alert", version = "= 0.38.0-pre" } ctrlc = { version = "3.1", features = ["termination"] } -ckb-sync = { path = "../sync", version = "= 0.37.0-pre"} -ckb-instrument = { path = "../util/instrument", version = "= 0.37.0-pre", features = ["progress_bar"] } -ckb-build-info = { path = "../util/build-info", version = "= 0.37.0-pre" } -ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.37.0-pre" } -ckb-chain-iter = { path = "../util/chain-iter", version = "= 0.37.0-pre" } -ckb-verification = { path = "../verification", version = "= 0.37.0-pre" } +ckb-sync = { path = "../sync", version = "= 0.38.0-pre"} +ckb-instrument = { path = "../util/instrument", version = "= 0.38.0-pre", features = ["progress_bar"] } +ckb-build-info = { path = "../util/build-info", version = "= 0.38.0-pre" } +ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.38.0-pre" } +ckb-chain-iter = { path = "../util/chain-iter", version = "= 0.38.0-pre" } +ckb-verification = { path = "../verification", version = "= 0.38.0-pre" } base64 = "0.10.1" tempfile = "3.0" rayon = "1.0" diff --git a/db-migration/Cargo.toml b/db-migration/Cargo.toml index 97e8aac23fb..0516ea2d14d 100644 --- a/db-migration/Cargo.toml +++ b/db-migration/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db-migration" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -11,12 +11,12 @@ repository = "https://github.com/nervosnetwork/ckb" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ckb-db = { path = "../db", version = "= 0.37.0-pre" } -ckb-logger = { path = "../util/logger", version = "= 0.37.0-pre" } -ckb-error = { path = "../error", version = "= 0.37.0-pre" } +ckb-db = { path = "../db", version = "= 0.38.0-pre" } +ckb-logger = { path = "../util/logger", version = "= 0.38.0-pre" } +ckb-error = { path = "../error", version = "= 0.38.0-pre" } indicatif = "0.15" console = "0.12" [dev-dependencies] tempfile = "3.0" -ckb-app-config = { path = "../util/app-config", version = "= 0.37.0-pre" } +ckb-app-config = { path = "../util/app-config", version = "= 0.38.0-pre" } diff --git a/db/Cargo.toml b/db/Cargo.toml index f231dbcce0f..ea9ed9e2084 100644 --- a/db/Cargo.toml +++ b/db/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -9,9 +9,9 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-app-config = { path = "../util/app-config", version = "= 0.37.0-pre" } -ckb-logger = { path = "../util/logger", version = "= 0.37.0-pre" } -ckb-error = { path = "../error", version = "= 0.37.0-pre" } +ckb-app-config = { path = "../util/app-config", version = "= 0.38.0-pre" } +ckb-logger = { path = "../util/logger", version = "= 0.38.0-pre" } +ckb-error = { path = "../error", version = "= 0.38.0-pre" } tempfile = "3.0" libc = "0.2" rocksdb = { package = "ckb-rocksdb", version = "=0.14.1", features = ["snappy"] } diff --git a/error/Cargo.toml b/error/Cargo.toml index 749b621b39a..bff6bf6a35c 100644 --- a/error/Cargo.toml +++ b/error/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-error" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -12,6 +12,6 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] failure = "0.1.5" -ckb-occupied-capacity = { path = "../util/occupied-capacity", version = "= 0.37.0-pre" } +ckb-occupied-capacity = { path = "../util/occupied-capacity", version = "= 0.38.0-pre" } enum-display-derive = "0.1.0" quote = "1.0.3" diff --git a/indexer/Cargo.toml b/indexer/Cargo.toml index cc54580d054..0edcd5749ea 100644 --- a/indexer/Cargo.toml +++ b/indexer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-indexer" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -9,18 +9,18 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.37.0-pre" } -ckb-db = { path = "../db", version = "= 0.37.0-pre" } -ckb-shared = { path = "../shared", version = "= 0.37.0-pre" } -ckb-store = { path = "../store", version = "= 0.37.0-pre" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.37.0-pre" } -ckb-logger = { path = "../util/logger", version = "= 0.37.0-pre" } -ckb-util = { path = "../util", version = "= 0.37.0-pre" } -ckb-app-config = { path = "../util/app-config", version = "= 0.37.0-pre" } -ckb-db-migration = { path = "../db-migration", version = "= 0.37.0-pre" } +ckb-types = { path = "../util/types", version = "= 0.38.0-pre" } +ckb-db = { path = "../db", version = "= 0.38.0-pre" } +ckb-shared = { path = "../shared", version = "= 0.38.0-pre" } +ckb-store = { path = "../store", version = "= 0.38.0-pre" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.38.0-pre" } +ckb-logger = { path = "../util/logger", version = "= 0.38.0-pre" } +ckb-util = { path = "../util", version = "= 0.38.0-pre" } +ckb-app-config = { path = "../util/app-config", version = "= 0.38.0-pre" } +ckb-db-migration = { path = "../db-migration", version = "= 0.38.0-pre" } [dev-dependencies] tempfile = "3.0" -ckb-chain = { path = "../chain", version = "= 0.37.0-pre" } -ckb-chain-spec = { path = "../spec", version = "= 0.37.0-pre" } -ckb-resource = { path = "../resource", version = "= 0.37.0-pre" } +ckb-chain = { path = "../chain", version = "= 0.38.0-pre" } +ckb-chain-spec = { path = "../spec", version = "= 0.38.0-pre" } +ckb-resource = { path = "../resource", version = "= 0.38.0-pre" } diff --git a/miner/Cargo.toml b/miner/Cargo.toml index 8dab41bfcca..c9ed11037b3 100644 --- a/miner/Cargo.toml +++ b/miner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-miner" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -9,21 +9,21 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.37.0-pre" } -ckb-app-config = { path = "../util/app-config", version = "= 0.37.0-pre" } -ckb-types = { path = "../util/types", version = "= 0.37.0-pre" } -ckb-channel = { path = "../util/channel", version = "= 0.37.0-pre" } -ckb-hash = { path = "../util/hash", version = "= 0.37.0-pre" } -ckb-pow = { path = "../pow", version = "= 0.37.0-pre" } +ckb-logger = { path = "../util/logger", version = "= 0.38.0-pre" } +ckb-app-config = { path = "../util/app-config", version = "= 0.38.0-pre" } +ckb-types = { path = "../util/types", version = "= 0.38.0-pre" } +ckb-channel = { path = "../util/channel", version = "= 0.38.0-pre" } +ckb-hash = { path = "../util/hash", version = "= 0.38.0-pre" } +ckb-pow = { path = "../pow", version = "= 0.38.0-pre" } rand = "0.6" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.37.0-pre" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.38.0-pre" } hyper = "0.12" hyper-tls = "0.3" futures = "0.1" lru = "0.6.0" -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.37.0-pre" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.38.0-pre" } failure = "0.1.5" indicatif = "0.15" console = "0.8.0" diff --git a/network/Cargo.toml b/network/Cargo.toml index ed37b71ba48..570a514ab92 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-network" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -11,10 +11,10 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] rand = "0.6" serde = { version = "1.0", features = ["derive"] } -ckb-util = { path = "../util", version = "= 0.37.0-pre" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.37.0-pre" } -ckb-logger = { path = "../util/logger", version = "= 0.37.0-pre" } -ckb-app-config = { path = "../util/app-config", version = "= 0.37.0-pre" } +ckb-util = { path = "../util", version = "= 0.38.0-pre" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.38.0-pre" } +ckb-logger = { path = "../util/logger", version = "= 0.38.0-pre" } +ckb-app-config = { path = "../util/app-config", version = "= 0.38.0-pre" } tokio = { version = "0.2.11", features = ["time", "io-util", "tcp", "dns", "rt-threaded", "blocking", "stream"] } tokio-util = { version = "0.3.0", features = ["codec"] } futures = "0.3" @@ -24,12 +24,12 @@ lazy_static = "1.3.0" bs58 = "0.3.0" sentry = "0.17.0" faster-hex = "0.4" -ckb-hash = {path = "../util/hash", version = "= 0.37.0-pre"} +ckb-hash = {path = "../util/hash", version = "= 0.38.0-pre"} secp256k1 = {version = "0.17", features = ["recovery"] } resolve = "0.2.0" num_cpus = "1.10" snap = "1" -ckb-types = { path = "../util/types", version = "= 0.37.0-pre" } +ckb-types = { path = "../util/types", version = "= 0.38.0-pre" } ipnetwork = "0.14" serde_json = "1.0" bloom-filters = "0.1" diff --git a/notify/Cargo.toml b/notify/Cargo.toml index 1e544be2963..050c435a0b9 100644 --- a/notify/Cargo.toml +++ b/notify/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-notify" -version = "0.37.0-pre" +version = "0.38.0-pre" authors = ["Nervos Core Dev "] edition = "2018" license = "MIT" @@ -9,10 +9,10 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.37.0-pre" } -ckb-app-config = { path = "../util/app-config", version = "= 0.37.0-pre" } -ckb-types = { path = "../util/types", version = "= 0.37.0-pre" } -ckb-channel = { path = "../util/channel", version = "= 0.37.0-pre" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.37.0-pre" } +ckb-logger = { path = "../util/logger", version = "= 0.38.0-pre" } +ckb-app-config = { path = "../util/app-config", version = "= 0.38.0-pre" } +ckb-types = { path = "../util/types", version = "= 0.38.0-pre" } +ckb-channel = { path = "../util/channel", version = "= 0.38.0-pre" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.38.0-pre" } [dev-dependencies] diff --git a/pow/Cargo.toml b/pow/Cargo.toml index 7288937d6e6..a0048e65efe 100644 --- a/pow/Cargo.toml +++ b/pow/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-pow" -version = "0.37.0-pre" +version = "0.38.0-pre" authors = ["Nervos Core Dev "] edition = "2018" license = "MIT" @@ -10,8 +10,8 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../util/types", version = "= 0.37.0-pre" } -ckb-hash = { path = "../util/hash", version = "= 0.37.0-pre"} +ckb-types = { path = "../util/types", version = "= 0.38.0-pre" } +ckb-hash = { path = "../util/hash", version = "= 0.38.0-pre"} serde = { version = "1.0", features = ["derive"] } eaglesong = "0.1" log = "0.4" diff --git a/resource/Cargo.toml b/resource/Cargo.toml index 4d0efa20faf..b74f5639d52 100644 --- a/resource/Cargo.toml +++ b/resource/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-resource" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -14,11 +14,11 @@ phf = "0.7.21" includedir = "0.5.0" tempfile = "3.0" serde = { version = "1.0", features = ["derive"] } -ckb-types = { path = "../util/types", version = "= 0.37.0-pre" } +ckb-types = { path = "../util/types", version = "= 0.38.0-pre" } ckb-system-scripts = { version = "= 0.5.1" } [build-dependencies] includedir_codegen = "0.5.0" walkdir = "2.1.4" -ckb-types = { path = "../util/types", version = "= 0.37.0-pre" } +ckb-types = { path = "../util/types", version = "= 0.38.0-pre" } ckb-system-scripts = { version = "= 0.5.1" } diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 83ecfa78828..48e04df7a19 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-rpc" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -9,21 +9,21 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-chain-spec = { path = "../spec", version = "= 0.37.0-pre" } -ckb-types = { path = "../util/types", version = "= 0.37.0-pre" } -ckb-network = { path = "../network", version = "= 0.37.0-pre" } -ckb-notify = { path = "../notify", version = "= 0.37.0-pre" } -ckb-indexer = { path = "../indexer", version = "= 0.37.0-pre" } -ckb-shared = { path = "../shared", version = "= 0.37.0-pre" } -ckb-store = { path = "../store", version = "= 0.37.0-pre" } -ckb-sync = { path = "../sync", version = "= 0.37.0-pre" } -ckb-chain = { path = "../chain", version = "= 0.37.0-pre" } -ckb-logger = { path = "../util/logger", version = "= 0.37.0-pre"} -ckb-channel = { path = "../util/channel", version = "= 0.37.0-pre" } -ckb-logger-service = { path = "../util/logger-service", version = "= 0.37.0-pre"} -ckb-network-alert = { path = "../util/network-alert", version = "= 0.37.0-pre" } -ckb-fee-estimator = { path = "../util/fee-estimator", version = "= 0.37.0-pre" } -ckb-app-config = { path = "../util/app-config", version = "= 0.37.0-pre" } +ckb-chain-spec = { path = "../spec", version = "= 0.38.0-pre" } +ckb-types = { path = "../util/types", version = "= 0.38.0-pre" } +ckb-network = { path = "../network", version = "= 0.38.0-pre" } +ckb-notify = { path = "../notify", version = "= 0.38.0-pre" } +ckb-indexer = { path = "../indexer", version = "= 0.38.0-pre" } +ckb-shared = { path = "../shared", version = "= 0.38.0-pre" } +ckb-store = { path = "../store", version = "= 0.38.0-pre" } +ckb-sync = { path = "../sync", version = "= 0.38.0-pre" } +ckb-chain = { path = "../chain", version = "= 0.38.0-pre" } +ckb-logger = { path = "../util/logger", version = "= 0.38.0-pre"} +ckb-channel = { path = "../util/channel", version = "= 0.38.0-pre" } +ckb-logger-service = { path = "../util/logger-service", version = "= 0.38.0-pre"} +ckb-network-alert = { path = "../util/network-alert", version = "= 0.38.0-pre" } +ckb-fee-estimator = { path = "../util/fee-estimator", version = "= 0.38.0-pre" } +ckb-app-config = { path = "../util/app-config", version = "= 0.38.0-pre" } jsonrpc-core = "~14.1" jsonrpc-derive = "14.0" # quote requirement conflict jsonrpc-http-server = "~14.1" @@ -34,23 +34,23 @@ jsonrpc-pubsub = "~14.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" num_cpus = "1.10" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.37.0-pre" } -ckb-verification = { path = "../verification", version = "= 0.37.0-pre" } -ckb-traits = { path = "../traits", version = "= 0.37.0-pre" } -ckb-util = { path = "../util", version = "= 0.37.0-pre" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.38.0-pre" } +ckb-verification = { path = "../verification", version = "= 0.38.0-pre" } +ckb-traits = { path = "../traits", version = "= 0.38.0-pre" } +ckb-util = { path = "../util", version = "= 0.38.0-pre" } faketime = "0.2.0" -ckb-dao = { path = "../util/dao", version = "= 0.37.0-pre" } +ckb-dao = { path = "../util/dao", version = "= 0.38.0-pre" } futures = "0.1" -ckb-error = { path = "../error", version = "= 0.37.0-pre" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.37.0-pre" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.37.0-pre" } -ckb-script = { path = "../script", version = "= 0.37.0-pre" } -ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.37.0-pre" } +ckb-error = { path = "../error", version = "= 0.38.0-pre" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.38.0-pre" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.38.0-pre" } +ckb-script = { path = "../script", version = "= 0.38.0-pre" } +ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.38.0-pre" } failure = "0.1.5" [dev-dependencies] reqwest = "0.9.16" -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.37.0-pre" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.38.0-pre" } tempfile = "3.0" pretty_assertions = "0.6.1" -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.37.0-pre" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.38.0-pre" } diff --git a/script/Cargo.toml b/script/Cargo.toml index caea1ad5a46..e73405eef0a 100644 --- a/script/Cargo.toml +++ b/script/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-script" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -17,24 +17,24 @@ detect-asm = ["ckb-vm/detect-asm"] logging = ["ckb-logger"] [dependencies] -ckb-traits = { path = "../traits", version = "= 0.37.0-pre" } +ckb-traits = { path = "../traits", version = "= 0.38.0-pre" } byteorder = "1.3.1" -ckb-types = {path = "../util/types", version = "= 0.37.0-pre"} -ckb-hash = {path = "../util/hash", version = "= 0.37.0-pre"} +ckb-types = {path = "../util/types", version = "= 0.38.0-pre"} +ckb-hash = {path = "../util/hash", version = "= 0.38.0-pre"} ckb-vm = { version = "0.19.2", default-features = false } faster-hex = "0.4" -ckb-logger = { path = "../util/logger", version = "= 0.37.0-pre", optional = true } +ckb-logger = { path = "../util/logger", version = "= 0.38.0-pre", optional = true } serde = { version = "1.0", features = ["derive"] } -ckb-error = { path = "../error", version = "= 0.37.0-pre" } +ckb-error = { path = "../error", version = "= 0.38.0-pre" } failure = "0.1.5" -ckb-chain-spec = { path = "../spec", version = "= 0.37.0-pre" } +ckb-chain-spec = { path = "../spec", version = "= 0.38.0-pre" } goblin = "0.2" ckb-vm-definitions = "0.19.1" [dev-dependencies] proptest = "0.9" -ckb-db = { path = "../db", version = "= 0.37.0-pre" } -ckb-store = { path = "../store", version = "= 0.37.0-pre" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.37.0-pre" } +ckb-db = { path = "../db", version = "= 0.38.0-pre" } +ckb-store = { path = "../store", version = "= 0.38.0-pre" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.38.0-pre" } tiny-keccak = "1.4" -ckb-crypto = { path = "../util/crypto", version = "= 0.37.0-pre"} +ckb-crypto = { path = "../util/crypto", version = "= 0.38.0-pre"} diff --git a/shared/Cargo.toml b/shared/Cargo.toml index d82d3810555..0de5f4239c1 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-shared" -version = "0.37.0-pre" +version = "0.38.0-pre" authors = ["Nervos Core Dev "] edition = "2018" license = "MIT" @@ -9,17 +9,17 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.37.0-pre" } -ckb-chain-spec = { path = "../spec", version = "= 0.37.0-pre" } -ckb-store = { path = "../store", version = "= 0.37.0-pre" } -ckb-db = { path = "../db", version = "= 0.37.0-pre" } -ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.37.0-pre" } +ckb-types = { path = "../util/types", version = "= 0.38.0-pre" } +ckb-chain-spec = { path = "../spec", version = "= 0.38.0-pre" } +ckb-store = { path = "../store", version = "= 0.38.0-pre" } +ckb-db = { path = "../db", version = "= 0.38.0-pre" } +ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.38.0-pre" } arc-swap = "0.4" -ckb-error = { path = "../error", version = "= 0.37.0-pre" } -ckb-snapshot = { path = "../util/snapshot", version = "= 0.37.0-pre" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.37.0-pre" } -ckb-verification = { path = "../verification", version = "= 0.37.0-pre" } -ckb-notify = { path = "../notify", version = "= 0.37.0-pre" } -ckb-app-config = { path = "../util/app-config", version = "= 0.37.0-pre" } -ckb-db-migration = { path = "../db-migration", version = "= 0.37.0-pre" } +ckb-error = { path = "../error", version = "= 0.38.0-pre" } +ckb-snapshot = { path = "../util/snapshot", version = "= 0.38.0-pre" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.38.0-pre" } +ckb-verification = { path = "../verification", version = "= 0.38.0-pre" } +ckb-notify = { path = "../notify", version = "= 0.38.0-pre" } +ckb-app-config = { path = "../util/app-config", version = "= 0.38.0-pre" } +ckb-db-migration = { path = "../db-migration", version = "= 0.38.0-pre" } num_cpus = "1.10" diff --git a/spec/Cargo.toml b/spec/Cargo.toml index ebc8f3bd92b..ad034161c4b 100644 --- a/spec/Cargo.toml +++ b/spec/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain-spec" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -11,13 +11,13 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] serde = { version = "1.0", features = ["derive"] } toml = "0.5" -ckb-types = { path = "../util/types", version = "= 0.37.0-pre" } -ckb-pow = { path = "../pow", version = "= 0.37.0-pre" } -ckb-resource = { path = "../resource", version = "= 0.37.0-pre" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.37.0-pre" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.37.0-pre" } -ckb-rational = { path = "../util/rational", version = "= 0.37.0-pre" } -ckb-crypto = { path = "../util/crypto", version = "= 0.37.0-pre"} -ckb-hash = { path = "../util/hash", version = "= 0.37.0-pre"} +ckb-types = { path = "../util/types", version = "= 0.38.0-pre" } +ckb-pow = { path = "../pow", version = "= 0.38.0-pre" } +ckb-resource = { path = "../resource", version = "= 0.38.0-pre" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.38.0-pre" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.38.0-pre" } +ckb-rational = { path = "../util/rational", version = "= 0.38.0-pre" } +ckb-crypto = { path = "../util/crypto", version = "= 0.38.0-pre"} +ckb-hash = { path = "../util/hash", version = "= 0.38.0-pre"} failure = "0.1.5" -ckb-error = { path = "../error", version = "= 0.37.0-pre" } +ckb-error = { path = "../error", version = "= 0.38.0-pre" } diff --git a/store/Cargo.toml b/store/Cargo.toml index 151bf43bb85..b736e3adf73 100644 --- a/store/Cargo.toml +++ b/store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-store" -version = "0.37.0-pre" +version = "0.38.0-pre" authors = ["Nervos Core Dev "] edition = "2018" license = "MIT" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.37.0-pre" } -ckb-db = { path = "../db", version = "= 0.37.0-pre" } -ckb-chain-spec = { path = "../spec", version = "= 0.37.0-pre" } +ckb-types = { path = "../util/types", version = "= 0.38.0-pre" } +ckb-db = { path = "../db", version = "= 0.38.0-pre" } +ckb-chain-spec = { path = "../spec", version = "= 0.38.0-pre" } lru = "0.6.0" -ckb-traits = { path = "../traits", version = "= 0.37.0-pre" } -ckb-util = { path = "../util", version = "= 0.37.0-pre" } -ckb-error = { path = "../error", version = "= 0.37.0-pre" } -ckb-app-config = { path = "../util/app-config", version = "= 0.37.0-pre" } +ckb-traits = { path = "../traits", version = "= 0.38.0-pre" } +ckb-util = { path = "../util", version = "= 0.38.0-pre" } +ckb-error = { path = "../error", version = "= 0.38.0-pre" } +ckb-app-config = { path = "../util/app-config", version = "= 0.38.0-pre" } diff --git a/sync/Cargo.toml b/sync/Cargo.toml index 1ab18152d5f..c36d4440482 100644 --- a/sync/Cargo.toml +++ b/sync/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-sync" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -9,37 +9,37 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-chain = { path = "../chain", version = "= 0.37.0-pre" } -ckb-shared = { path = "../shared", version = "= 0.37.0-pre" } -ckb-store = { path = "../store", version = "= 0.37.0-pre" } -ckb-db = { path = "../db", version = "= 0.37.0-pre" } -ckb-app-config = {path = "../util/app-config", version = "= 0.37.0-pre"} -ckb-types = {path = "../util/types", version = "= 0.37.0-pre"} -ckb-network = { path = "../network", version = "= 0.37.0-pre" } -ckb-logger = {path = "../util/logger", version = "= 0.37.0-pre"} -ckb-metrics = {path = "../util/metrics", version = "= 0.37.0-pre"} -ckb-util = { path = "../util", version = "= 0.37.0-pre" } +ckb-chain = { path = "../chain", version = "= 0.38.0-pre" } +ckb-shared = { path = "../shared", version = "= 0.38.0-pre" } +ckb-store = { path = "../store", version = "= 0.38.0-pre" } +ckb-db = { path = "../db", version = "= 0.38.0-pre" } +ckb-app-config = {path = "../util/app-config", version = "= 0.38.0-pre"} +ckb-types = {path = "../util/types", version = "= 0.38.0-pre"} +ckb-network = { path = "../network", version = "= 0.38.0-pre" } +ckb-logger = {path = "../util/logger", version = "= 0.38.0-pre"} +ckb-metrics = {path = "../util/metrics", version = "= 0.38.0-pre"} +ckb-util = { path = "../util", version = "= 0.38.0-pre" } faketime = "0.2.0" bitflags = "1.0" -ckb-verification = { path = "../verification", version = "= 0.37.0-pre" } -ckb-chain-spec = { path = "../spec", version = "= 0.37.0-pre" } -ckb-channel = { path = "../util/channel", version = "= 0.37.0-pre" } -ckb-traits = { path = "../traits", version = "= 0.37.0-pre" } +ckb-verification = { path = "../verification", version = "= 0.38.0-pre" } +ckb-chain-spec = { path = "../spec", version = "= 0.38.0-pre" } +ckb-channel = { path = "../util/channel", version = "= 0.38.0-pre" } +ckb-traits = { path = "../traits", version = "= 0.38.0-pre" } failure = "0.1.5" lru = "0.6.0" sentry = "0.17.0" futures = "0.3" -ckb-error = {path = "../error", version = "= 0.37.0-pre"} -ckb-tx-pool = { path = "../tx-pool", version = "= 0.37.0-pre" } -ckb-fee-estimator = { path = "../util/fee-estimator", version = "= 0.37.0-pre" } +ckb-error = {path = "../error", version = "= 0.38.0-pre"} +ckb-tx-pool = { path = "../tx-pool", version = "= 0.38.0-pre" } +ckb-fee-estimator = { path = "../util/fee-estimator", version = "= 0.38.0-pre" } ratelimit_meter = "5.0" tempfile = "3.0" [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.37.0-pre" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.38.0-pre" } rand = "0.6" -ckb-dao = { path = "../util/dao", version = "= 0.37.0-pre" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.37.0-pre" } +ckb-dao = { path = "../util/dao", version = "= 0.38.0-pre" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.38.0-pre" } [features] default = [] diff --git a/test/Cargo.toml b/test/Cargo.toml index dfdb52af37a..c2d94c6cb45 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-test" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -11,21 +11,21 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] clap = { version = "2" } toml = "0.5.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.37.0-pre" } -ckb-app-config = { path = "../util/app-config", version = "= 0.37.0-pre" } -ckb-network = { path = "../network", version = "= 0.37.0-pre" } -ckb-channel = { path = "../util/channel", version = "= 0.37.0-pre" } -ckb-sync = { path = "../sync", version = "= 0.37.0-pre" } -ckb-fee-estimator = { path = "../util/fee-estimator", version = "= 0.37.0-pre" } -ckb-types = { path = "../util/types", version = "= 0.37.0-pre" } -ckb-hash = { path = "../util/hash", version = "= 0.37.0-pre" } -ckb-util = { path = "../util", version = "= 0.37.0-pre" } -ckb-chain-spec = { path = "../spec", version = "= 0.37.0-pre" } -ckb-crypto = { path = "../util/crypto", version = "= 0.37.0-pre" } -ckb-dao = { path = "../util/dao", version = "= 0.37.0-pre" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.37.0-pre" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.37.0-pre" } -ckb-resource = { path = "../resource", version = "= 0.37.0-pre" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.38.0-pre" } +ckb-app-config = { path = "../util/app-config", version = "= 0.38.0-pre" } +ckb-network = { path = "../network", version = "= 0.38.0-pre" } +ckb-channel = { path = "../util/channel", version = "= 0.38.0-pre" } +ckb-sync = { path = "../sync", version = "= 0.38.0-pre" } +ckb-fee-estimator = { path = "../util/fee-estimator", version = "= 0.38.0-pre" } +ckb-types = { path = "../util/types", version = "= 0.38.0-pre" } +ckb-hash = { path = "../util/hash", version = "= 0.38.0-pre" } +ckb-util = { path = "../util", version = "= 0.38.0-pre" } +ckb-chain-spec = { path = "../spec", version = "= 0.38.0-pre" } +ckb-crypto = { path = "../util/crypto", version = "= 0.38.0-pre" } +ckb-dao = { path = "../util/dao", version = "= 0.38.0-pre" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.38.0-pre" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.38.0-pre" } +ckb-resource = { path = "../resource", version = "= 0.38.0-pre" } tempfile = "3.0" reqwest = "0.9" rand = "0.6" diff --git a/traits/Cargo.toml b/traits/Cargo.toml index 7f1263c23ca..0b6f85d91e0 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-traits" -version = "0.37.0-pre" +version = "0.38.0-pre" authors = ["Nervos Core Dev "] edition = "2018" license = "MIT" @@ -9,4 +9,4 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.37.0-pre" } +ckb-types = { path = "../util/types", version = "= 0.38.0-pre" } diff --git a/tx-pool/Cargo.toml b/tx-pool/Cargo.toml index 6f0e2ae6036..5f4fc7e1cde 100644 --- a/tx-pool/Cargo.toml +++ b/tx-pool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-tx-pool" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -11,23 +11,23 @@ repository = "https://github.com/nervosnetwork/ckb" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ckb-types = { path = "../util/types", version = "= 0.37.0-pre" } -ckb-logger = {path = "../util/logger", version = "= 0.37.0-pre"} -ckb-verification = { path = "../verification", version = "= 0.37.0-pre" } +ckb-types = { path = "../util/types", version = "= 0.38.0-pre" } +ckb-logger = {path = "../util/logger", version = "= 0.38.0-pre"} +ckb-verification = { path = "../verification", version = "= 0.38.0-pre" } failure = "0.1.5" faketime = "0.2" lru = "0.6.0" -ckb-dao = { path = "../util/dao", version = "= 0.37.0-pre" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.37.0-pre" } -ckb-store = { path = "../store", version = "= 0.37.0-pre" } -ckb-util = { path = "../util", version = "= 0.37.0-pre" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.37.0-pre" } -ckb-chain-spec = { path = "../spec", version = "= 0.37.0-pre" } -ckb-snapshot = { path = "../util/snapshot", version = "= 0.37.0-pre" } -ckb-error = { path = "../error", version = "= 0.37.0-pre" } +ckb-dao = { path = "../util/dao", version = "= 0.38.0-pre" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.38.0-pre" } +ckb-store = { path = "../store", version = "= 0.38.0-pre" } +ckb-util = { path = "../util", version = "= 0.38.0-pre" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.38.0-pre" } +ckb-chain-spec = { path = "../spec", version = "= 0.38.0-pre" } +ckb-snapshot = { path = "../util/snapshot", version = "= 0.38.0-pre" } +ckb-error = { path = "../error", version = "= 0.38.0-pre" } tokio = { version = "0.2", features = ["sync", "blocking", "rt-threaded", "macros"] } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.37.0-pre" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.37.0-pre" } -ckb-fee-estimator = { path = "../util/fee-estimator", version = "= 0.37.0-pre" } -ckb-app-config = { path = "../util/app-config", version = "= 0.37.0-pre" } -ckb-notify = { path = "../notify", version = "= 0.37.0-pre" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.38.0-pre" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.38.0-pre" } +ckb-fee-estimator = { path = "../util/fee-estimator", version = "= 0.38.0-pre" } +ckb-app-config = { path = "../util/app-config", version = "= 0.38.0-pre" } +ckb-notify = { path = "../notify", version = "= 0.38.0-pre" } diff --git a/util/Cargo.toml b/util/Cargo.toml index 61adedbd389..a63de5bc9bf 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-util" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -14,7 +14,7 @@ linked-hash-map = "0.5" regex = "1.1.6" [dev-dependencies] -ckb-fixed-hash = { path = "fixed-hash", version = "= 0.37.0-pre" } +ckb-fixed-hash = { path = "fixed-hash", version = "= 0.38.0-pre" } [features] deadlock_detection = ["parking_lot/deadlock_detection"] diff --git a/util/app-config/Cargo.toml b/util/app-config/Cargo.toml index c2fedc17c91..d9e20681d2e 100644 --- a/util/app-config/Cargo.toml +++ b/util/app-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-app-config" -version = "0.37.0-pre" +version = "0.38.0-pre" authors = ["Nervos Core Dev "] edition = "2018" license = "MIT" @@ -14,17 +14,17 @@ serde = { version = "1.0", features = ["derive"] } serde_plain = "0.3.0" toml = "0.5" path-clean = "0.1.0" -ckb-logger = { path = "../../util/logger", version = "= 0.37.0-pre" } -ckb-logger-config = { path = "../../util/logger-config", version = "= 0.37.0-pre" } -ckb-metrics-config = { path = "../../util/metrics-config", version = "= 0.37.0-pre" } +ckb-logger = { path = "../../util/logger", version = "= 0.38.0-pre" } +ckb-logger-config = { path = "../../util/logger-config", version = "= 0.38.0-pre" } +ckb-metrics-config = { path = "../../util/metrics-config", version = "= 0.38.0-pre" } sentry = "0.17.0" -ckb-chain-spec = {path = "../../spec", version = "= 0.37.0-pre"} -ckb-jsonrpc-types = {path = "../jsonrpc-types", version = "= 0.37.0-pre"} -ckb-pow = { path = "../../pow", version = "= 0.37.0-pre" } -ckb-resource = { path = "../../resource", version = "= 0.37.0-pre"} -ckb-build-info = { path = "../build-info", version = "= 0.37.0-pre" } -ckb-types = { path = "../types", version = "= 0.37.0-pre" } -ckb-fee-estimator = { path = "../fee-estimator", version = "= 0.37.0-pre" } +ckb-chain-spec = {path = "../../spec", version = "= 0.38.0-pre"} +ckb-jsonrpc-types = {path = "../jsonrpc-types", version = "= 0.38.0-pre"} +ckb-pow = { path = "../../pow", version = "= 0.38.0-pre" } +ckb-resource = { path = "../../resource", version = "= 0.38.0-pre"} +ckb-build-info = { path = "../build-info", version = "= 0.38.0-pre" } +ckb-types = { path = "../types", version = "= 0.38.0-pre" } +ckb-fee-estimator = { path = "../fee-estimator", version = "= 0.38.0-pre" } secio = { version="= 0.4.0", features = ["molc"], package="tentacle-secio" } multiaddr = { version="0.1.0", package="tentacle-multiaddr" } rand = "0.6" diff --git a/util/build-info/Cargo.toml b/util/build-info/Cargo.toml index 0233801c52a..599e0d1fdef 100644 --- a/util/build-info/Cargo.toml +++ b/util/build-info/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-build-info" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" diff --git a/util/chain-iter/Cargo.toml b/util/chain-iter/Cargo.toml index cda6dda89cf..18e0623951b 100644 --- a/util/chain-iter/Cargo.toml +++ b/util/chain-iter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain-iter" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -11,5 +11,5 @@ repository = "https://github.com/nervosnetwork/ckb" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ckb-types = { path = "../types", version = "= 0.37.0-pre" } -ckb-store = { path = "../../store", version = "= 0.37.0-pre" } +ckb-types = { path = "../types", version = "= 0.38.0-pre" } +ckb-store = { path = "../../store", version = "= 0.38.0-pre" } diff --git a/util/channel/Cargo.toml b/util/channel/Cargo.toml index e20d5ce633d..b5e4ab5d52d 100644 --- a/util/channel/Cargo.toml +++ b/util/channel/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-channel" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" diff --git a/util/crypto/Cargo.toml b/util/crypto/Cargo.toml index 689ef9e58b2..31fd9a57013 100644 --- a/util/crypto/Cargo.toml +++ b/util/crypto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-crypto" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -9,7 +9,7 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.37.0-pre" } +ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.38.0-pre" } lazy_static = "1.3" secp256k1 = { version = "0.17", features = ["recovery"], optional = true } failure = "0.1.5" diff --git a/util/dao/Cargo.toml b/util/dao/Cargo.toml index 33a7a131ecf..86c7525d549 100644 --- a/util/dao/Cargo.toml +++ b/util/dao/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-dao" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -10,12 +10,12 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../types", version = "= 0.37.0-pre" } -ckb-chain-spec = { path = "../../spec", version = "= 0.37.0-pre" } -ckb-store = { path = "../../store", version = "= 0.37.0-pre" } -ckb-dao-utils = { path = "./utils", version = "= 0.37.0-pre" } -ckb-error = { path = "../../error", version = "= 0.37.0-pre" } -ckb-traits = { path = "../../traits", version = "= 0.37.0-pre" } +ckb-types = { path = "../types", version = "= 0.38.0-pre" } +ckb-chain-spec = { path = "../../spec", version = "= 0.38.0-pre" } +ckb-store = { path = "../../store", version = "= 0.38.0-pre" } +ckb-dao-utils = { path = "./utils", version = "= 0.38.0-pre" } +ckb-error = { path = "../../error", version = "= 0.38.0-pre" } +ckb-traits = { path = "../../traits", version = "= 0.38.0-pre" } [dev-dependencies] -ckb-db = { path = "../../db", version = "= 0.37.0-pre" } +ckb-db = { path = "../../db", version = "= 0.38.0-pre" } diff --git a/util/dao/utils/Cargo.toml b/util/dao/utils/Cargo.toml index 6515bfdc302..6eb16c5b642 100644 --- a/util/dao/utils/Cargo.toml +++ b/util/dao/utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-dao-utils" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -10,7 +10,7 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../../types", version = "= 0.37.0-pre" } -ckb-error = { path = "../../../error", version = "= 0.37.0-pre" } +ckb-types = { path = "../../types", version = "= 0.38.0-pre" } +ckb-error = { path = "../../../error", version = "= 0.38.0-pre" } failure = "0.1.5" enum-display-derive = "0.1.0" diff --git a/util/fee-estimator/Cargo.toml b/util/fee-estimator/Cargo.toml index c7efed4d3b5..69adc8037a5 100644 --- a/util/fee-estimator/Cargo.toml +++ b/util/fee-estimator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-fee-estimator" -version = "0.37.0-pre" +version = "0.38.0-pre" authors = ["Nervos Core Dev "] edition = "2018" license = "MIT" @@ -11,6 +11,6 @@ repository = "https://github.com/nervosnetwork/ckb" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ckb-types = { path = "../types", version = "= 0.37.0-pre" } -ckb-logger = { path = "../logger", version = "= 0.37.0-pre" } +ckb-types = { path = "../types", version = "= 0.38.0-pre" } +ckb-logger = { path = "../logger", version = "= 0.38.0-pre" } serde = { version = "1.0", features = ["derive"] } diff --git a/util/fixed-hash/Cargo.toml b/util/fixed-hash/Cargo.toml index 314498857d1..0694af31c1c 100644 --- a/util/fixed-hash/Cargo.toml +++ b/util/fixed-hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-fixed-hash" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos "] edition = "2018" @@ -9,5 +9,5 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-fixed-hash-core = { path = "core", version = "= 0.37.0-pre" } -ckb-fixed-hash-macros = { path = "macros", version = "= 0.37.0-pre" } +ckb-fixed-hash-core = { path = "core", version = "= 0.38.0-pre" } +ckb-fixed-hash-macros = { path = "macros", version = "= 0.38.0-pre" } diff --git a/util/fixed-hash/core/Cargo.toml b/util/fixed-hash/core/Cargo.toml index fab3013de3c..9e8dfce7f58 100644 --- a/util/fixed-hash/core/Cargo.toml +++ b/util/fixed-hash/core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-fixed-hash-core" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos "] edition = "2018" diff --git a/util/fixed-hash/macros/Cargo.toml b/util/fixed-hash/macros/Cargo.toml index cd4daec5359..10b1923d8dd 100644 --- a/util/fixed-hash/macros/Cargo.toml +++ b/util/fixed-hash/macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-fixed-hash-macros" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos "] edition = "2018" @@ -12,7 +12,7 @@ repository = "https://github.com/nervosnetwork/ckb" proc-macro = true [dependencies] -ckb-fixed-hash-core = { path = "../core", version = "= 0.37.0-pre" } +ckb-fixed-hash-core = { path = "../core", version = "= 0.38.0-pre" } quote = "0.6" syn = "0.15" proc-macro2 = "0.4" diff --git a/util/hash/Cargo.toml b/util/hash/Cargo.toml index 6dd3e79350d..988e5f08cbd 100644 --- a/util/hash/Cargo.toml +++ b/util/hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-hash" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" diff --git a/util/instrument/Cargo.toml b/util/instrument/Cargo.toml index d4303890d0c..6f79c3ff983 100644 --- a/util/instrument/Cargo.toml +++ b/util/instrument/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-instrument" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.37.0-pre" } -ckb-chain = { path = "../../chain", version = "= 0.37.0-pre" } -ckb-chain-iter = { path = "../chain-iter", version = "= 0.37.0-pre" } -ckb-shared = { path = "../../shared", version = "= 0.37.0-pre" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.37.0-pre" } +ckb-types = { path = "../types", version = "= 0.38.0-pre" } +ckb-chain = { path = "../../chain", version = "= 0.38.0-pre" } +ckb-chain-iter = { path = "../chain-iter", version = "= 0.38.0-pre" } +ckb-shared = { path = "../../shared", version = "= 0.38.0-pre" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.38.0-pre" } serde_json = "1.0" indicatif = { version = "0.15", optional = true } diff --git a/util/jsonrpc-types/Cargo.toml b/util/jsonrpc-types/Cargo.toml index 5f19164f89b..9a33a78167c 100644 --- a/util/jsonrpc-types/Cargo.toml +++ b/util/jsonrpc-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-jsonrpc-types" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -9,7 +9,7 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.37.0-pre" } +ckb-types = { path = "../types", version = "= 0.38.0-pre" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" faster-hex = "0.4" diff --git a/util/logger-config/Cargo.toml b/util/logger-config/Cargo.toml index 27b5eac0003..6eb1ef9672c 100644 --- a/util/logger-config/Cargo.toml +++ b/util/logger-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger-config" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos "] edition = "2018" diff --git a/util/logger-service/Cargo.toml b/util/logger-service/Cargo.toml index cbae2df84ef..1cc6f48d996 100644 --- a/util/logger-service/Cargo.toml +++ b/util/logger-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger-service" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos "] edition = "2018" @@ -9,9 +9,9 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-util = { path = "..", version = "= 0.37.0-pre" } -ckb-logger-config = { path = "../logger-config", version = "= 0.37.0-pre" } -ckb-channel = { path = "../channel", version = "= 0.37.0-pre" } +ckb-util = { path = "..", version = "= 0.38.0-pre" } +ckb-logger-config = { path = "../logger-config", version = "= 0.38.0-pre" } +ckb-channel = { path = "../channel", version = "= 0.38.0-pre" } ansi_term = "0.12" log = "0.4" env_logger = "0.6" diff --git a/util/logger/Cargo.toml b/util/logger/Cargo.toml index 5ddc2cee9bb..926e5ac247b 100644 --- a/util/logger/Cargo.toml +++ b/util/logger/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos "] edition = "2018" diff --git a/util/memory-tracker/Cargo.toml b/util/memory-tracker/Cargo.toml index 78fc8c075fc..29ac84df903 100644 --- a/util/memory-tracker/Cargo.toml +++ b/util/memory-tracker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-memory-tracker" -version = "0.37.0-pre" +version = "0.38.0-pre" authors = ["Nervos Core Dev "] edition = "2018" license = "MIT" @@ -9,9 +9,9 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../logger", version = "= 0.37.0-pre" } -ckb-metrics = { path = "../metrics", version = "= 0.37.0-pre" } -ckb-db = { path = "../../db", version = "= 0.37.0-pre" } +ckb-logger = { path = "../logger", version = "= 0.38.0-pre" } +ckb-metrics = { path = "../metrics", version = "= 0.38.0-pre" } +ckb-db = { path = "../../db", version = "= 0.38.0-pre" } # TODO Why don't disable this crate by "target.*" in the crates which are dependent on this crate? # diff --git a/util/metrics-config/Cargo.toml b/util/metrics-config/Cargo.toml index 553e928e00c..9f73de50591 100644 --- a/util/metrics-config/Cargo.toml +++ b/util/metrics-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics-config" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos "] edition = "2018" diff --git a/util/metrics-service/Cargo.toml b/util/metrics-service/Cargo.toml index fd347d9e589..e32d988ebea 100644 --- a/util/metrics-service/Cargo.toml +++ b/util/metrics-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics-service" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos "] edition = "2018" @@ -9,10 +9,10 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-metrics-config = { path = "../metrics-config", version = "= 0.37.0-pre" } -ckb-async-runtime = { path = "../runtime", version = "= 0.37.0-pre" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.37.0-pre" } -ckb-util = { path = "..", version = "= 0.37.0-pre" } +ckb-metrics-config = { path = "../metrics-config", version = "= 0.38.0-pre" } +ckb-async-runtime = { path = "../runtime", version = "= 0.38.0-pre" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.38.0-pre" } +ckb-util = { path = "..", version = "= 0.38.0-pre" } metrics-runtime = "~0.13.1" metrics-core = "~0.5.2" log = "0.4" diff --git a/util/metrics/Cargo.toml b/util/metrics/Cargo.toml index e9ffecce477..70854d7ffca 100644 --- a/util/metrics/Cargo.toml +++ b/util/metrics/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos "] edition = "2018" diff --git a/util/multisig/Cargo.toml b/util/multisig/Cargo.toml index 5c70bfe0b7a..27eb0ad8e36 100644 --- a/util/multisig/Cargo.toml +++ b/util/multisig/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-multisig" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -9,8 +9,8 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../logger", version = "= 0.37.0-pre" } -ckb-crypto = { path = "../crypto", version = "= 0.37.0-pre" } +ckb-logger = { path = "../logger", version = "= 0.38.0-pre" } +ckb-crypto = { path = "../crypto", version = "= 0.38.0-pre" } failure = "0.1.5" [dev-dependencies] diff --git a/util/network-alert/Cargo.toml b/util/network-alert/Cargo.toml index 0fdb34a6948..8a55c249e65 100644 --- a/util/network-alert/Cargo.toml +++ b/util/network-alert/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-network-alert" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -9,18 +9,18 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-multisig = { path = "../multisig", version = "= 0.37.0-pre" } -ckb-types = { path = "../types", version = "= 0.37.0-pre" } -ckb-util = { path = "..", version = "= 0.37.0-pre" } -ckb-network = { path = "../../network", version = "= 0.37.0-pre" } -ckb-notify = { path = "../../notify", version = "= 0.37.0-pre"} -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.37.0-pre" } -ckb-logger = { path = "../logger", version = "= 0.37.0-pre"} -ckb-app-config = { path = "../app-config", version = "= 0.37.0-pre" } +ckb-multisig = { path = "../multisig", version = "= 0.38.0-pre" } +ckb-types = { path = "../types", version = "= 0.38.0-pre" } +ckb-util = { path = "..", version = "= 0.38.0-pre" } +ckb-network = { path = "../../network", version = "= 0.38.0-pre" } +ckb-notify = { path = "../../notify", version = "= 0.38.0-pre"} +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.38.0-pre" } +ckb-logger = { path = "../logger", version = "= 0.38.0-pre"} +ckb-app-config = { path = "../app-config", version = "= 0.38.0-pre" } faketime = "0.2.0" failure = "0.1.5" lru = "0.6" semver = "0.9" [dev-dependencies] -ckb-crypto = { path = "../crypto", version = "= 0.37.0-pre" } +ckb-crypto = { path = "../crypto", version = "= 0.38.0-pre" } diff --git a/util/occupied-capacity/Cargo.toml b/util/occupied-capacity/Cargo.toml index a713ae44402..2709aef0b35 100644 --- a/util/occupied-capacity/Cargo.toml +++ b/util/occupied-capacity/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-occupied-capacity" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -9,5 +9,5 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-occupied-capacity-macros = { path = "macros", version = "= 0.37.0-pre" } -ckb-occupied-capacity-core = { path = "core", version = "= 0.37.0-pre" } +ckb-occupied-capacity-macros = { path = "macros", version = "= 0.38.0-pre" } +ckb-occupied-capacity-core = { path = "core", version = "= 0.38.0-pre" } diff --git a/util/occupied-capacity/core/Cargo.toml b/util/occupied-capacity/core/Cargo.toml index 6e92346bfc5..376daba7447 100644 --- a/util/occupied-capacity/core/Cargo.toml +++ b/util/occupied-capacity/core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-occupied-capacity-core" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" diff --git a/util/occupied-capacity/macros/Cargo.toml b/util/occupied-capacity/macros/Cargo.toml index 64e2c52684e..38d52bacf36 100644 --- a/util/occupied-capacity/macros/Cargo.toml +++ b/util/occupied-capacity/macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-occupied-capacity-macros" -version = "0.37.0-pre" +version = "0.38.0-pre" authors = ["Nervos Core Dev "] edition = "2018" license = "MIT" @@ -14,4 +14,4 @@ proc-macro = true [dependencies] quote = "0.6" syn = "0.15" -ckb-occupied-capacity-core = { path = "../core", version = "= 0.37.0-pre" } +ckb-occupied-capacity-core = { path = "../core", version = "= 0.38.0-pre" } diff --git a/util/proposal-table/Cargo.toml b/util/proposal-table/Cargo.toml index a0f93851912..42292dd77b3 100644 --- a/util/proposal-table/Cargo.toml +++ b/util/proposal-table/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-proposal-table" -version = "0.37.0-pre" +version = "0.38.0-pre" authors = ["Nervos Core Dev "] edition = "2018" license = "MIT" @@ -10,6 +10,6 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../logger", version = "= 0.37.0-pre" } -ckb-chain-spec = { path = "../../spec", version = "= 0.37.0-pre" } -ckb-types = { path = "../types", version = "= 0.37.0-pre" } +ckb-logger = { path = "../logger", version = "= 0.38.0-pre" } +ckb-chain-spec = { path = "../../spec", version = "= 0.38.0-pre" } +ckb-types = { path = "../types", version = "= 0.38.0-pre" } diff --git a/util/rational/Cargo.toml b/util/rational/Cargo.toml index edbf74612e9..9b87856f38c 100644 --- a/util/rational/Cargo.toml +++ b/util/rational/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-rational" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" diff --git a/util/reward-calculator/Cargo.toml b/util/reward-calculator/Cargo.toml index 7f11607db52..f57f1683a7c 100644 --- a/util/reward-calculator/Cargo.toml +++ b/util/reward-calculator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-reward-calculator" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -9,13 +9,13 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.37.0-pre" } -ckb-store = { path = "../../store", version = "= 0.37.0-pre" } -ckb-dao = { path = "../dao", version = "= 0.37.0-pre" } -ckb-logger = { path = "../logger", version = "= 0.37.0-pre" } -ckb-chain-spec = {path = "../../spec", version = "= 0.37.0-pre"} -ckb-error = { path = "../../error", version = "= 0.37.0-pre" } +ckb-types = { path = "../types", version = "= 0.38.0-pre" } +ckb-store = { path = "../../store", version = "= 0.38.0-pre" } +ckb-dao = { path = "../dao", version = "= 0.38.0-pre" } +ckb-logger = { path = "../logger", version = "= 0.38.0-pre" } +ckb-chain-spec = {path = "../../spec", version = "= 0.38.0-pre"} +ckb-error = { path = "../../error", version = "= 0.38.0-pre" } [dev-dependencies] -ckb-db = { path = "../../db", version = "= 0.37.0-pre" } -ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.37.0-pre" } +ckb-db = { path = "../../db", version = "= 0.38.0-pre" } +ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.38.0-pre" } diff --git a/util/runtime/Cargo.toml b/util/runtime/Cargo.toml index 159921413fc..d2eeba87fad 100644 --- a/util/runtime/Cargo.toml +++ b/util/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-async-runtime" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" diff --git a/util/rust-unstable-port/Cargo.toml b/util/rust-unstable-port/Cargo.toml index fb30434dee5..9793ae80fa7 100644 --- a/util/rust-unstable-port/Cargo.toml +++ b/util/rust-unstable-port/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-rust-unstable-port" -version = "0.37.0-pre" +version = "0.38.0-pre" authors = ["Nervos Core Dev "] edition = "2018" license = "MIT" diff --git a/util/snapshot/Cargo.toml b/util/snapshot/Cargo.toml index eb14e496ae3..b4e81adca21 100644 --- a/util/snapshot/Cargo.toml +++ b/util/snapshot/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-snapshot" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -11,12 +11,12 @@ repository = "https://github.com/nervosnetwork/ckb" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ckb-types = { path = "../types", version = "= 0.37.0-pre" } -ckb-chain-spec = { path = "../../spec", version = "= 0.37.0-pre" } -ckb-store = { path = "../../store", version = "= 0.37.0-pre" } -ckb-db = { path = "../../db", version = "= 0.37.0-pre" } -ckb-traits = { path = "../../traits", version = "= 0.37.0-pre" } -ckb-error = { path = "../../error", version = "= 0.37.0-pre" } -ckb-proposal-table = { path = "../proposal-table", version = "= 0.37.0-pre" } +ckb-types = { path = "../types", version = "= 0.38.0-pre" } +ckb-chain-spec = { path = "../../spec", version = "= 0.38.0-pre" } +ckb-store = { path = "../../store", version = "= 0.38.0-pre" } +ckb-db = { path = "../../db", version = "= 0.38.0-pre" } +ckb-traits = { path = "../../traits", version = "= 0.38.0-pre" } +ckb-error = { path = "../../error", version = "= 0.38.0-pre" } +ckb-proposal-table = { path = "../proposal-table", version = "= 0.38.0-pre" } arc-swap = "0.4" -ckb-reward-calculator = { path = "../reward-calculator", version = "= 0.37.0-pre" } +ckb-reward-calculator = { path = "../reward-calculator", version = "= 0.38.0-pre" } diff --git a/util/stop-handler/Cargo.toml b/util/stop-handler/Cargo.toml index 88ff67c08e1..c776050944b 100644 --- a/util/stop-handler/Cargo.toml +++ b/util/stop-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-stop-handler" -version = "0.37.0-pre" +version = "0.38.0-pre" authors = ["Nervos Core Dev "] edition = "2018" license = "MIT" @@ -10,7 +10,7 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] parking_lot = "=0.7.1" -ckb-logger = { path = "../logger", version = "= 0.37.0-pre" } +ckb-logger = { path = "../logger", version = "= 0.38.0-pre" } futures = "0.1" tokio = { version = "0.2", features = ["sync", "blocking", "rt-threaded"] } -ckb-channel = { path = "../channel", version = "= 0.37.0-pre" } +ckb-channel = { path = "../channel", version = "= 0.38.0-pre" } diff --git a/util/test-chain-utils/Cargo.toml b/util/test-chain-utils/Cargo.toml index 576f992b08a..ef8a020f489 100644 --- a/util/test-chain-utils/Cargo.toml +++ b/util/test-chain-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-test-chain-utils" -version = "0.37.0-pre" +version = "0.38.0-pre" authors = ["Nervos Core Dev "] edition = "2018" license = "MIT" @@ -9,13 +9,13 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = {path = "../types", version = "= 0.37.0-pre"} -ckb-db = { path = "../../db", version = "= 0.37.0-pre" } -ckb-store = { path = "../../store", version = "= 0.37.0-pre" } -ckb-chain-spec = { path = "../../spec", version = "= 0.37.0-pre" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.37.0-pre" } -ckb-traits = { path = "../../traits", version = "= 0.37.0-pre" } -ckb-error = { path = "../../error", version = "= 0.37.0-pre" } +ckb-types = {path = "../types", version = "= 0.38.0-pre"} +ckb-db = { path = "../../db", version = "= 0.38.0-pre" } +ckb-store = { path = "../../store", version = "= 0.38.0-pre" } +ckb-chain-spec = { path = "../../spec", version = "= 0.38.0-pre" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.38.0-pre" } +ckb-traits = { path = "../../traits", version = "= 0.38.0-pre" } +ckb-error = { path = "../../error", version = "= 0.38.0-pre" } lazy_static = "1.3.0" faketime = "0.2.0" -ckb-resource = { path = "../../resource", version = "= 0.37.0-pre" } +ckb-resource = { path = "../../resource", version = "= 0.38.0-pre" } diff --git a/util/types/Cargo.toml b/util/types/Cargo.toml index 737db0641e1..d16fe87df71 100644 --- a/util/types/Cargo.toml +++ b/util/types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-types" -version = "0.37.0-pre" +version = "0.38.0-pre" authors = ["Nervos Core Dev "] edition = "2018" license = "MIT" @@ -10,17 +10,17 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] molecule = "=0.6.0" -ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.37.0-pre" } +ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.38.0-pre" } numext-fixed-uint = { version = "0.1", features = ["support_rand", "support_heapsize", "support_serde"] } bytes = { version="0.5.4", features = ["serde"] } merkle-cbt = "0.3" -ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.37.0-pre" } -ckb-hash = { path = "../hash", version = "= 0.37.0-pre" } -ckb-channel = { path = "../channel", version = "= 0.37.0-pre" } +ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.38.0-pre" } +ckb-hash = { path = "../hash", version = "= 0.38.0-pre" } +ckb-channel = { path = "../channel", version = "= 0.38.0-pre" } bit-vec = "0.5.1" failure = "0.1.5" -ckb-error = { path = "../../error", version = "= 0.37.0-pre" } -ckb-rational = { path = "../rational", version = "= 0.37.0-pre" } +ckb-error = { path = "../../error", version = "= 0.38.0-pre" } +ckb-rational = { path = "../rational", version = "= 0.38.0-pre" } once_cell = "1.3.1" [dev-dependencies] diff --git a/verification/Cargo.toml b/verification/Cargo.toml index a2beb1e4183..baa900217e7 100644 --- a/verification/Cargo.toml +++ b/verification/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -9,28 +9,28 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.37.0-pre" } -ckb-store = { path = "../store", version = "= 0.37.0-pre" } -ckb-script = { path = "../script", version = "= 0.37.0-pre" } -ckb-pow = { path = "../pow", version = "= 0.37.0-pre" } +ckb-types = { path = "../util/types", version = "= 0.38.0-pre" } +ckb-store = { path = "../store", version = "= 0.38.0-pre" } +ckb-script = { path = "../script", version = "= 0.38.0-pre" } +ckb-pow = { path = "../pow", version = "= 0.38.0-pre" } faketime = "0.2.0" rayon = "1.0" lru = "0.6.0" -ckb-traits = { path = "../traits", version = "= 0.37.0-pre" } -ckb-chain-spec = { path = "../spec", version = "= 0.37.0-pre" } -ckb-dao = { path = "../util/dao", version = "= 0.37.0-pre" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.37.0-pre" } -ckb-logger = {path = "../util/logger", version = "= 0.37.0-pre"} -ckb-reward-calculator= { path = "../util/reward-calculator", version = "= 0.37.0-pre" } +ckb-traits = { path = "../traits", version = "= 0.38.0-pre" } +ckb-chain-spec = { path = "../spec", version = "= 0.38.0-pre" } +ckb-dao = { path = "../util/dao", version = "= 0.38.0-pre" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.38.0-pre" } +ckb-logger = {path = "../util/logger", version = "= 0.38.0-pre"} +ckb-reward-calculator= { path = "../util/reward-calculator", version = "= 0.38.0-pre" } failure = "0.1.5" -ckb-error = { path = "../error", version = "= 0.37.0-pre" } +ckb-error = { path = "../error", version = "= 0.38.0-pre" } enum-display-derive = "0.1.0" tokio = { version = "0.2", features = ["sync", "blocking", "rt-threaded"] } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.37.0-pre" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.38.0-pre" } [dev-dependencies] -ckb-chain = { path = "../chain", version = "= 0.37.0-pre" } -ckb-shared = { path = "../shared", version = "= 0.37.0-pre" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.37.0-pre" } -ckb-resource = { path = "../resource", version = "= 0.37.0-pre" } +ckb-chain = { path = "../chain", version = "= 0.38.0-pre" } +ckb-shared = { path = "../shared", version = "= 0.38.0-pre" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.38.0-pre" } +ckb-resource = { path = "../resource", version = "= 0.38.0-pre" } rand = "0.6" diff --git a/wasm-build-test/Cargo.toml b/wasm-build-test/Cargo.toml index 52fb8b35501..e80d6c7c124 100644 --- a/wasm-build-test/Cargo.toml +++ b/wasm-build-test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-wasm-test" -version = "0.37.0-pre" +version = "0.38.0-pre" license = "MIT" authors = ["Nervos Core Dev "] edition = "2018" @@ -9,8 +9,8 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.37.0-pre" } -ckb-script = { path = "../script", version = "= 0.37.0-pre", default-features = false, features = [] } +ckb-types = { path = "../util/types", version = "= 0.38.0-pre" } +ckb-script = { path = "../script", version = "= 0.38.0-pre", default-features = false, features = [] } # Prevent this from interfering with workspaces [workspace] From cd6fb15a375dd5ebf38acb131fe65e0c52014120 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 27 Oct 2020 21:22:13 +0000 Subject: [PATCH 11/11] chore(deps): bump libc from 0.2.77 to 0.2.80 Bumps [libc](https://github.com/rust-lang/libc) from 0.2.77 to 0.2.80. - [Release notes](https://github.com/rust-lang/libc/releases) - [Commits](https://github.com/rust-lang/libc/compare/0.2.77...0.2.80) Signed-off-by: dependabot-preview[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d505542ede8..3d885e64081 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2676,9 +2676,9 @@ checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" [[package]] name = "libc" -version = "0.2.77" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f96b10ec2560088a8e76961b00d47107b3a625fecb76dedb29ee7ccbf98235" +checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614" [[package]] name = "linked-hash-map"