From 41e7f01b552086ba855f95335dfa19cbde78a385 Mon Sep 17 00:00:00 2001 From: ian Date: Tue, 13 Jun 2023 15:04:33 +0800 Subject: [PATCH 001/125] chore: bump to v0.111.0-rc1 --- Cargo.lock | 136 +++++++++---------- Cargo.toml | 8 +- README.md | 2 +- benches/Cargo.toml | 36 ++--- block-filter/Cargo.toml | 14 +- chain/Cargo.toml | 52 +++---- ckb-bin/Cargo.toml | 46 +++---- db-migration/Cargo.toml | 12 +- db-schema/Cargo.toml | 2 +- db/Cargo.toml | 10 +- error/Cargo.toml | 4 +- freezer/Cargo.toml | 12 +- miner/Cargo.toml | 20 +-- network/Cargo.toml | 22 +-- notify/Cargo.toml | 12 +- pow/Cargo.toml | 6 +- resource/Cargo.toml | 6 +- rpc/Cargo.toml | 60 ++++---- script/Cargo.toml | 24 ++-- script/fuzz/Cargo.toml | 10 +- shared/Cargo.toml | 38 +++--- spec/Cargo.toml | 26 ++-- store/Cargo.toml | 20 +-- sync/Cargo.toml | 56 ++++---- test/Cargo.toml | 40 +++--- traits/Cargo.toml | 4 +- tx-pool/Cargo.toml | 44 +++--- util/Cargo.toml | 4 +- util/app-config/Cargo.toml | 24 ++-- util/build-info/Cargo.toml | 2 +- util/chain-iter/Cargo.toml | 6 +- util/channel/Cargo.toml | 2 +- util/constant/Cargo.toml | 2 +- util/crypto/Cargo.toml | 4 +- util/dao/Cargo.toml | 16 +-- util/dao/utils/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/indexer/Cargo.toml | 20 +-- util/instrument/Cargo.toml | 12 +- util/jsonrpc-types/Cargo.toml | 4 +- util/launcher/Cargo.toml | 68 +++++----- util/launcher/migration-template/Cargo.toml | 2 +- util/light-client-protocol-server/Cargo.toml | 32 ++--- util/logger-config/Cargo.toml | 2 +- util/logger-service/Cargo.toml | 10 +- util/logger/Cargo.toml | 2 +- util/memory-tracker/Cargo.toml | 8 +- util/metrics-config/Cargo.toml | 2 +- util/metrics-service/Cargo.toml | 12 +- util/metrics/Cargo.toml | 2 +- util/multisig/Cargo.toml | 8 +- util/network-alert/Cargo.toml | 30 ++-- 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 | 20 +-- util/runtime/Cargo.toml | 8 +- util/rust-unstable-port/Cargo.toml | 2 +- util/snapshot/Cargo.toml | 18 +-- util/spawn/Cargo.toml | 2 +- util/stop-handler/Cargo.toml | 6 +- util/systemtime/Cargo.toml | 2 +- util/test-chain-utils/Cargo.toml | 24 ++-- util/types/Cargo.toml | 16 +-- verification/Cargo.toml | 28 ++-- verification/contextual/Cargo.toml | 38 +++--- verification/traits/Cargo.toml | 4 +- wasm-build-test/Cargo.toml | 6 +- 73 files changed, 606 insertions(+), 606 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3ba4263737..9fcaa195d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -395,7 +395,7 @@ dependencies = [ [[package]] name = "ckb" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-bin", "ckb-build-info", @@ -404,7 +404,7 @@ dependencies = [ [[package]] name = "ckb-app-config" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-build-info", "ckb-chain-spec", @@ -433,7 +433,7 @@ dependencies = [ [[package]] name = "ckb-async-runtime" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-logger", "ckb-spawn", @@ -443,7 +443,7 @@ dependencies = [ [[package]] name = "ckb-benches" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-app-config", "ckb-chain", @@ -471,7 +471,7 @@ dependencies = [ [[package]] name = "ckb-bin" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "base64", "ckb-app-config", @@ -511,7 +511,7 @@ dependencies = [ [[package]] name = "ckb-block-filter" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-async-runtime", "ckb-logger", @@ -523,11 +523,11 @@ dependencies = [ [[package]] name = "ckb-build-info" -version = "0.111.0-pre" +version = "0.110.0-rc1" [[package]] name = "ckb-chain" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -561,7 +561,7 @@ dependencies = [ [[package]] name = "ckb-chain-iter" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-store", "ckb-types", @@ -569,7 +569,7 @@ dependencies = [ [[package]] name = "ckb-chain-spec" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-constant", "ckb-crypto", @@ -589,18 +589,18 @@ dependencies = [ [[package]] name = "ckb-channel" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "crossbeam-channel", ] [[package]] name = "ckb-constant" -version = "0.111.0-pre" +version = "0.110.0-rc1" [[package]] name = "ckb-crypto" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-fixed-hash", "faster-hex", @@ -612,7 +612,7 @@ dependencies = [ [[package]] name = "ckb-dao" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "byteorder", "ckb-chain-spec", @@ -627,7 +627,7 @@ dependencies = [ [[package]] name = "ckb-dao-utils" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "byteorder", "ckb-error", @@ -636,7 +636,7 @@ dependencies = [ [[package]] name = "ckb-db" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-app-config", "ckb-db-schema", @@ -649,7 +649,7 @@ dependencies = [ [[package]] name = "ckb-db-migration" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-app-config", "ckb-db", @@ -663,11 +663,11 @@ dependencies = [ [[package]] name = "ckb-db-schema" -version = "0.111.0-pre" +version = "0.110.0-rc1" [[package]] name = "ckb-error" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "anyhow", "ckb-occupied-capacity", @@ -677,7 +677,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-fixed-hash-core", "ckb-fixed-hash-macros", @@ -685,7 +685,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-core" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "faster-hex", "serde", @@ -695,7 +695,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-macros" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-fixed-hash-core", "proc-macro2", @@ -705,7 +705,7 @@ dependencies = [ [[package]] name = "ckb-freezer" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-error", "ckb-logger", @@ -721,7 +721,7 @@ dependencies = [ [[package]] name = "ckb-hash" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "blake2b-ref", "blake2b-rs", @@ -729,7 +729,7 @@ dependencies = [ [[package]] name = "ckb-indexer" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -751,7 +751,7 @@ dependencies = [ [[package]] name = "ckb-instrument" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-chain", "ckb-chain-iter", @@ -764,7 +764,7 @@ dependencies = [ [[package]] name = "ckb-jsonrpc-types" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-types", "faster-hex", @@ -777,7 +777,7 @@ dependencies = [ [[package]] name = "ckb-launcher" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -833,7 +833,7 @@ dependencies = [ [[package]] name = "ckb-light-client-protocol-server" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-app-config", "ckb-chain", @@ -856,14 +856,14 @@ dependencies = [ [[package]] name = "ckb-logger" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "log", ] [[package]] name = "ckb-logger-config" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "serde", "toml", @@ -871,7 +871,7 @@ dependencies = [ [[package]] name = "ckb-logger-service" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "backtrace", "ckb-channel", @@ -890,7 +890,7 @@ dependencies = [ [[package]] name = "ckb-memory-tracker" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-db", "ckb-logger", @@ -912,7 +912,7 @@ dependencies = [ [[package]] name = "ckb-metrics" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "once_cell", "prometheus", @@ -921,14 +921,14 @@ dependencies = [ [[package]] name = "ckb-metrics-config" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "serde", ] [[package]] name = "ckb-metrics-service" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-async-runtime", "ckb-logger", @@ -941,7 +941,7 @@ dependencies = [ [[package]] name = "ckb-migration-template" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "quote", "syn", @@ -949,7 +949,7 @@ dependencies = [ [[package]] name = "ckb-miner" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "base64", "ckb-app-config", @@ -978,7 +978,7 @@ dependencies = [ [[package]] name = "ckb-multisig" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-crypto", "ckb-error", @@ -988,7 +988,7 @@ dependencies = [ [[package]] name = "ckb-network" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "bitflags", "bloom-filters", @@ -1026,7 +1026,7 @@ dependencies = [ [[package]] name = "ckb-network-alert" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1050,7 +1050,7 @@ dependencies = [ [[package]] name = "ckb-notify" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1062,7 +1062,7 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-occupied-capacity-core", "ckb-occupied-capacity-macros", @@ -1070,14 +1070,14 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity-core" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "serde", ] [[package]] name = "ckb-occupied-capacity-macros" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-occupied-capacity-core", "quote", @@ -1086,7 +1086,7 @@ dependencies = [ [[package]] name = "ckb-pow" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "byteorder", "ckb-hash", @@ -1098,7 +1098,7 @@ dependencies = [ [[package]] name = "ckb-proposal-table" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-chain-spec", "ckb-logger", @@ -1107,7 +1107,7 @@ dependencies = [ [[package]] name = "ckb-rational" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "numext-fixed-uint", "proptest", @@ -1116,7 +1116,7 @@ dependencies = [ [[package]] name = "ckb-resource" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-system-scripts", "ckb-types", @@ -1130,7 +1130,7 @@ dependencies = [ [[package]] name = "ckb-reward-calculator" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-chain-spec", "ckb-dao", @@ -1157,7 +1157,7 @@ dependencies = [ [[package]] name = "ckb-rpc" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-app-config", "ckb-chain", @@ -1206,14 +1206,14 @@ dependencies = [ [[package]] name = "ckb-rust-unstable-port" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "is_sorted", ] [[package]] name = "ckb-script" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "byteorder", "ckb-chain-spec", @@ -1238,7 +1238,7 @@ dependencies = [ [[package]] name = "ckb-shared" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "arc-swap", "ckb-async-runtime", @@ -1262,7 +1262,7 @@ dependencies = [ [[package]] name = "ckb-snapshot" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "arc-swap", "ckb-chain-spec", @@ -1278,11 +1278,11 @@ dependencies = [ [[package]] name = "ckb-spawn" -version = "0.111.0-pre" +version = "0.110.0-rc1" [[package]] name = "ckb-stop-handler" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-channel", "ckb-logger", @@ -1292,7 +1292,7 @@ dependencies = [ [[package]] name = "ckb-store" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -1310,7 +1310,7 @@ dependencies = [ [[package]] name = "ckb-sync" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "bitflags", "ckb-app-config", @@ -1367,11 +1367,11 @@ dependencies = [ [[package]] name = "ckb-systemtime" -version = "0.111.0-pre" +version = "0.110.0-rc1" [[package]] name = "ckb-test-chain-utils" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-chain-spec", "ckb-dao-utils", @@ -1389,14 +1389,14 @@ dependencies = [ [[package]] name = "ckb-traits" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-types", ] [[package]] name = "ckb-tx-pool" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1432,7 +1432,7 @@ dependencies = [ [[package]] name = "ckb-types" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "bit-vec", "bytes 1.4.0", @@ -1456,7 +1456,7 @@ dependencies = [ [[package]] name = "ckb-util" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-fixed-hash", "linked-hash-map", @@ -1467,7 +1467,7 @@ dependencies = [ [[package]] name = "ckb-verification" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-chain-spec", "ckb-dao", @@ -1487,7 +1487,7 @@ dependencies = [ [[package]] name = "ckb-verification-contextual" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "ckb-async-runtime", "ckb-chain", @@ -1514,7 +1514,7 @@ dependencies = [ [[package]] name = "ckb-verification-traits" -version = "0.111.0-pre" +version = "0.110.0-rc1" dependencies = [ "bitflags", "ckb-error", diff --git a/Cargo.toml b/Cargo.toml index 584f9cc985..8bed3aa657 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,11 +11,11 @@ repository = "https://github.com/nervosnetwork/ckb" rust-version = "1.67.1" [build-dependencies] -ckb-build-info = { path = "util/build-info", version = "= 0.111.0-pre" } +ckb-build-info = { path = "util/build-info", version = "= 0.110.0-rc1" } [dependencies] -ckb-build-info = { path = "util/build-info", version = "= 0.111.0-pre" } -ckb-bin = { path = "ckb-bin", version = "= 0.111.0-pre" } +ckb-build-info = { path = "util/build-info", version = "= 0.110.0-rc1" } +ckb-bin = { path = "ckb-bin", version = "= 0.110.0-rc1" } [dev-dependencies] diff --git a/README.md b/README.md index ae9c4a5133..de2fdb5a06 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.111.0--pre-orange.svg)](https://github.com/nervosnetwork/ckb/releases) +[![Version](https://img.shields.io/badge/version-0.110.0--rc1-orange.svg)](https://github.com/nervosnetwork/ckb/releases) [![Nervos Talk](https://img.shields.io/badge/discuss-on%20Nervos%20Talk-3CC68A.svg)](https://talk.nervos.org/t/where-to-discuss-ckb-and-how-to-ask-for-support/6024) master | develop diff --git a/benches/Cargo.toml b/benches/Cargo.toml index f0d85d1b76..17944ceba9 100644 --- a/benches/Cargo.toml +++ b/benches/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-benches" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,26 +13,26 @@ repository = "https://github.com/nervosnetwork/ckb" [dev-dependencies] criterion = "0.4" -ckb-chain = { path = "../chain", version = "= 0.111.0-pre" } -ckb-types = { path = "../util/types", version = "= 0.111.0-pre" } -ckb-shared = { path = "../shared", version = "= 0.111.0-pre" } -ckb-store = { path = "../store", version = "= 0.111.0-pre" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-pre" } +ckb-chain = { path = "../chain", version = "= 0.110.0-rc1" } +ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } +ckb-shared = { path = "../shared", version = "= 0.110.0-rc1" } +ckb-store = { path = "../store", version = "= 0.110.0-rc1" } +ckb-chain-spec = { path = "../spec", version = "= 0.110.0-rc1" } rand = "0.7" -ckb-hash = {path = "../util/hash", version = "= 0.111.0-pre"} -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-pre" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-pre" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-pre" } +ckb-hash = {path = "../util/hash", version = "= 0.110.0-rc1"} +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.110.0-rc1" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.110.0-rc1" } +ckb-dao = { path = "../util/dao", version = "= 0.110.0-rc1" } ckb-system-scripts = { version = "= 0.5.4" } lazy_static = "1.3.0" -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-pre" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-pre" } -ckb-verification = { path = "../verification", version = "= 0.111.0-pre" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-pre" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-pre" } -ckb-resource = { path = "../resource", version = "= 0.111.0-pre" } -ckb-network = { path = "../network", version = "= 0.111.0-pre" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-pre" } +ckb-crypto = { path = "../util/crypto", version = "= 0.110.0-rc1" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.110.0-rc1" } +ckb-verification = { path = "../verification", version = "= 0.110.0-rc1" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.110.0-rc1" } +ckb-app-config = { path = "../util/app-config", version = "= 0.110.0-rc1" } +ckb-resource = { path = "../resource", version = "= 0.110.0-rc1" } +ckb-network = { path = "../network", version = "= 0.110.0-rc1" } +ckb-launcher = { path = "../util/launcher", version = "= 0.110.0-rc1" } tempfile.workspace = true [[bench]] diff --git a/block-filter/Cargo.toml b/block-filter/Cargo.toml index 1ff663848f..7b6c49ebe4 100644 --- a/block-filter/Cargo.toml +++ b/block-filter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-block-filter" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,9 +11,9 @@ repository = "https://github.com/nervosnetwork/ckb" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ckb-store = { path = "../store", version = "= 0.111.0-pre" } -ckb-shared = { path = "../shared", version = "= 0.111.0-pre" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-pre" } -ckb-types = { path = "../util/types", version = "= 0.111.0-pre" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-pre" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-pre" } +ckb-store = { path = "../store", version = "= 0.110.0-rc1" } +ckb-shared = { path = "../shared", version = "= 0.110.0-rc1" } +ckb-logger = { path = "../util/logger", version = "= 0.110.0-rc1" } +ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.110.0-rc1" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.110.0-rc1" } diff --git a/chain/Cargo.toml b/chain/Cargo.toml index 18623e6437..d5d029e86e 100644 --- a/chain/Cargo.toml +++ b/chain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,37 +9,37 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-pre" } -ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-pre" } -ckb-types = { path = "../util/types", version = "= 0.111.0-pre" } -ckb-shared = { path = "../shared", version = "= 0.111.0-pre" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-pre" } -ckb-store = { path = "../store", version = "= 0.111.0-pre" } -ckb-verification = { path = "../verification", version = "= 0.111.0-pre" } -ckb-verification-contextual = { path = "../verification/contextual", version = "= 0.111.0-pre" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-pre" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-pre" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-pre" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-pre" } -ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-pre" } -ckb-error = { path = "../error", version = "= 0.111.0-pre" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-pre" } -ckb-rust-unstable-port = { path = "../util/rust-unstable-port", version = "= 0.111.0-pre" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-pre" } +ckb-logger = { path = "../util/logger", version = "= 0.110.0-rc1" } +ckb-metrics = { path = "../util/metrics", version = "= 0.110.0-rc1" } +ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } +ckb-shared = { path = "../shared", version = "= 0.110.0-rc1" } +ckb-chain-spec = { path = "../spec", version = "= 0.110.0-rc1" } +ckb-store = { path = "../store", version = "= 0.110.0-rc1" } +ckb-verification = { path = "../verification", version = "= 0.110.0-rc1" } +ckb-verification-contextual = { path = "../verification/contextual", version = "= 0.110.0-rc1" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.110.0-rc1" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.110.0-rc1" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.110.0-rc1" } +ckb-dao = { path = "../util/dao", version = "= 0.110.0-rc1" } +ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.110.0-rc1" } +ckb-error = { path = "../error", version = "= 0.110.0-rc1" } +ckb-app-config = { path = "../util/app-config", version = "= 0.110.0-rc1" } +ckb-rust-unstable-port = { path = "../util/rust-unstable-port", version = "= 0.110.0-rc1" } +ckb-channel = { path = "../util/channel", version = "= 0.110.0-rc1" } faux = { version = "^0.1", optional = true } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-pre" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-pre" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-pre" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-pre", features = ["internal"] } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-pre" } -ckb-network = { path = "../network", version = "= 0.111.0-pre" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-pre" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.110.0-rc1" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.110.0-rc1" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.110.0-rc1" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.110.0-rc1", features = ["internal"] } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.110.0-rc1" } +ckb-network = { path = "../network", version = "= 0.110.0-rc1" } +ckb-launcher = { path = "../util/launcher", version = "= 0.110.0-rc1" } lazy_static = "1.4" tempfile.workspace = true -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-pre" ,features = ["enable_faketime"]} +ckb-systemtime = { path = "../util/systemtime", version = "= 0.110.0-rc1" ,features = ["enable_faketime"]} [features] default = [] diff --git a/ckb-bin/Cargo.toml b/ckb-bin/Cargo.toml index 3e77ace54c..63bbd5f63a 100644 --- a/ckb-bin/Cargo.toml +++ b/ckb-bin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-bin" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -14,29 +14,29 @@ serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0" } serde_plain = "0.3.0" toml = "0.5" -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-pre" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-pre" } -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-pre" } -ckb-metrics-service = { path = "../util/metrics-service", version = "= 0.111.0-pre" } -ckb-util = { path = "../util", version = "= 0.111.0-pre" } -ckb-types = { path = "../util/types", version = "= 0.111.0-pre" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-pre" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-pre" } -ckb-chain = { path = "../chain", version = "= 0.111.0-pre" } -ckb-shared = { path = "../shared", version = "= 0.111.0-pre" } -ckb-store = { path = "../store", version = "= 0.111.0-pre" } -ckb-chain-spec = {path = "../spec", version = "= 0.111.0-pre"} -ckb-miner = { path = "../miner", version = "= 0.111.0-pre" } -ckb-network = { path = "../network", version = "= 0.111.0-pre"} -ckb-resource = { path = "../resource", version = "= 0.111.0-pre"} +ckb-app-config = { path = "../util/app-config", version = "= 0.110.0-rc1" } +ckb-logger = { path = "../util/logger", version = "= 0.110.0-rc1" } +ckb-logger-service = { path = "../util/logger-service", version = "= 0.110.0-rc1" } +ckb-metrics-service = { path = "../util/metrics-service", version = "= 0.110.0-rc1" } +ckb-util = { path = "../util", version = "= 0.110.0-rc1" } +ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } +ckb-channel = { path = "../util/channel", version = "= 0.110.0-rc1" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.110.0-rc1" } +ckb-chain = { path = "../chain", version = "= 0.110.0-rc1" } +ckb-shared = { path = "../shared", version = "= 0.110.0-rc1" } +ckb-store = { path = "../store", version = "= 0.110.0-rc1" } +ckb-chain-spec = {path = "../spec", version = "= 0.110.0-rc1"} +ckb-miner = { path = "../miner", version = "= 0.110.0-rc1" } +ckb-network = { path = "../network", version = "= 0.110.0-rc1"} +ckb-resource = { path = "../resource", version = "= 0.110.0-rc1"} ctrlc = { version = "3.1", features = ["termination"] } -ckb-instrument = { path = "../util/instrument", version = "= 0.111.0-pre", features = ["progress_bar"] } -ckb-build-info = { path = "../util/build-info", version = "= 0.111.0-pre" } -ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-pre" } -ckb-chain-iter = { path = "../util/chain-iter", version = "= 0.111.0-pre" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-pre" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-pre" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-pre" } +ckb-instrument = { path = "../util/instrument", version = "= 0.110.0-rc1", features = ["progress_bar"] } +ckb-build-info = { path = "../util/build-info", version = "= 0.110.0-rc1" } +ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.110.0-rc1" } +ckb-chain-iter = { path = "../util/chain-iter", version = "= 0.110.0-rc1" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.110.0-rc1" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.110.0-rc1" } +ckb-launcher = { path = "../util/launcher", version = "= 0.110.0-rc1" } base64 = "0.21.0" tempfile.workspace = true rayon = "1.0" diff --git a/db-migration/Cargo.toml b/db-migration/Cargo.toml index c686fc81e0..d71d7f2350 100644 --- a/db-migration/Cargo.toml +++ b/db-migration/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db-migration" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,16 +11,16 @@ 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.111.0-pre" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-pre" } -ckb-error = { path = "../error", version = "= 0.111.0-pre" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-pre" } +ckb-db = { path = "../db", version = "= 0.110.0-rc1" } +ckb-logger = { path = "../util/logger", version = "= 0.110.0-rc1" } +ckb-error = { path = "../error", version = "= 0.110.0-rc1" } +ckb-db-schema = { path = "../db-schema", version = "= 0.110.0-rc1" } indicatif = "0.16" console = ">=0.9.1, <1.0.0" [dev-dependencies] tempfile.workspace = true -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-pre" } +ckb-app-config = { path = "../util/app-config", version = "= 0.110.0-rc1" } [features] portable = ["ckb-db/portable"] diff --git a/db-schema/Cargo.toml b/db-schema/Cargo.toml index eac2706dff..4815322263 100644 --- a/db-schema/Cargo.toml +++ b/db-schema/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db-schema" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/db/Cargo.toml b/db/Cargo.toml index fcd6b90ba3..fa075532d4 100644 --- a/db/Cargo.toml +++ b/db/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,12 +9,12 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-pre" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-pre" } -ckb-error = { path = "../error", version = "= 0.111.0-pre" } +ckb-app-config = { path = "../util/app-config", version = "= 0.110.0-rc1" } +ckb-logger = { path = "../util/logger", version = "= 0.110.0-rc1" } +ckb-error = { path = "../error", version = "= 0.110.0-rc1" } libc = "0.2" rocksdb = { package = "ckb-rocksdb", version ="=0.20.0", features = ["snappy"], default-features = false } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-pre" } +ckb-db-schema = { path = "../db-schema", version = "= 0.110.0-rc1" } [dev-dependencies] tempfile.workspace = true diff --git a/error/Cargo.toml b/error/Cargo.toml index b8b662f464..7b9c511e6a 100644 --- a/error/Cargo.toml +++ b/error/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-error" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,5 +11,5 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] thiserror = "1.0.22" anyhow = "1.0.34" -ckb-occupied-capacity = { path = "../util/occupied-capacity", version = "= 0.111.0-pre" } +ckb-occupied-capacity = { path = "../util/occupied-capacity", version = "= 0.110.0-rc1" } derive_more = { version = "0.99.0", default-features = false, features = ["display"] } diff --git a/freezer/Cargo.toml b/freezer/Cargo.toml index 151f731671..161c8a3c74 100644 --- a/freezer/Cargo.toml +++ b/freezer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-freezer" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,11 +10,11 @@ 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.111.0-pre" } -ckb-error = { path = "../error", version = "= 0.111.0-pre" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-pre" } -ckb-util = { path = "../util", version = "= 0.111.0-pre" } -ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-pre" } +ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } +ckb-error = { path = "../error", version = "= 0.110.0-rc1" } +ckb-logger = { path = "../util/logger", version = "= 0.110.0-rc1" } +ckb-util = { path = "../util", version = "= 0.110.0-rc1" } +ckb-metrics = { path = "../util/metrics", version = "= 0.110.0-rc1" } fs2 = "0.4.3" fail = "0.4" snap = "1" diff --git a/miner/Cargo.toml b/miner/Cargo.toml index ee1d121767..ea0be8ab56 100644 --- a/miner/Cargo.toml +++ b/miner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-miner" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,23 +9,23 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-pre" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-pre" } -ckb-types = { path = "../util/types", version = "= 0.111.0-pre" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-pre" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-pre" } -ckb-pow = { path = "../pow", version = "= 0.111.0-pre" } +ckb-logger = { path = "../util/logger", version = "= 0.110.0-rc1" } +ckb-app-config = { path = "../util/app-config", version = "= 0.110.0-rc1" } +ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } +ckb-channel = { path = "../util/channel", version = "= 0.110.0-rc1" } +ckb-hash = { path = "../util/hash", version = "= 0.110.0-rc1" } +ckb-pow = { path = "../pow", version = "= 0.110.0-rc1" } rand = "0.7" rand_distr = "0.3" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-pre" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.110.0-rc1" } hyper = { version = "0.14", features = ["client", "http2", "http1", "server"] } hyper-tls = "0.5" futures = "0.3" lru = "0.7.1" -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-pre" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-pre" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.110.0-rc1" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.110.0-rc1" } indicatif = "0.16" console = ">=0.9.1, <1.0.0" eaglesong = "0.1" diff --git a/network/Cargo.toml b/network/Cargo.toml index d4e5ff8ce2..609342dfae 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-network" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,28 +11,28 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] rand = "0.7" serde = { version = "1.0", features = ["derive"] } -ckb-util = { path = "../util", version = "= 0.111.0-pre" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-pre" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-pre" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-pre" } -ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-pre"} +ckb-util = { path = "../util", version = "= 0.110.0-rc1" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.110.0-rc1" } +ckb-logger = { path = "../util/logger", version = "= 0.110.0-rc1" } +ckb-app-config = { path = "../util/app-config", version = "= 0.110.0-rc1" } +ckb-metrics = {path = "../util/metrics", version = "= 0.110.0-rc1"} tokio = { version = "1", features = ["sync", "macros"] } tokio-util = { version = "0.7", features = ["codec"] } futures = "0.3" -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-pre"} +ckb-systemtime = {path = "../util/systemtime", version = "= 0.110.0-rc1"} lazy_static = { version = "1.3.0", optional = true } bs58 = { version = "0.4.0", optional = true } sentry = { version = "0.26.0", optional = true } faster-hex = { version = "0.6", optional = true } -ckb-hash = {path = "../util/hash", version = "= 0.111.0-pre"} +ckb-hash = {path = "../util/hash", version = "= 0.110.0-rc1"} secp256k1 = {version = "0.24", features = ["recovery"], optional = true } trust-dns-resolver = { version = "0.20", optional = true } snap = "1" -ckb-types = { path = "../util/types", version = "= 0.111.0-pre" } +ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } ipnetwork = "0.18" serde_json = "1.0" bloom-filters = "0.1" -ckb-spawn = { path = "../util/spawn", version = "= 0.111.0-pre" } +ckb-spawn = { path = "../util/spawn", version = "= 0.110.0-rc1" } socket2 = "0.4" bitflags = "1.0" @@ -48,7 +48,7 @@ criterion = "0.4" proptest = "1.0" num_cpus = "1.10" once_cell = "1.8.0" -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-pre", features = ["enable_faketime"]} +ckb-systemtime = {path = "../util/systemtime", version = "= 0.110.0-rc1", features = ["enable_faketime"]} [[bench]] name = "peer_store" diff --git a/notify/Cargo.toml b/notify/Cargo.toml index 75cf5b129d..3cf15f6632 100644 --- a/notify/Cargo.toml +++ b/notify/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-notify" -version = "0.111.0-pre" +version = "0.110.0-rc1" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-pre" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-pre" } -ckb-types = { path = "../util/types", version = "= 0.111.0-pre" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-pre" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-pre" } +ckb-logger = { path = "../util/logger", version = "= 0.110.0-rc1" } +ckb-app-config = { path = "../util/app-config", version = "= 0.110.0-rc1" } +ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.110.0-rc1" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.110.0-rc1" } tokio = { version = "1", features = ["sync"] } [dev-dependencies] diff --git a/pow/Cargo.toml b/pow/Cargo.toml index fe51fd47f8..ae60b78f24 100644 --- a/pow/Cargo.toml +++ b/pow/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-pow" -version = "0.111.0-pre" +version = "0.110.0-rc1" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,8 +10,8 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../util/types", version = "= 0.111.0-pre" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-pre"} +ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } +ckb-hash = { path = "../util/hash", version = "= 0.110.0-rc1"} serde = { version = "1.0", features = ["derive"] } eaglesong = "0.1" log = "0.4" diff --git a/resource/Cargo.toml b/resource/Cargo.toml index a4541c7c9f..852b29922f 100644 --- a/resource/Cargo.toml +++ b/resource/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-resource" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,13 +13,13 @@ repository = "https://github.com/nervosnetwork/ckb" phf = "0.8.0" includedir = "0.6.0" serde = { version = "1.0", features = ["derive"] } -ckb-types = { path = "../util/types", version = "= 0.111.0-pre" } +ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } ckb-system-scripts = { version = "= 0.5.4" } [build-dependencies] includedir_codegen = "0.6.0" walkdir = "2.1.4" -ckb-types = { path = "../util/types", version = "= 0.111.0-pre" } +ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } ckb-system-scripts = { version = "= 0.5.4" } [dev-dependencies] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 090546b567..019d064d9d 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-rpc" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,19 +9,19 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-pre" } -ckb-types = { path = "../util/types", version = "= 0.111.0-pre" } -ckb-network = { path = "../network", version = "= 0.111.0-pre" } -ckb-notify = { path = "../notify", version = "= 0.111.0-pre" } -ckb-shared = { path = "../shared", version = "= 0.111.0-pre" } -ckb-store = { path = "../store", version = "= 0.111.0-pre" } -ckb-sync = { path = "../sync", version = "= 0.111.0-pre" } -ckb-chain = { path = "../chain", version = "= 0.111.0-pre" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-pre"} -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-pre"} -ckb-network-alert = { path = "../util/network-alert", version = "= 0.111.0-pre" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-pre" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-pre" } +ckb-chain-spec = { path = "../spec", version = "= 0.110.0-rc1" } +ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } +ckb-network = { path = "../network", version = "= 0.110.0-rc1" } +ckb-notify = { path = "../notify", version = "= 0.110.0-rc1" } +ckb-shared = { path = "../shared", version = "= 0.110.0-rc1" } +ckb-store = { path = "../store", version = "= 0.110.0-rc1" } +ckb-sync = { path = "../sync", version = "= 0.110.0-rc1" } +ckb-chain = { path = "../chain", version = "= 0.110.0-rc1" } +ckb-logger = { path = "../util/logger", version = "= 0.110.0-rc1"} +ckb-logger-service = { path = "../util/logger-service", version = "= 0.110.0-rc1"} +ckb-network-alert = { path = "../util/network-alert", version = "= 0.110.0-rc1" } +ckb-app-config = { path = "../util/app-config", version = "= 0.110.0-rc1" } +ckb-constant = { path = "../util/constant", version = "= 0.110.0-rc1" } jsonrpc-core = "18.0" jsonrpc-derive = "18.0" jsonrpc-http-server = "18.0" @@ -30,27 +30,27 @@ jsonrpc-ws-server = "18.0" jsonrpc-server-utils = "18.0" jsonrpc-pubsub = "18.0" serde_json = "1.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-pre" } -ckb-verification = { path = "../verification", version = "= 0.111.0-pre" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-pre" } -ckb-traits = { path = "../traits", version = "= 0.111.0-pre" } -ckb-util = { path = "../util", version = "= 0.111.0-pre" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-pre" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-pre" } -ckb-error = { path = "../error", version = "= 0.111.0-pre" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-pre" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-pre" } -ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-pre" } -ckb-pow = { path = "../pow", version = "= 0.111.0-pre" } -ckb-indexer = { path = "../util/indexer", version = "= 0.111.0-pre" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.110.0-rc1" } +ckb-verification = { path = "../verification", version = "= 0.110.0-rc1" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.110.0-rc1" } +ckb-traits = { path = "../traits", version = "= 0.110.0-rc1" } +ckb-util = { path = "../util", version = "= 0.110.0-rc1" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.110.0-rc1" } +ckb-dao = { path = "../util/dao", version = "= 0.110.0-rc1" } +ckb-error = { path = "../error", version = "= 0.110.0-rc1" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.110.0-rc1" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.110.0-rc1" } +ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.110.0-rc1" } +ckb-pow = { path = "../pow", version = "= 0.110.0-rc1" } +ckb-indexer = { path = "../util/indexer", version = "= 0.110.0-rc1" } itertools = "0.10.5" tokio = "1" [dev-dependencies] reqwest = { version = "0.11.4", features = ["blocking", "json"] } serde = { version = "1.0", features = ["derive"] } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-pre" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-pre" } +ckb-launcher = { path = "../util/launcher", version = "= 0.110.0-rc1" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.110.0-rc1" } tempfile.workspace = true pretty_assertions = "1.3.0" -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-pre" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.110.0-rc1" } diff --git a/script/Cargo.toml b/script/Cargo.toml index 12b04a23ea..40ad7ff23b 100644 --- a/script/Cargo.toml +++ b/script/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-script" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -18,24 +18,24 @@ logging = ["ckb-logger"] flatmemory = [] [dependencies] -ckb-traits = { path = "../traits", version = "= 0.111.0-pre" } +ckb-traits = { path = "../traits", version = "= 0.110.0-rc1" } byteorder = "1.3.1" -ckb-types = { path = "../util/types", version = "= 0.111.0-pre" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-pre" } +ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } +ckb-hash = { path = "../util/hash", version = "= 0.110.0-rc1" } ckb-vm = { version = "=0.24.0", default-features = false } faster-hex = "0.6" -ckb-logger = { path = "../util/logger", version = "= 0.111.0-pre", optional = true } +ckb-logger = { path = "../util/logger", version = "= 0.110.0-rc1", optional = true } serde = { version = "1.0", features = ["derive"] } -ckb-error = { path = "../error", version = "= 0.111.0-pre" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-pre" } +ckb-error = { path = "../error", version = "= 0.110.0-rc1" } +ckb-chain-spec = { path = "../spec", version = "= 0.110.0-rc1" } [dev-dependencies] proptest = "1.0" -ckb-db = { path = "../db", version = "= 0.111.0-pre" } -ckb-store = { path = "../store", version = "= 0.111.0-pre" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-pre" } +ckb-db = { path = "../db", version = "= 0.110.0-rc1" } +ckb-store = { path = "../store", version = "= 0.110.0-rc1" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.110.0-rc1" } tiny-keccak = { version = "2.0", features = ["sha3"] } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-pre" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-pre" } +ckb-crypto = { path = "../util/crypto", version = "= 0.110.0-rc1" } +ckb-db-schema = { path = "../db-schema", version = "= 0.110.0-rc1" } tempfile.workspace = true rand = "0.8.4" diff --git a/script/fuzz/Cargo.toml b/script/fuzz/Cargo.toml index c3638bf632..dc8917cf3e 100644 --- a/script/fuzz/Cargo.toml +++ b/script/fuzz/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-script-fuzz" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -15,10 +15,10 @@ cargo-fuzz = true [dependencies] arbitrary = { version = "1", features = ["derive"] } libfuzzer-sys = { version="0.4.0", features=["arbitrary-derive"] } -ckb-traits = { path = "../../traits", version = "= 0.111.0-pre" } -ckb-types = { path = "../../util/types", version = "= 0.111.0-pre" } -ckb-script = { path = "../../script", version = "= 0.111.0-pre" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-pre" } +ckb-traits = { path = "../../traits", version = "= 0.110.0-rc1" } +ckb-types = { path = "../../util/types", version = "= 0.110.0-rc1" } +ckb-script = { path = "../../script", version = "= 0.110.0-rc1" } +ckb-chain-spec = { path = "../../spec", version = "= 0.110.0-rc1" } # Prevent this from interfering with workspaces [workspace] diff --git a/shared/Cargo.toml b/shared/Cargo.toml index c71b704888..09a9a18dd5 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-shared" -version = "0.111.0-pre" +version = "0.110.0-rc1" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,27 +9,27 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-pre" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-pre" } -ckb-store = { path = "../store", version = "= 0.111.0-pre" } -ckb-db = { path = "../db", version = "= 0.111.0-pre" } -ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-pre" } +ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } +ckb-chain-spec = { path = "../spec", version = "= 0.110.0-rc1" } +ckb-store = { path = "../store", version = "= 0.110.0-rc1" } +ckb-db = { path = "../db", version = "= 0.110.0-rc1" } +ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.110.0-rc1" } arc-swap = "1.3" -ckb-error = { path = "../error", version = "= 0.111.0-pre" } -ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-pre" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-pre" } -ckb-verification = { path = "../verification", version = "= 0.111.0-pre" } -ckb-notify = { path = "../notify", version = "= 0.111.0-pre" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-pre" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-pre" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-pre" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-pre" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-pre" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-pre" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-pre" } +ckb-error = { path = "../error", version = "= 0.110.0-rc1" } +ckb-snapshot = { path = "../util/snapshot", version = "= 0.110.0-rc1" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.110.0-rc1" } +ckb-verification = { path = "../verification", version = "= 0.110.0-rc1" } +ckb-notify = { path = "../notify", version = "= 0.110.0-rc1" } +ckb-logger = { path = "../util/logger", version = "= 0.110.0-rc1" } +ckb-db-schema = { path = "../db-schema", version = "= 0.110.0-rc1" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.110.0-rc1" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.110.0-rc1" } +ckb-channel = { path = "../util/channel", version = "= 0.110.0-rc1" } +ckb-constant = { path = "../util/constant", version = "= 0.110.0-rc1" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.110.0-rc1" } [dev-dependencies] -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-pre", features = ["enable_faketime"] } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.110.0-rc1", features = ["enable_faketime"] } [features] portable = ["ckb-db/portable", "ckb-store/portable", "ckb-tx-pool/portable"] diff --git a/spec/Cargo.toml b/spec/Cargo.toml index bd9a7a7f15..f0b9791ad4 100644 --- a/spec/Cargo.toml +++ b/spec/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain-spec" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,15 +11,15 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] serde = { version = "1.0", features = ["derive"] } toml = "0.5" -ckb-constant = { path = "../util/constant", version = "= 0.111.0-pre" } -ckb-types = { path = "../util/types", version = "= 0.111.0-pre" } -ckb-pow = { path = "../pow", version = "= 0.111.0-pre" } -ckb-resource = { path = "../resource", version = "= 0.111.0-pre" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-pre" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-pre" } -ckb-rational = { path = "../util/rational", version = "= 0.111.0-pre" } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-pre"} -ckb-hash = { path = "../util/hash", version = "= 0.111.0-pre"} -ckb-error = { path = "../error", version = "= 0.111.0-pre" } -ckb-traits = { path = "../traits", version = "= 0.111.0-pre" } -ckb-util = { path = "../util", version = "= 0.111.0-pre" } +ckb-constant = { path = "../util/constant", version = "= 0.110.0-rc1" } +ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } +ckb-pow = { path = "../pow", version = "= 0.110.0-rc1" } +ckb-resource = { path = "../resource", version = "= 0.110.0-rc1" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.110.0-rc1" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.110.0-rc1" } +ckb-rational = { path = "../util/rational", version = "= 0.110.0-rc1" } +ckb-crypto = { path = "../util/crypto", version = "= 0.110.0-rc1"} +ckb-hash = { path = "../util/hash", version = "= 0.110.0-rc1"} +ckb-error = { path = "../error", version = "= 0.110.0-rc1" } +ckb-traits = { path = "../traits", version = "= 0.110.0-rc1" } +ckb-util = { path = "../util", version = "= 0.110.0-rc1" } diff --git a/store/Cargo.toml b/store/Cargo.toml index 43f86fba35..c88d1e1f91 100644 --- a/store/Cargo.toml +++ b/store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-store" -version = "0.111.0-pre" +version = "0.110.0-rc1" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,16 +9,16 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-pre" } -ckb-db = { path = "../db", version = "= 0.111.0-pre" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-pre" } +ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } +ckb-db = { path = "../db", version = "= 0.110.0-rc1" } +ckb-chain-spec = { path = "../spec", version = "= 0.110.0-rc1" } lru = "0.7.1" -ckb-traits = { path = "../traits", version = "= 0.111.0-pre" } -ckb-util = { path = "../util", version = "= 0.111.0-pre" } -ckb-error = { path = "../error", version = "= 0.111.0-pre" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-pre" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-pre" } -ckb-freezer = { path = "../freezer", version = "= 0.111.0-pre" } +ckb-traits = { path = "../traits", version = "= 0.110.0-rc1" } +ckb-util = { path = "../util", version = "= 0.110.0-rc1" } +ckb-error = { path = "../error", version = "= 0.110.0-rc1" } +ckb-app-config = { path = "../util/app-config", version = "= 0.110.0-rc1" } +ckb-db-schema = { path = "../db-schema", version = "= 0.110.0-rc1" } +ckb-freezer = { path = "../freezer", version = "= 0.110.0-rc1" } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] diff --git a/sync/Cargo.toml b/sync/Cargo.toml index 34ae04f800..bcf3625062 100644 --- a/sync/Cargo.toml +++ b/sync/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-sync" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,48 +9,48 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-chain = { path = "../chain", version = "= 0.111.0-pre" } -ckb-shared = { path = "../shared", version = "= 0.111.0-pre" } -ckb-store = { path = "../store", version = "= 0.111.0-pre" } -ckb-app-config = {path = "../util/app-config", version = "= 0.111.0-pre"} -ckb-types = {path = "../util/types", version = "= 0.111.0-pre"} -ckb-network = { path = "../network", version = "= 0.111.0-pre" } -ckb-logger = {path = "../util/logger", version = "= 0.111.0-pre"} -ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-pre"} -ckb-util = { path = "../util", version = "= 0.111.0-pre" } -ckb-verification = { path = "../verification", version = "= 0.111.0-pre" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-pre" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-pre" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-pre" } -ckb-traits = { path = "../traits", version = "= 0.111.0-pre" } -ckb-error = {path = "../error", version = "= 0.111.0-pre"} -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-pre" } +ckb-chain = { path = "../chain", version = "= 0.110.0-rc1" } +ckb-shared = { path = "../shared", version = "= 0.110.0-rc1" } +ckb-store = { path = "../store", version = "= 0.110.0-rc1" } +ckb-app-config = {path = "../util/app-config", version = "= 0.110.0-rc1"} +ckb-types = {path = "../util/types", version = "= 0.110.0-rc1"} +ckb-network = { path = "../network", version = "= 0.110.0-rc1" } +ckb-logger = {path = "../util/logger", version = "= 0.110.0-rc1"} +ckb-metrics = {path = "../util/metrics", version = "= 0.110.0-rc1"} +ckb-util = { path = "../util", version = "= 0.110.0-rc1" } +ckb-verification = { path = "../verification", version = "= 0.110.0-rc1" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.110.0-rc1" } +ckb-chain-spec = { path = "../spec", version = "= 0.110.0-rc1" } +ckb-channel = { path = "../util/channel", version = "= 0.110.0-rc1" } +ckb-traits = { path = "../traits", version = "= 0.110.0-rc1" } +ckb-error = {path = "../error", version = "= 0.110.0-rc1"} +ckb-tx-pool = { path = "../tx-pool", version = "= 0.110.0-rc1" } sentry = { version = "0.26.0", optional = true } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-pre" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-pre" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-pre" } +ckb-constant = { path = "../util/constant", version = "= 0.110.0-rc1" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.110.0-rc1" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.110.0-rc1" } tokio = { version = "1", features = ["sync"] } lru = "0.7.1" futures = "0.3" governor = "0.3.1" tempfile.workspace = true -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-pre" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.110.0-rc1" } bitflags = "1.0" dashmap = "4.0" keyed_priority_queue = "0.3" sled = "0.34.7" [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-pre" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.110.0-rc1" } rand = "0.7" -ckb-dao = { path = "../util/dao", version = "= 0.111.0-pre" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-pre" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-pre" } -ckb-chain = { path = "../chain", version = "= 0.111.0-pre", features = ["mock"] } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-pre" } +ckb-dao = { path = "../util/dao", version = "= 0.110.0-rc1" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.110.0-rc1" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.110.0-rc1" } +ckb-chain = { path = "../chain", version = "= 0.110.0-rc1", features = ["mock"] } +ckb-launcher = { path = "../util/launcher", version = "= 0.110.0-rc1" } faux = "^0.1" once_cell = "1.8.0" -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-pre" , features = ["enable_faketime"]} +ckb-systemtime = { path = "../util/systemtime", version = "= 0.110.0-rc1" , features = ["enable_faketime"]} [features] default = [] diff --git a/test/Cargo.toml b/test/Cargo.toml index d40e665dd5..5945a18652 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-test" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,28 +11,28 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] clap = { version = "=3.2.21" } toml = "0.5.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-pre" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-pre" } -ckb-network = { path = "../network", version = "= 0.111.0-pre" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-pre" } -ckb-types = { path = "../util/types", version = "= 0.111.0-pre" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-pre" } -ckb-util = { path = "../util", version = "= 0.111.0-pre" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-pre" } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-pre" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-pre" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-pre" } -ckb-resource = { path = "../resource", version = "= 0.111.0-pre" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-pre" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-pre" } -ckb-logger-config = { path = "../util/logger-config", version = "= 0.111.0-pre" } -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-pre" } -ckb-error = { path = "../error", version = "= 0.111.0-pre" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-pre" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.110.0-rc1" } +ckb-app-config = { path = "../util/app-config", version = "= 0.110.0-rc1" } +ckb-network = { path = "../network", version = "= 0.110.0-rc1" } +ckb-channel = { path = "../util/channel", version = "= 0.110.0-rc1" } +ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } +ckb-hash = { path = "../util/hash", version = "= 0.110.0-rc1" } +ckb-util = { path = "../util", version = "= 0.110.0-rc1" } +ckb-chain-spec = { path = "../spec", version = "= 0.110.0-rc1" } +ckb-crypto = { path = "../util/crypto", version = "= 0.110.0-rc1" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.110.0-rc1" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.110.0-rc1" } +ckb-resource = { path = "../resource", version = "= 0.110.0-rc1" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.110.0-rc1" } +ckb-logger = { path = "../util/logger", version = "= 0.110.0-rc1" } +ckb-logger-config = { path = "../util/logger-config", version = "= 0.110.0-rc1" } +ckb-logger-service = { path = "../util/logger-service", version = "= 0.110.0-rc1" } +ckb-error = { path = "../error", version = "= 0.110.0-rc1" } +ckb-constant = { path = "../util/constant", version = "= 0.110.0-rc1" } tempfile = "3" reqwest = { version = "0.11.4", features = ["blocking", "json"] } rand = "0.7" -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-pre" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.110.0-rc1" } serde_json = "1.0" lazy_static = "1.4.0" byteorder = "1.3.1" diff --git a/traits/Cargo.toml b/traits/Cargo.toml index 018a23aef2..ca9c24833e 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-traits" -version = "0.111.0-pre" +version = "0.110.0-rc1" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-pre" } +ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } diff --git a/tx-pool/Cargo.toml b/tx-pool/Cargo.toml index 32b4f48cf8..bc22b09b7f 100644 --- a/tx-pool/Cargo.toml +++ b/tx-pool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-tx-pool" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,27 +11,27 @@ 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.111.0-pre" } -ckb-logger = {path = "../util/logger", version = "= 0.111.0-pre"} -ckb-verification = { path = "../verification", version = "= 0.111.0-pre" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-pre"} +ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } +ckb-logger = {path = "../util/logger", version = "= 0.110.0-rc1"} +ckb-verification = { path = "../verification", version = "= 0.110.0-rc1" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.110.0-rc1"} lru = "0.7.1" -ckb-dao = { path = "../util/dao", version = "= 0.111.0-pre" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-pre" } -ckb-store = { path = "../store", version = "= 0.111.0-pre" } -ckb-util = { path = "../util", version = "= 0.111.0-pre" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-pre" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-pre" } -ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-pre" } -ckb-error = { path = "../error", version = "= 0.111.0-pre" } +ckb-dao = { path = "../util/dao", version = "= 0.110.0-rc1" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.110.0-rc1" } +ckb-store = { path = "../store", version = "= 0.110.0-rc1" } +ckb-util = { path = "../util", version = "= 0.110.0-rc1" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.110.0-rc1" } +ckb-chain-spec = { path = "../spec", version = "= 0.110.0-rc1" } +ckb-snapshot = { path = "../util/snapshot", version = "= 0.110.0-rc1" } +ckb-error = { path = "../error", version = "= 0.110.0-rc1" } tokio = { version = "1", features = ["sync", "process"] } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-pre" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-pre" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-pre" } -ckb-network = { path = "../network", version = "= 0.111.0-pre" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-pre" } -ckb-traits = { path = "../traits", version = "= 0.111.0-pre" } -ckb-db = { path = "../db", version = "= 0.111.0-pre" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.110.0-rc1" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.110.0-rc1" } +ckb-app-config = { path = "../util/app-config", version = "= 0.110.0-rc1" } +ckb-network = { path = "../network", version = "= 0.110.0-rc1" } +ckb-channel = { path = "../util/channel", version = "= 0.110.0-rc1" } +ckb-traits = { path = "../traits", version = "= 0.110.0-rc1" } +ckb-db = { path = "../db", version = "= 0.110.0-rc1" } sentry = { version = "0.26.0", optional = true } serde_json = "1.0" rand = "0.8.4" @@ -42,8 +42,8 @@ rustc-hash = "1.1" [dev-dependencies] tempfile.workspace = true -ckb-hash = { path = "../util/hash", version = "= 0.111.0-pre" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-pre", features = ["enable_faketime"]} +ckb-hash = { path = "../util/hash", version = "= 0.110.0-rc1" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.110.0-rc1", features = ["enable_faketime"]} [features] default = [] diff --git a/util/Cargo.toml b/util/Cargo.toml index 42ab50184b..62fcadf2d1 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-util" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -15,7 +15,7 @@ regex = "1.1.6" once_cell = "1.8.0" [dev-dependencies] -ckb-fixed-hash = { path = "fixed-hash", version = "= 0.111.0-pre" } +ckb-fixed-hash = { path = "fixed-hash", version = "= 0.110.0-rc1" } [features] deadlock_detection = ["parking_lot/deadlock_detection"] diff --git a/util/app-config/Cargo.toml b/util/app-config/Cargo.toml index b02c1d84e9..b642df4e48 100644 --- a/util/app-config/Cargo.toml +++ b/util/app-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-app-config" -version = "0.111.0-pre" +version = "0.110.0-rc1" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -15,20 +15,20 @@ serde_plain = "0.3.0" serde_json = "1.0" toml = "0.5" path-clean = "0.1.0" -ckb-logger = { path = "../../util/logger", version = "= 0.111.0-pre" } -ckb-logger-config = { path = "../../util/logger-config", version = "= 0.111.0-pre" } -ckb-metrics-config = { path = "../../util/metrics-config", version = "= 0.111.0-pre" } -ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-pre"} -ckb-jsonrpc-types = {path = "../jsonrpc-types", version = "= 0.111.0-pre"} -ckb-pow = { path = "../../pow", version = "= 0.111.0-pre" } -ckb-resource = { path = "../../resource", version = "= 0.111.0-pre"} -ckb-build-info = { path = "../build-info", version = "= 0.111.0-pre" } -ckb-types = { path = "../types", version = "= 0.111.0-pre" } +ckb-logger = { path = "../../util/logger", version = "= 0.110.0-rc1" } +ckb-logger-config = { path = "../../util/logger-config", version = "= 0.110.0-rc1" } +ckb-metrics-config = { path = "../../util/metrics-config", version = "= 0.110.0-rc1" } +ckb-chain-spec = {path = "../../spec", version = "= 0.110.0-rc1"} +ckb-jsonrpc-types = {path = "../jsonrpc-types", version = "= 0.110.0-rc1"} +ckb-pow = { path = "../../pow", version = "= 0.110.0-rc1" } +ckb-resource = { path = "../../resource", version = "= 0.110.0-rc1"} +ckb-build-info = { path = "../build-info", version = "= 0.110.0-rc1" } +ckb-types = { path = "../types", version = "= 0.110.0-rc1" } secio = { version="0.5.7", package="tentacle-secio" } multiaddr = { version="0.3.0", package="tentacle-multiaddr" } rand = "0.7" sentry = { version = "0.26.0", optional = true } -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-pre" } +ckb-systemtime = { path = "../systemtime", version = "= 0.110.0-rc1" } url = { version = "2.2.2", features = ["serde"] } ubyte = { version = "0.10", features = ["serde"] } @@ -37,4 +37,4 @@ with_sentry = ["sentry"] [dev-dependencies] tempfile.workspace = true -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-pre" ,features = ["enable_faketime"]} +ckb-systemtime = { path = "../systemtime", version = "= 0.110.0-rc1" ,features = ["enable_faketime"]} diff --git a/util/build-info/Cargo.toml b/util/build-info/Cargo.toml index 51d71c1e3d..bcf3b28150 100644 --- a/util/build-info/Cargo.toml +++ b/util/build-info/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-build-info" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/chain-iter/Cargo.toml b/util/chain-iter/Cargo.toml index e317cc2dab..8b3bbbbbb7 100644 --- a/util/chain-iter/Cargo.toml +++ b/util/chain-iter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain-iter" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-pre" } -ckb-store = { path = "../../store", version = "= 0.111.0-pre" } +ckb-types = { path = "../types", version = "= 0.110.0-rc1" } +ckb-store = { path = "../../store", version = "= 0.110.0-rc1" } diff --git a/util/channel/Cargo.toml b/util/channel/Cargo.toml index b255eed33e..0435c034fe 100644 --- a/util/channel/Cargo.toml +++ b/util/channel/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-channel" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/constant/Cargo.toml b/util/constant/Cargo.toml index e47cf05087..a043c4d7cd 100644 --- a/util/constant/Cargo.toml +++ b/util/constant/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-constant" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/crypto/Cargo.toml b/util/crypto/Cargo.toml index 7172e29590..a205c31744 100644 --- a/util/crypto/Cargo.toml +++ b/util/crypto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-crypto" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-pre" } +ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.110.0-rc1" } lazy_static = "1.3" secp256k1 = { version = "0.24", features = ["recovery"], optional = true } thiserror = "1.0.22" diff --git a/util/dao/Cargo.toml b/util/dao/Cargo.toml index 08556417c7..671e4bdac3 100644 --- a/util/dao/Cargo.toml +++ b/util/dao/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-dao" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,13 +10,13 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../types", version = "= 0.111.0-pre" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-pre" } -ckb-dao-utils = { path = "./utils", version = "= 0.111.0-pre" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-pre" } +ckb-types = { path = "../types", version = "= 0.110.0-rc1" } +ckb-chain-spec = { path = "../../spec", version = "= 0.110.0-rc1" } +ckb-dao-utils = { path = "./utils", version = "= 0.110.0-rc1" } +ckb-traits = { path = "../../traits", version = "= 0.110.0-rc1" } [dev-dependencies] -ckb-db = { path = "../../db", version = "= 0.111.0-pre" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-pre" } -ckb-store = { path = "../../store", version = "= 0.111.0-pre" } +ckb-db = { path = "../../db", version = "= 0.110.0-rc1" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.110.0-rc1" } +ckb-store = { path = "../../store", version = "= 0.110.0-rc1" } tempfile.workspace = true diff --git a/util/dao/utils/Cargo.toml b/util/dao/utils/Cargo.toml index 363afddffb..4296ac5084 100644 --- a/util/dao/utils/Cargo.toml +++ b/util/dao/utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-dao-utils" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,5 +10,5 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../../types", version = "= 0.111.0-pre" } -ckb-error = { path = "../../../error", version = "= 0.111.0-pre" } +ckb-types = { path = "../../types", version = "= 0.110.0-rc1" } +ckb-error = { path = "../../../error", version = "= 0.110.0-rc1" } diff --git a/util/fixed-hash/Cargo.toml b/util/fixed-hash/Cargo.toml index 136ea77db9..8a16cd6e68 100644 --- a/util/fixed-hash/Cargo.toml +++ b/util/fixed-hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-fixed-hash" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -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.111.0-pre" } -ckb-fixed-hash-macros = { path = "macros", version = "= 0.111.0-pre" } +ckb-fixed-hash-core = { path = "core", version = "= 0.110.0-rc1" } +ckb-fixed-hash-macros = { path = "macros", version = "= 0.110.0-rc1" } diff --git a/util/fixed-hash/core/Cargo.toml b/util/fixed-hash/core/Cargo.toml index 3e791b62a7..79ee7132d3 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.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/fixed-hash/macros/Cargo.toml b/util/fixed-hash/macros/Cargo.toml index 3fe103b9f3..8e19e4fb8d 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.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -12,7 +12,7 @@ repository = "https://github.com/nervosnetwork/ckb" proc-macro = true [dependencies] -ckb-fixed-hash-core = { path = "../core", version = "= 0.111.0-pre" } +ckb-fixed-hash-core = { path = "../core", version = "= 0.110.0-rc1" } quote = "1.0" syn = "1.0" proc-macro2 = "1.0" diff --git a/util/hash/Cargo.toml b/util/hash/Cargo.toml index 247800e185..a773f07ec9 100644 --- a/util/hash/Cargo.toml +++ b/util/hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-hash" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/indexer/Cargo.toml b/util/indexer/Cargo.toml index c069d88d4f..c72f2d8775 100644 --- a/util/indexer/Cargo.toml +++ b/util/indexer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-indexer" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,15 +13,15 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] thiserror = "1.0" rocksdb = { package = "ckb-rocksdb", version ="=0.20.0", features = ["snappy"], default-features = false } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-pre" } -ckb-types = { path = "../types", version = "= 0.111.0-pre" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-pre" } -ckb-logger = { path = "../logger", version = "= 0.111.0-pre" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-pre" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-pre" } -ckb-store = { path = "../../store", version = "= 0.111.0-pre" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-pre" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-pre" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.110.0-rc1" } +ckb-types = { path = "../types", version = "= 0.110.0-rc1" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.110.0-rc1" } +ckb-logger = { path = "../logger", version = "= 0.110.0-rc1" } +ckb-app-config = { path = "../app-config", version = "= 0.110.0-rc1" } +ckb-notify = { path = "../../notify", version = "= 0.110.0-rc1" } +ckb-store = { path = "../../store", version = "= 0.110.0-rc1" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.110.0-rc1" } +ckb-async-runtime = { path = "../runtime", version = "= 0.110.0-rc1" } rhai = { version = "1.10.0", features = ["no_function", "no_float", "no_module", "sync"]} serde_json = "1.0" numext-fixed-uint = "0.1" diff --git a/util/instrument/Cargo.toml b/util/instrument/Cargo.toml index aad5ef1844..b2c7d3eefc 100644 --- a/util/instrument/Cargo.toml +++ b/util/instrument/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-instrument" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-pre" } -ckb-chain = { path = "../../chain", version = "= 0.111.0-pre" } -ckb-chain-iter = { path = "../chain-iter", version = "= 0.111.0-pre" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-pre" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-pre" } +ckb-types = { path = "../types", version = "= 0.110.0-rc1" } +ckb-chain = { path = "../../chain", version = "= 0.110.0-rc1" } +ckb-chain-iter = { path = "../chain-iter", version = "= 0.110.0-rc1" } +ckb-shared = { path = "../../shared", version = "= 0.110.0-rc1" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.110.0-rc1" } serde_json = "1.0" indicatif = { version = "0.16", optional = true } diff --git a/util/jsonrpc-types/Cargo.toml b/util/jsonrpc-types/Cargo.toml index 8610a5386a..cc8f4b4b42 100644 --- a/util/jsonrpc-types/Cargo.toml +++ b/util/jsonrpc-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-jsonrpc-types" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,7 +9,7 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-pre" } +ckb-types = { path = "../types", version = "= 0.110.0-rc1" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" faster-hex = "0.6" diff --git a/util/launcher/Cargo.toml b/util/launcher/Cargo.toml index 8484e4ede7..5f04590d7d 100644 --- a/util/launcher/Cargo.toml +++ b/util/launcher/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-launcher" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,44 +11,44 @@ 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.111.0-pre" } -ckb-store = { path = "../../store", version = "= 0.111.0-pre" } -ckb-db = { path = "../../db", version = "= 0.111.0-pre" } -ckb-migration-template = { path = "migration-template", version = "= 0.111.0-pre" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-pre" } -ckb-db-migration = { path = "../../db-migration", version = "= 0.111.0-pre" } -ckb-logger = { path = "../logger", version = "= 0.111.0-pre" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-pre" } -ckb-error = { path = "../../error", version = "= 0.111.0-pre" } -ckb-build-info = { path = "../build-info", version = "= 0.111.0-pre" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-pre" } -ckb-chain = { path = "../../chain", version = "= 0.111.0-pre" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-pre" } -ckb-network = { path = "../../network", version = "= 0.111.0-pre"} -ckb-rpc = { path = "../../rpc", version = "= 0.111.0-pre"} -ckb-resource = { path = "../../resource", version = "= 0.111.0-pre"} -ckb-network-alert = { path = "../network-alert", version = "= 0.111.0-pre" } -ckb-sync = { path = "../../sync", version = "= 0.111.0-pre"} -ckb-verification = { path = "../../verification", version = "= 0.111.0-pre" } -ckb-verification-traits = { path = "../../verification/traits", version = "= 0.111.0-pre" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-pre" } -ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-pre" } -ckb-channel = { path = "../channel", version = "= 0.111.0-pre" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-pre" } -ckb-freezer = { path = "../../freezer", version = "= 0.111.0-pre" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-pre" } -ckb-snapshot = { path = "../snapshot", version = "= 0.111.0-pre" } -ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-pre" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-pre" } -ckb-light-client-protocol-server = { path = "../light-client-protocol-server", version = "= 0.111.0-pre" } -ckb-block-filter = { path = "../../block-filter", version = "= 0.111.0-pre" } -ckb-hash = { path = "../hash", version = "= 0.111.0-pre" } +ckb-types = { path = "../types", version = "= 0.110.0-rc1" } +ckb-store = { path = "../../store", version = "= 0.110.0-rc1" } +ckb-db = { path = "../../db", version = "= 0.110.0-rc1" } +ckb-migration-template = { path = "migration-template", version = "= 0.110.0-rc1" } +ckb-app-config = { path = "../app-config", version = "= 0.110.0-rc1" } +ckb-db-migration = { path = "../../db-migration", version = "= 0.110.0-rc1" } +ckb-logger = { path = "../logger", version = "= 0.110.0-rc1" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.110.0-rc1" } +ckb-error = { path = "../../error", version = "= 0.110.0-rc1" } +ckb-build-info = { path = "../build-info", version = "= 0.110.0-rc1" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.110.0-rc1" } +ckb-chain = { path = "../../chain", version = "= 0.110.0-rc1" } +ckb-shared = { path = "../../shared", version = "= 0.110.0-rc1" } +ckb-network = { path = "../../network", version = "= 0.110.0-rc1"} +ckb-rpc = { path = "../../rpc", version = "= 0.110.0-rc1"} +ckb-resource = { path = "../../resource", version = "= 0.110.0-rc1"} +ckb-network-alert = { path = "../network-alert", version = "= 0.110.0-rc1" } +ckb-sync = { path = "../../sync", version = "= 0.110.0-rc1"} +ckb-verification = { path = "../../verification", version = "= 0.110.0-rc1" } +ckb-verification-traits = { path = "../../verification/traits", version = "= 0.110.0-rc1" } +ckb-async-runtime = { path = "../runtime", version = "= 0.110.0-rc1" } +ckb-proposal-table = { path = "../proposal-table", version = "= 0.110.0-rc1" } +ckb-channel = { path = "../channel", version = "= 0.110.0-rc1" } +ckb-chain-spec = { path = "../../spec", version = "= 0.110.0-rc1" } +ckb-freezer = { path = "../../freezer", version = "= 0.110.0-rc1" } +ckb-notify = { path = "../../notify", version = "= 0.110.0-rc1" } +ckb-snapshot = { path = "../snapshot", version = "= 0.110.0-rc1" } +ckb-tx-pool = { path = "../../tx-pool", version = "= 0.110.0-rc1" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.110.0-rc1" } +ckb-light-client-protocol-server = { path = "../light-client-protocol-server", version = "= 0.110.0-rc1" } +ckb-block-filter = { path = "../../block-filter", version = "= 0.110.0-rc1" } +ckb-hash = { path = "../hash", version = "= 0.110.0-rc1" } num_cpus = "1.10" once_cell = "1.8.0" tempfile.workspace = true [dev-dependencies] -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-pre", features = ["enable_faketime"] } +ckb-systemtime = {path = "../systemtime", version = "= 0.110.0-rc1", features = ["enable_faketime"] } [features] with_sentry = [ "ckb-sync/with_sentry", "ckb-network/with_sentry", "ckb-app-config/with_sentry" ] diff --git a/util/launcher/migration-template/Cargo.toml b/util/launcher/migration-template/Cargo.toml index 1c500acce6..bebe8b25c4 100644 --- a/util/launcher/migration-template/Cargo.toml +++ b/util/launcher/migration-template/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-migration-template" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/light-client-protocol-server/Cargo.toml b/util/light-client-protocol-server/Cargo.toml index b9b6550fd0..4081c70484 100644 --- a/util/light-client-protocol-server/Cargo.toml +++ b/util/light-client-protocol-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-light-client-protocol-server" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,23 +9,23 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-network = { path = "../../network", version = "= 0.111.0-pre" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-pre" } -ckb-logger = { path = "../logger", version = "= 0.111.0-pre" } -ckb-types = { path = "../types", version = "= 0.111.0-pre" } -ckb-store = { path = "../../store", version = "= 0.111.0-pre" } +ckb-network = { path = "../../network", version = "= 0.110.0-rc1" } +ckb-shared = { path = "../../shared", version = "= 0.110.0-rc1" } +ckb-logger = { path = "../logger", version = "= 0.110.0-rc1" } +ckb-types = { path = "../types", version = "= 0.110.0-rc1" } +ckb-store = { path = "../../store", version = "= 0.110.0-rc1" } ckb-merkle-mountain-range = "0.5.2" -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-pre"} +ckb-systemtime = {path = "../systemtime", version = "= 0.110.0-rc1"} [dev-dependencies] -ckb-chain = { path = "../../chain", version = "= 0.111.0-pre" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-pre" } -ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-pre" } -ckb-launcher = { path = "../launcher", version = "= 0.111.0-pre" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-pre" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-pre" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-pre" } -ckb-test-chain-utils = { path = "../test-chain-utils", version = "= 0.111.0-pre" } +ckb-chain = { path = "../../chain", version = "= 0.110.0-rc1" } +ckb-chain-spec = { path = "../../spec", version = "= 0.110.0-rc1" } +ckb-tx-pool = { path = "../../tx-pool", version = "= 0.110.0-rc1" } +ckb-launcher = { path = "../launcher", version = "= 0.110.0-rc1" } +ckb-app-config = { path = "../app-config", version = "= 0.110.0-rc1" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.110.0-rc1" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.110.0-rc1" } +ckb-test-chain-utils = { path = "../test-chain-utils", version = "= 0.110.0-rc1" } tempfile.workspace = true -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-pre", features = ["enable_faketime"]} +ckb-systemtime = {path = "../systemtime", version = "= 0.110.0-rc1", features = ["enable_faketime"]} tokio = "1.20" diff --git a/util/logger-config/Cargo.toml b/util/logger-config/Cargo.toml index f029e002ec..e13c28e217 100644 --- a/util/logger-config/Cargo.toml +++ b/util/logger-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger-config" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/logger-service/Cargo.toml b/util/logger-service/Cargo.toml index e0a865da97..e0c60a161c 100644 --- a/util/logger-service/Cargo.toml +++ b/util/logger-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger-service" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -9,9 +9,9 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-util = { path = "..", version = "= 0.111.0-pre" } -ckb-logger-config = { path = "../logger-config", version = "= 0.111.0-pre" } -ckb-channel = { path = "../channel", version = "= 0.111.0-pre" } +ckb-util = { path = "..", version = "= 0.110.0-rc1" } +ckb-logger-config = { path = "../logger-config", version = "= 0.110.0-rc1" } +ckb-channel = { path = "../channel", version = "= 0.110.0-rc1" } yansi = "0.5" log = "0.4" env_logger = "0.6" @@ -22,7 +22,7 @@ sentry = { version = "0.26.0", optional = true, features = ["log"] } time = { version = "0.3.11", features = ["formatting"] } [dev-dependencies] -ckb-logger = { path = "../logger", version = "= 0.111.0-pre" } +ckb-logger = { path = "../logger", version = "= 0.110.0-rc1" } tempfile.workspace = true [features] diff --git a/util/logger/Cargo.toml b/util/logger/Cargo.toml index e507880194..ce1e11b480 100644 --- a/util/logger/Cargo.toml +++ b/util/logger/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/memory-tracker/Cargo.toml b/util/memory-tracker/Cargo.toml index c92d4f3e28..f48532349d 100644 --- a/util/memory-tracker/Cargo.toml +++ b/util/memory-tracker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-memory-tracker" -version = "0.111.0-pre" +version = "0.110.0-rc1" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-pre" } -ckb-metrics = { path = "../metrics", version = "= 0.111.0-pre" } -ckb-db = { path = "../../db", version = "= 0.111.0-pre" } +ckb-logger = { path = "../logger", version = "= 0.110.0-rc1" } +ckb-metrics = { path = "../metrics", version = "= 0.110.0-rc1" } +ckb-db = { path = "../../db", version = "= 0.110.0-rc1" } [target.'cfg(all(not(target_env = "msvc"), not(target_os="macos")))'.dependencies] jemalloc-ctl = { package = "tikv-jemalloc-ctl", version = "0.5.0" } diff --git a/util/metrics-config/Cargo.toml b/util/metrics-config/Cargo.toml index 96bfc41046..17fe6c1ef0 100644 --- a/util/metrics-config/Cargo.toml +++ b/util/metrics-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics-config" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/metrics-service/Cargo.toml b/util/metrics-service/Cargo.toml index c13c9f835f..5df489b942 100644 --- a/util/metrics-service/Cargo.toml +++ b/util/metrics-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics-service" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -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.111.0-pre" } -ckb-metrics = { path = "../metrics", version = "= 0.111.0-pre" } -ckb-logger = { path = "../logger", version = "= 0.111.0-pre" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-pre" } -ckb-util = { path = "..", version = "= 0.111.0-pre" } +ckb-metrics-config = { path = "../metrics-config", version = "= 0.110.0-rc1" } +ckb-metrics = { path = "../metrics", version = "= 0.110.0-rc1" } +ckb-logger = { path = "../logger", version = "= 0.110.0-rc1" } +ckb-async-runtime = { path = "../runtime", version = "= 0.110.0-rc1" } +ckb-util = { path = "..", version = "= 0.110.0-rc1" } prometheus = "0.13.3" hyper = { version = "0.14", features = ["http1", "tcp", "server"] } diff --git a/util/metrics/Cargo.toml b/util/metrics/Cargo.toml index c2b7fccdde..e690ab4164 100644 --- a/util/metrics/Cargo.toml +++ b/util/metrics/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/multisig/Cargo.toml b/util/multisig/Cargo.toml index 104950d3b7..e5f4d63b99 100644 --- a/util/multisig/Cargo.toml +++ b/util/multisig/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-multisig" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,9 +9,9 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-error = { path = "../../error", version = "= 0.111.0-pre" } -ckb-logger = { path = "../logger", version = "= 0.111.0-pre" } -ckb-crypto = { path = "../crypto", version = "= 0.111.0-pre" } +ckb-error = { path = "../../error", version = "= 0.110.0-rc1" } +ckb-logger = { path = "../logger", version = "= 0.110.0-rc1" } +ckb-crypto = { path = "../crypto", version = "= 0.110.0-rc1" } [dev-dependencies] rand = "0.7" diff --git a/util/network-alert/Cargo.toml b/util/network-alert/Cargo.toml index 6468389bb8..bf2feed83b 100644 --- a/util/network-alert/Cargo.toml +++ b/util/network-alert/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-network-alert" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,24 +9,24 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-multisig = { path = "../multisig", version = "= 0.111.0-pre" } -ckb-types = { path = "../types", version = "= 0.111.0-pre" } -ckb-util = { path = "..", version = "= 0.111.0-pre" } -ckb-network = { path = "../../network", version = "= 0.111.0-pre" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-pre"} -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-pre" } -ckb-logger = { path = "../logger", version = "= 0.111.0-pre"} -ckb-app-config = { path = "../app-config", version = "= 0.111.0-pre" } -ckb-error = { path = "../../error", version = "= 0.111.0-pre" } -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-pre" } +ckb-multisig = { path = "../multisig", version = "= 0.110.0-rc1" } +ckb-types = { path = "../types", version = "= 0.110.0-rc1" } +ckb-util = { path = "..", version = "= 0.110.0-rc1" } +ckb-network = { path = "../../network", version = "= 0.110.0-rc1" } +ckb-notify = { path = "../../notify", version = "= 0.110.0-rc1"} +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.110.0-rc1" } +ckb-logger = { path = "../logger", version = "= 0.110.0-rc1"} +ckb-app-config = { path = "../app-config", version = "= 0.110.0-rc1" } +ckb-error = { path = "../../error", version = "= 0.110.0-rc1" } +ckb-systemtime = { path = "../systemtime", version = "= 0.110.0-rc1" } lru = "0.7.1" semver = "1.0" [dev-dependencies] -ckb-crypto = { path = "../crypto", version = "= 0.111.0-pre" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-pre" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-pre" } +ckb-crypto = { path = "../crypto", version = "= 0.110.0-rc1" } +ckb-async-runtime = { path = "../runtime", version = "= 0.110.0-rc1" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.110.0-rc1" } once_cell = "1.8.0" -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-pre", features = ["enable_faketime"]} +ckb-systemtime = {path = "../systemtime", version = "= 0.110.0-rc1", features = ["enable_faketime"]} faster-hex = "0.6" serde_json = "1.0" diff --git a/util/occupied-capacity/Cargo.toml b/util/occupied-capacity/Cargo.toml index f8ba7fe7ee..ac6ce64fd3 100644 --- a/util/occupied-capacity/Cargo.toml +++ b/util/occupied-capacity/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-occupied-capacity" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-pre" } -ckb-occupied-capacity-core = { path = "core", version = "= 0.111.0-pre" } +ckb-occupied-capacity-macros = { path = "macros", version = "= 0.110.0-rc1" } +ckb-occupied-capacity-core = { path = "core", version = "= 0.110.0-rc1" } diff --git a/util/occupied-capacity/core/Cargo.toml b/util/occupied-capacity/core/Cargo.toml index 667f441370..b71f2a1b95 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.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/occupied-capacity/macros/Cargo.toml b/util/occupied-capacity/macros/Cargo.toml index 5cc550b71a..d96bb25c34 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.111.0-pre" +version = "0.110.0-rc1" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -14,4 +14,4 @@ proc-macro = true [dependencies] quote = "1.0" syn = "1.0" -ckb-occupied-capacity-core = { path = "../core", version = "= 0.111.0-pre" } +ckb-occupied-capacity-core = { path = "../core", version = "= 0.110.0-rc1" } diff --git a/util/proposal-table/Cargo.toml b/util/proposal-table/Cargo.toml index cc07051509..ec7b4b4a4d 100644 --- a/util/proposal-table/Cargo.toml +++ b/util/proposal-table/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-proposal-table" -version = "0.111.0-pre" +version = "0.110.0-rc1" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-pre" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-pre" } -ckb-types = { path = "../types", version = "= 0.111.0-pre" } +ckb-logger = { path = "../logger", version = "= 0.110.0-rc1" } +ckb-chain-spec = { path = "../../spec", version = "= 0.110.0-rc1" } +ckb-types = { path = "../types", version = "= 0.110.0-rc1" } diff --git a/util/rational/Cargo.toml b/util/rational/Cargo.toml index f786fa1428..f5a7d8ba2d 100644 --- a/util/rational/Cargo.toml +++ b/util/rational/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-rational" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/reward-calculator/Cargo.toml b/util/reward-calculator/Cargo.toml index c5aba87fa2..764baebb4a 100644 --- a/util/reward-calculator/Cargo.toml +++ b/util/reward-calculator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-reward-calculator" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,15 +9,15 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-pre" } -ckb-store = { path = "../../store", version = "= 0.111.0-pre" } -ckb-dao = { path = "../dao", version = "= 0.111.0-pre" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-pre" } -ckb-logger = { path = "../logger", version = "= 0.111.0-pre" } -ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-pre"} +ckb-types = { path = "../types", version = "= 0.110.0-rc1" } +ckb-store = { path = "../../store", version = "= 0.110.0-rc1" } +ckb-dao = { path = "../dao", version = "= 0.110.0-rc1" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.110.0-rc1" } +ckb-logger = { path = "../logger", version = "= 0.110.0-rc1" } +ckb-chain-spec = {path = "../../spec", version = "= 0.110.0-rc1"} [dev-dependencies] -ckb-db = { path = "../../db", version = "= 0.111.0-pre" } -ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-pre" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-pre" } +ckb-db = { path = "../../db", version = "= 0.110.0-rc1" } +ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.110.0-rc1" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.110.0-rc1" } tempfile.workspace = true diff --git a/util/runtime/Cargo.toml b/util/runtime/Cargo.toml index 5d8d463738..0273609676 100644 --- a/util/runtime/Cargo.toml +++ b/util/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-async-runtime" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,6 +10,6 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] tokio = { version = "1", features = ["full"] } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-pre" } -ckb-logger = { path = "../logger", version = "= 0.111.0-pre" } -ckb-spawn = { path = "../spawn", version = "= 0.111.0-pre" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.110.0-rc1" } +ckb-logger = { path = "../logger", version = "= 0.110.0-rc1" } +ckb-spawn = { path = "../spawn", version = "= 0.110.0-rc1" } diff --git a/util/rust-unstable-port/Cargo.toml b/util/rust-unstable-port/Cargo.toml index ec7c8ea530..bbc09b2fd4 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.111.0-pre" +version = "0.110.0-rc1" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" diff --git a/util/snapshot/Cargo.toml b/util/snapshot/Cargo.toml index f3f12fe28f..83a62f2268 100644 --- a/util/snapshot/Cargo.toml +++ b/util/snapshot/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-snapshot" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,15 +11,15 @@ 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.111.0-pre" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-pre" } -ckb-store = { path = "../../store", version = "= 0.111.0-pre" } -ckb-db = { path = "../../db", version = "= 0.111.0-pre" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-pre" } -ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-pre" } +ckb-types = { path = "../types", version = "= 0.110.0-rc1" } +ckb-chain-spec = { path = "../../spec", version = "= 0.110.0-rc1" } +ckb-store = { path = "../../store", version = "= 0.110.0-rc1" } +ckb-db = { path = "../../db", version = "= 0.110.0-rc1" } +ckb-traits = { path = "../../traits", version = "= 0.110.0-rc1" } +ckb-proposal-table = { path = "../proposal-table", version = "= 0.110.0-rc1" } arc-swap = "1.3" -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-pre" } -ckb-freezer = { path = "../../freezer", version = "= 0.111.0-pre" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.110.0-rc1" } +ckb-freezer = { path = "../../freezer", version = "= 0.110.0-rc1" } ckb-merkle-mountain-range = "0.5.2" [features] diff --git a/util/spawn/Cargo.toml b/util/spawn/Cargo.toml index 3fc666c580..24aec0b676 100644 --- a/util/spawn/Cargo.toml +++ b/util/spawn/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-spawn" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/stop-handler/Cargo.toml b/util/stop-handler/Cargo.toml index 9cf5b0df1c..2bc38313db 100644 --- a/util/stop-handler/Cargo.toml +++ b/util/stop-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-stop-handler" -version = "0.111.0-pre" +version = "0.110.0-rc1" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,6 +10,6 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] parking_lot = "0.12" -ckb-logger = { path = "../logger", version = "= 0.111.0-pre" } +ckb-logger = { path = "../logger", version = "= 0.110.0-rc1" } tokio = { version = "1", features = ["sync", "rt-multi-thread"] } -ckb-channel = { path = "../channel", version = "= 0.111.0-pre" } +ckb-channel = { path = "../channel", version = "= 0.110.0-rc1" } diff --git a/util/systemtime/Cargo.toml b/util/systemtime/Cargo.toml index d2df774233..8975023d82 100644 --- a/util/systemtime/Cargo.toml +++ b/util/systemtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-systemtime" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/test-chain-utils/Cargo.toml b/util/test-chain-utils/Cargo.toml index 1cc5e547c6..2e74f00109 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.111.0-pre" +version = "0.110.0-rc1" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,18 +9,18 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = {path = "../types", version = "= 0.111.0-pre"} -ckb-db = { path = "../../db", version = "= 0.111.0-pre" } -ckb-store = { path = "../../store", version = "= 0.111.0-pre" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-pre" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-pre" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-pre" } +ckb-types = {path = "../types", version = "= 0.110.0-rc1"} +ckb-db = { path = "../../db", version = "= 0.110.0-rc1" } +ckb-store = { path = "../../store", version = "= 0.110.0-rc1" } +ckb-chain-spec = { path = "../../spec", version = "= 0.110.0-rc1" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.110.0-rc1" } +ckb-traits = { path = "../../traits", version = "= 0.110.0-rc1" } lazy_static = "1.3.0" -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-pre" } -ckb-resource = { path = "../../resource", version = "= 0.111.0-pre" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-pre" } -ckb-util = { path = "..", version = "= 0.111.0-pre" } +ckb-systemtime = { path = "../systemtime", version = "= 0.110.0-rc1" } +ckb-resource = { path = "../../resource", version = "= 0.110.0-rc1" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.110.0-rc1" } +ckb-util = { path = "..", version = "= 0.110.0-rc1" } tempfile.workspace = true [dev-dependencies] -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-pre", features = ["enable_faketime"] } +ckb-systemtime = { path = "../systemtime", version = "= 0.110.0-rc1", features = ["enable_faketime"] } diff --git a/util/types/Cargo.toml b/util/types/Cargo.toml index 26676e851b..98d677f6c9 100644 --- a/util/types/Cargo.toml +++ b/util/types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-types" -version = "0.111.0-pre" +version = "0.110.0-rc1" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,17 +10,17 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] molecule = "=0.7.5" -ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-pre" } +ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.110.0-rc1" } numext-fixed-uint = { version = "0.1", features = ["support_rand", "support_heapsize", "support_serde"] } bytes = { version="1", features = ["serde"] } merkle-cbt = "0.3" -ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-pre" } -ckb-hash = { path = "../hash", version = "= 0.111.0-pre" } -ckb-channel = { path = "../channel", version = "= 0.111.0-pre" } -ckb-constant = { path = "../constant", version = "= 0.111.0-pre" } +ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.110.0-rc1" } +ckb-hash = { path = "../hash", version = "= 0.110.0-rc1" } +ckb-channel = { path = "../channel", version = "= 0.110.0-rc1" } +ckb-constant = { path = "../constant", version = "= 0.110.0-rc1" } bit-vec = "0.6.3" -ckb-error = { path = "../../error", version = "= 0.111.0-pre" } -ckb-rational = { path = "../rational", version = "= 0.111.0-pre" } +ckb-error = { path = "../../error", version = "= 0.110.0-rc1" } +ckb-rational = { path = "../rational", version = "= 0.110.0-rc1" } once_cell = "1.8.0" derive_more = { version = "0.99.0", default-features=false, features = ["display"] } ckb-merkle-mountain-range = "0.5.2" diff --git a/verification/Cargo.toml b/verification/Cargo.toml index 01b5315d4d..061b878668 100644 --- a/verification/Cargo.toml +++ b/verification/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,20 +9,20 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-pre" } -ckb-script = { path = "../script", version = "= 0.111.0-pre" } -ckb-pow = { path = "../pow", version = "= 0.111.0-pre" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-pre" } +ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } +ckb-script = { path = "../script", version = "= 0.110.0-rc1" } +ckb-pow = { path = "../pow", version = "= 0.110.0-rc1" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.110.0-rc1" } lru = "0.7.1" -ckb-traits = { path = "../traits", version = "= 0.111.0-pre" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-pre" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-pre" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-pre" } -ckb-error = { path = "../error", version = "= 0.111.0-pre" } +ckb-traits = { path = "../traits", version = "= 0.110.0-rc1" } +ckb-chain-spec = { path = "../spec", version = "= 0.110.0-rc1" } +ckb-dao = { path = "../util/dao", version = "= 0.110.0-rc1" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.110.0-rc1" } +ckb-error = { path = "../error", version = "= 0.110.0-rc1" } derive_more = { version = "0.99.0", default-features=false, features = ["display"] } -ckb-verification-traits = { path = "./traits", version = "= 0.111.0-pre" } +ckb-verification-traits = { path = "./traits", version = "= 0.110.0-rc1" } [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-pre" } -ckb-resource = { path = "../resource", version = "= 0.111.0-pre" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-pre", features=["enable_faketime"]} +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.110.0-rc1" } +ckb-resource = { path = "../resource", version = "= 0.110.0-rc1" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.110.0-rc1", features=["enable_faketime"]} diff --git a/verification/contextual/Cargo.toml b/verification/contextual/Cargo.toml index 6c75f25da1..a97c366da1 100644 --- a/verification/contextual/Cargo.toml +++ b/verification/contextual/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification-contextual" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,27 +9,27 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../../util/types", version = "= 0.111.0-pre" } -ckb-store = { path = "../../store", version = "= 0.111.0-pre" } -ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-pre" } +ckb-types = { path = "../../util/types", version = "= 0.110.0-rc1" } +ckb-store = { path = "../../store", version = "= 0.110.0-rc1" } +ckb-systemtime = { path = "../../util/systemtime", version = "= 0.110.0-rc1" } rayon = "1.0" -ckb-traits = { path = "../../traits", version = "= 0.111.0-pre" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-pre" } -ckb-dao = { path = "../../util/dao", version = "= 0.111.0-pre" } -ckb-dao-utils = { path = "../../util/dao/utils", version = "= 0.111.0-pre" } -ckb-logger = {path = "../../util/logger", version = "= 0.111.0-pre"} -ckb-reward-calculator= { path = "../../util/reward-calculator", version = "= 0.111.0-pre" } -ckb-error = { path = "../../error", version = "= 0.111.0-pre" } +ckb-traits = { path = "../../traits", version = "= 0.110.0-rc1" } +ckb-chain-spec = { path = "../../spec", version = "= 0.110.0-rc1" } +ckb-dao = { path = "../../util/dao", version = "= 0.110.0-rc1" } +ckb-dao-utils = { path = "../../util/dao/utils", version = "= 0.110.0-rc1" } +ckb-logger = {path = "../../util/logger", version = "= 0.110.0-rc1"} +ckb-reward-calculator= { path = "../../util/reward-calculator", version = "= 0.110.0-rc1" } +ckb-error = { path = "../../error", version = "= 0.110.0-rc1" } tokio = { version = "1", features = ["sync", "rt-multi-thread"] } -ckb-async-runtime = { path = "../../util/runtime", version = "= 0.111.0-pre" } -ckb-verification-traits = { path = "../traits", version = "= 0.111.0-pre" } -ckb-verification = { path = "..", version = "= 0.111.0-pre" } +ckb-async-runtime = { path = "../../util/runtime", version = "= 0.110.0-rc1" } +ckb-verification-traits = { path = "../traits", version = "= 0.110.0-rc1" } +ckb-verification = { path = "..", version = "= 0.110.0-rc1" } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] -ckb-chain = { path = "../../chain", version = "= 0.111.0-pre" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-pre" } -ckb-launcher = { path = "../../util/launcher", version = "= 0.111.0-pre" } -ckb-test-chain-utils = { path = "../../util/test-chain-utils", version = "= 0.111.0-pre" } -ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-pre", features = ["enable_faketime"]} +ckb-chain = { path = "../../chain", version = "= 0.110.0-rc1" } +ckb-shared = { path = "../../shared", version = "= 0.110.0-rc1" } +ckb-launcher = { path = "../../util/launcher", version = "= 0.110.0-rc1" } +ckb-test-chain-utils = { path = "../../util/test-chain-utils", version = "= 0.110.0-rc1" } +ckb-systemtime = { path = "../../util/systemtime", version = "= 0.110.0-rc1", features = ["enable_faketime"]} rand = "0.7" diff --git a/verification/traits/Cargo.toml b/verification/traits/Cargo.toml index 69e1c233a5..24b3898873 100644 --- a/verification/traits/Cargo.toml +++ b/verification/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification-traits" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,4 +10,4 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] bitflags = "1.0" -ckb-error = { path = "../../error", version = "= 0.111.0-pre" } +ckb-error = { path = "../../error", version = "= 0.110.0-rc1" } diff --git a/wasm-build-test/Cargo.toml b/wasm-build-test/Cargo.toml index 55abc32d0a..2693a21d9f 100644 --- a/wasm-build-test/Cargo.toml +++ b/wasm-build-test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-wasm-test" -version = "0.111.0-pre" +version = "0.110.0-rc1" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,8 +9,8 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-pre" } -ckb-script = { path = "../script", version = "= 0.111.0-pre", default-features = false, features = [] } +ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } +ckb-script = { path = "../script", version = "= 0.110.0-rc1", default-features = false, features = [] } # Prevent this from interfering with workspaces [workspace] From bf8daf9c8412650f4a3fbd1074ad6d8be22aa2f0 Mon Sep 17 00:00:00 2001 From: mohanson Date: Wed, 14 Jun 2023 16:18:01 +0800 Subject: [PATCH 002/125] fix(scripts): set_debug_printer should updates generator's debug_printer --- script/src/verify.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/script/src/verify.rs b/script/src/verify.rs index 3f4ebc81a8..0ff5aca316 100644 --- a/script/src/verify.rs +++ b/script/src/verify.rs @@ -336,8 +336,6 @@ impl { data_loader: DL, - debug_printer: DebugPrinter, - rtx: Arc, binaries_by_data_hash: HashMap, @@ -464,7 +462,6 @@ impl(&mut self, func: F) { - self.debug_printer = Arc::new(func); + self.generator.debug_printer = Arc::new(func); } #[cfg(test)] From 37cca1197fe8d1732c48284fc8daa3872559c1f1 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 14 Jun 2023 16:39:32 +0800 Subject: [PATCH 003/125] Fix `ckb init -c unsupported_spec` should not create config files --- util/app-config/src/cli.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/util/app-config/src/cli.rs b/util/app-config/src/cli.rs index a63a974b86..522d3faee8 100644 --- a/util/app-config/src/cli.rs +++ b/util/app-config/src/cli.rs @@ -1,6 +1,6 @@ //! CKB command line arguments parser. use ckb_build_info::Version; -use ckb_resource::{DEFAULT_P2P_PORT, DEFAULT_RPC_PORT, DEFAULT_SPEC}; +use ckb_resource::{AVAILABLE_SPECS, DEFAULT_P2P_PORT, DEFAULT_RPC_PORT, DEFAULT_SPEC}; use clap::{Arg, ArgGroup, ArgMatches, Command}; /// binary file name(ckb) @@ -414,6 +414,12 @@ fn init() -> Command { Arg::new(ARG_CHAIN) .short('c') .long(ARG_CHAIN) + .value_parser( + AVAILABLE_SPECS + .iter() + .map(|v| v.to_string()) + .collect::>(), + ) .default_value(DEFAULT_SPEC) .help("Initializes CKB directory for "), ) From 926fa4c5f4858f9955bbeb3c77f73f386d697032 Mon Sep 17 00:00:00 2001 From: zhangsoledad <787953403@qq.com> Date: Fri, 16 Jun 2023 11:15:24 +0800 Subject: [PATCH 004/125] fix: permanent difficulty mode reward --- spec/src/consensus.rs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/spec/src/consensus.rs b/spec/src/consensus.rs index a7d053610c..800225209c 100644 --- a/spec/src/consensus.rs +++ b/spec/src/consensus.rs @@ -797,9 +797,18 @@ impl Consensus { epoch_duration_in_milliseconds, } => { if self.permanent_difficulty() { + let primary_epoch_reward = + self.primary_epoch_reward_of_next_epoch(&epoch).as_u64(); + let block_reward = + Capacity::shannons(primary_epoch_reward / epoch.length()); + let remainder_reward = + Capacity::shannons(primary_epoch_reward % epoch.length()); + let dummy_epoch_ext = epoch .clone() .into_builder() + .base_block_reward(block_reward) + .remainder_reward(remainder_reward) .number(epoch.number() + 1) .last_block_hash_in_previous_epoch(header.hash()) .start_number(header.number() + 1) From 36bf9086859f7b742f1019eca00564ba4021f932 Mon Sep 17 00:00:00 2001 From: ian Date: Fri, 16 Jun 2023 08:39:17 +0200 Subject: [PATCH 005/125] chore: bump to v0.111.0-rc2 --- Cargo.lock | 136 +++++++++---------- Cargo.toml | 8 +- README.md | 2 +- benches/Cargo.toml | 36 ++--- block-filter/Cargo.toml | 14 +- chain/Cargo.toml | 52 +++---- ckb-bin/Cargo.toml | 46 +++---- db-migration/Cargo.toml | 12 +- db-schema/Cargo.toml | 2 +- db/Cargo.toml | 10 +- error/Cargo.toml | 4 +- freezer/Cargo.toml | 12 +- miner/Cargo.toml | 20 +-- network/Cargo.toml | 22 +-- notify/Cargo.toml | 12 +- pow/Cargo.toml | 6 +- resource/Cargo.toml | 6 +- rpc/Cargo.toml | 60 ++++---- script/Cargo.toml | 24 ++-- script/fuzz/Cargo.toml | 10 +- shared/Cargo.toml | 38 +++--- spec/Cargo.toml | 26 ++-- store/Cargo.toml | 20 +-- sync/Cargo.toml | 56 ++++---- test/Cargo.toml | 40 +++--- traits/Cargo.toml | 4 +- tx-pool/Cargo.toml | 44 +++--- util/Cargo.toml | 4 +- util/app-config/Cargo.toml | 24 ++-- util/build-info/Cargo.toml | 2 +- util/chain-iter/Cargo.toml | 6 +- util/channel/Cargo.toml | 2 +- util/constant/Cargo.toml | 2 +- util/crypto/Cargo.toml | 4 +- util/dao/Cargo.toml | 16 +-- util/dao/utils/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/indexer/Cargo.toml | 20 +-- util/instrument/Cargo.toml | 12 +- util/jsonrpc-types/Cargo.toml | 4 +- util/launcher/Cargo.toml | 68 +++++----- util/launcher/migration-template/Cargo.toml | 2 +- util/light-client-protocol-server/Cargo.toml | 32 ++--- util/logger-config/Cargo.toml | 2 +- util/logger-service/Cargo.toml | 10 +- util/logger/Cargo.toml | 2 +- util/memory-tracker/Cargo.toml | 8 +- util/metrics-config/Cargo.toml | 2 +- util/metrics-service/Cargo.toml | 12 +- util/metrics/Cargo.toml | 2 +- util/multisig/Cargo.toml | 8 +- util/network-alert/Cargo.toml | 30 ++-- 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 | 20 +-- util/runtime/Cargo.toml | 8 +- util/rust-unstable-port/Cargo.toml | 2 +- util/snapshot/Cargo.toml | 18 +-- util/spawn/Cargo.toml | 2 +- util/stop-handler/Cargo.toml | 6 +- util/systemtime/Cargo.toml | 2 +- util/test-chain-utils/Cargo.toml | 24 ++-- util/types/Cargo.toml | 16 +-- verification/Cargo.toml | 28 ++-- verification/contextual/Cargo.toml | 38 +++--- verification/traits/Cargo.toml | 4 +- wasm-build-test/Cargo.toml | 6 +- 73 files changed, 606 insertions(+), 606 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9fcaa195d2..ae72f75c58 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -395,7 +395,7 @@ dependencies = [ [[package]] name = "ckb" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-bin", "ckb-build-info", @@ -404,7 +404,7 @@ dependencies = [ [[package]] name = "ckb-app-config" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-build-info", "ckb-chain-spec", @@ -433,7 +433,7 @@ dependencies = [ [[package]] name = "ckb-async-runtime" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-logger", "ckb-spawn", @@ -443,7 +443,7 @@ dependencies = [ [[package]] name = "ckb-benches" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-app-config", "ckb-chain", @@ -471,7 +471,7 @@ dependencies = [ [[package]] name = "ckb-bin" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "base64", "ckb-app-config", @@ -511,7 +511,7 @@ dependencies = [ [[package]] name = "ckb-block-filter" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-async-runtime", "ckb-logger", @@ -523,11 +523,11 @@ dependencies = [ [[package]] name = "ckb-build-info" -version = "0.110.0-rc1" +version = "0.111.0-rc2" [[package]] name = "ckb-chain" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -561,7 +561,7 @@ dependencies = [ [[package]] name = "ckb-chain-iter" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-store", "ckb-types", @@ -569,7 +569,7 @@ dependencies = [ [[package]] name = "ckb-chain-spec" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-constant", "ckb-crypto", @@ -589,18 +589,18 @@ dependencies = [ [[package]] name = "ckb-channel" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "crossbeam-channel", ] [[package]] name = "ckb-constant" -version = "0.110.0-rc1" +version = "0.111.0-rc2" [[package]] name = "ckb-crypto" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-fixed-hash", "faster-hex", @@ -612,7 +612,7 @@ dependencies = [ [[package]] name = "ckb-dao" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "byteorder", "ckb-chain-spec", @@ -627,7 +627,7 @@ dependencies = [ [[package]] name = "ckb-dao-utils" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "byteorder", "ckb-error", @@ -636,7 +636,7 @@ dependencies = [ [[package]] name = "ckb-db" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-app-config", "ckb-db-schema", @@ -649,7 +649,7 @@ dependencies = [ [[package]] name = "ckb-db-migration" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-app-config", "ckb-db", @@ -663,11 +663,11 @@ dependencies = [ [[package]] name = "ckb-db-schema" -version = "0.110.0-rc1" +version = "0.111.0-rc2" [[package]] name = "ckb-error" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "anyhow", "ckb-occupied-capacity", @@ -677,7 +677,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-fixed-hash-core", "ckb-fixed-hash-macros", @@ -685,7 +685,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-core" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "faster-hex", "serde", @@ -695,7 +695,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-macros" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-fixed-hash-core", "proc-macro2", @@ -705,7 +705,7 @@ dependencies = [ [[package]] name = "ckb-freezer" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-error", "ckb-logger", @@ -721,7 +721,7 @@ dependencies = [ [[package]] name = "ckb-hash" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "blake2b-ref", "blake2b-rs", @@ -729,7 +729,7 @@ dependencies = [ [[package]] name = "ckb-indexer" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -751,7 +751,7 @@ dependencies = [ [[package]] name = "ckb-instrument" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-chain", "ckb-chain-iter", @@ -764,7 +764,7 @@ dependencies = [ [[package]] name = "ckb-jsonrpc-types" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-types", "faster-hex", @@ -777,7 +777,7 @@ dependencies = [ [[package]] name = "ckb-launcher" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -833,7 +833,7 @@ dependencies = [ [[package]] name = "ckb-light-client-protocol-server" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-app-config", "ckb-chain", @@ -856,14 +856,14 @@ dependencies = [ [[package]] name = "ckb-logger" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "log", ] [[package]] name = "ckb-logger-config" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "serde", "toml", @@ -871,7 +871,7 @@ dependencies = [ [[package]] name = "ckb-logger-service" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "backtrace", "ckb-channel", @@ -890,7 +890,7 @@ dependencies = [ [[package]] name = "ckb-memory-tracker" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-db", "ckb-logger", @@ -912,7 +912,7 @@ dependencies = [ [[package]] name = "ckb-metrics" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "once_cell", "prometheus", @@ -921,14 +921,14 @@ dependencies = [ [[package]] name = "ckb-metrics-config" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "serde", ] [[package]] name = "ckb-metrics-service" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-async-runtime", "ckb-logger", @@ -941,7 +941,7 @@ dependencies = [ [[package]] name = "ckb-migration-template" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "quote", "syn", @@ -949,7 +949,7 @@ dependencies = [ [[package]] name = "ckb-miner" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "base64", "ckb-app-config", @@ -978,7 +978,7 @@ dependencies = [ [[package]] name = "ckb-multisig" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-crypto", "ckb-error", @@ -988,7 +988,7 @@ dependencies = [ [[package]] name = "ckb-network" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "bitflags", "bloom-filters", @@ -1026,7 +1026,7 @@ dependencies = [ [[package]] name = "ckb-network-alert" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1050,7 +1050,7 @@ dependencies = [ [[package]] name = "ckb-notify" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1062,7 +1062,7 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-occupied-capacity-core", "ckb-occupied-capacity-macros", @@ -1070,14 +1070,14 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity-core" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "serde", ] [[package]] name = "ckb-occupied-capacity-macros" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-occupied-capacity-core", "quote", @@ -1086,7 +1086,7 @@ dependencies = [ [[package]] name = "ckb-pow" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "byteorder", "ckb-hash", @@ -1098,7 +1098,7 @@ dependencies = [ [[package]] name = "ckb-proposal-table" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-chain-spec", "ckb-logger", @@ -1107,7 +1107,7 @@ dependencies = [ [[package]] name = "ckb-rational" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "numext-fixed-uint", "proptest", @@ -1116,7 +1116,7 @@ dependencies = [ [[package]] name = "ckb-resource" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-system-scripts", "ckb-types", @@ -1130,7 +1130,7 @@ dependencies = [ [[package]] name = "ckb-reward-calculator" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-chain-spec", "ckb-dao", @@ -1157,7 +1157,7 @@ dependencies = [ [[package]] name = "ckb-rpc" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-app-config", "ckb-chain", @@ -1206,14 +1206,14 @@ dependencies = [ [[package]] name = "ckb-rust-unstable-port" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "is_sorted", ] [[package]] name = "ckb-script" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "byteorder", "ckb-chain-spec", @@ -1238,7 +1238,7 @@ dependencies = [ [[package]] name = "ckb-shared" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "arc-swap", "ckb-async-runtime", @@ -1262,7 +1262,7 @@ dependencies = [ [[package]] name = "ckb-snapshot" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "arc-swap", "ckb-chain-spec", @@ -1278,11 +1278,11 @@ dependencies = [ [[package]] name = "ckb-spawn" -version = "0.110.0-rc1" +version = "0.111.0-rc2" [[package]] name = "ckb-stop-handler" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-channel", "ckb-logger", @@ -1292,7 +1292,7 @@ dependencies = [ [[package]] name = "ckb-store" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -1310,7 +1310,7 @@ dependencies = [ [[package]] name = "ckb-sync" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "bitflags", "ckb-app-config", @@ -1367,11 +1367,11 @@ dependencies = [ [[package]] name = "ckb-systemtime" -version = "0.110.0-rc1" +version = "0.111.0-rc2" [[package]] name = "ckb-test-chain-utils" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-chain-spec", "ckb-dao-utils", @@ -1389,14 +1389,14 @@ dependencies = [ [[package]] name = "ckb-traits" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-types", ] [[package]] name = "ckb-tx-pool" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1432,7 +1432,7 @@ dependencies = [ [[package]] name = "ckb-types" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "bit-vec", "bytes 1.4.0", @@ -1456,7 +1456,7 @@ dependencies = [ [[package]] name = "ckb-util" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-fixed-hash", "linked-hash-map", @@ -1467,7 +1467,7 @@ dependencies = [ [[package]] name = "ckb-verification" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-chain-spec", "ckb-dao", @@ -1487,7 +1487,7 @@ dependencies = [ [[package]] name = "ckb-verification-contextual" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "ckb-async-runtime", "ckb-chain", @@ -1514,7 +1514,7 @@ dependencies = [ [[package]] name = "ckb-verification-traits" -version = "0.110.0-rc1" +version = "0.111.0-rc2" dependencies = [ "bitflags", "ckb-error", diff --git a/Cargo.toml b/Cargo.toml index 8bed3aa657..ffa072d9eb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,11 +11,11 @@ repository = "https://github.com/nervosnetwork/ckb" rust-version = "1.67.1" [build-dependencies] -ckb-build-info = { path = "util/build-info", version = "= 0.110.0-rc1" } +ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc2" } [dependencies] -ckb-build-info = { path = "util/build-info", version = "= 0.110.0-rc1" } -ckb-bin = { path = "ckb-bin", version = "= 0.110.0-rc1" } +ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc2" } +ckb-bin = { path = "ckb-bin", version = "= 0.111.0-rc2" } [dev-dependencies] diff --git a/README.md b/README.md index de2fdb5a06..4624e61a31 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.110.0--rc1-orange.svg)](https://github.com/nervosnetwork/ckb/releases) +[![Version](https://img.shields.io/badge/version-0.111.0--rc2-orange.svg)](https://github.com/nervosnetwork/ckb/releases) [![Nervos Talk](https://img.shields.io/badge/discuss-on%20Nervos%20Talk-3CC68A.svg)](https://talk.nervos.org/t/where-to-discuss-ckb-and-how-to-ask-for-support/6024) master | develop diff --git a/benches/Cargo.toml b/benches/Cargo.toml index 17944ceba9..53f92c460b 100644 --- a/benches/Cargo.toml +++ b/benches/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-benches" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,26 +13,26 @@ repository = "https://github.com/nervosnetwork/ckb" [dev-dependencies] criterion = "0.4" -ckb-chain = { path = "../chain", version = "= 0.110.0-rc1" } -ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } -ckb-shared = { path = "../shared", version = "= 0.110.0-rc1" } -ckb-store = { path = "../store", version = "= 0.110.0-rc1" } -ckb-chain-spec = { path = "../spec", version = "= 0.110.0-rc1" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc2" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc2" } +ckb-store = { path = "../store", version = "= 0.111.0-rc2" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc2" } rand = "0.7" -ckb-hash = {path = "../util/hash", version = "= 0.110.0-rc1"} -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.110.0-rc1" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.110.0-rc1" } -ckb-dao = { path = "../util/dao", version = "= 0.110.0-rc1" } +ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc2"} +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc2" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc2" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc2" } ckb-system-scripts = { version = "= 0.5.4" } lazy_static = "1.3.0" -ckb-crypto = { path = "../util/crypto", version = "= 0.110.0-rc1" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.110.0-rc1" } -ckb-verification = { path = "../verification", version = "= 0.110.0-rc1" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.110.0-rc1" } -ckb-app-config = { path = "../util/app-config", version = "= 0.110.0-rc1" } -ckb-resource = { path = "../resource", version = "= 0.110.0-rc1" } -ckb-network = { path = "../network", version = "= 0.110.0-rc1" } -ckb-launcher = { path = "../util/launcher", version = "= 0.110.0-rc1" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc2" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc2" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc2" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc2" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc2" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc2" } +ckb-network = { path = "../network", version = "= 0.111.0-rc2" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc2" } tempfile.workspace = true [[bench]] diff --git a/block-filter/Cargo.toml b/block-filter/Cargo.toml index 7b6c49ebe4..796909fba3 100644 --- a/block-filter/Cargo.toml +++ b/block-filter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-block-filter" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,9 +11,9 @@ repository = "https://github.com/nervosnetwork/ckb" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ckb-store = { path = "../store", version = "= 0.110.0-rc1" } -ckb-shared = { path = "../shared", version = "= 0.110.0-rc1" } -ckb-logger = { path = "../util/logger", version = "= 0.110.0-rc1" } -ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.110.0-rc1" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.110.0-rc1" } +ckb-store = { path = "../store", version = "= 0.111.0-rc2" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc2" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc2" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc2" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc2" } diff --git a/chain/Cargo.toml b/chain/Cargo.toml index d5d029e86e..be4ac5017e 100644 --- a/chain/Cargo.toml +++ b/chain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,37 +9,37 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.110.0-rc1" } -ckb-metrics = { path = "../util/metrics", version = "= 0.110.0-rc1" } -ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } -ckb-shared = { path = "../shared", version = "= 0.110.0-rc1" } -ckb-chain-spec = { path = "../spec", version = "= 0.110.0-rc1" } -ckb-store = { path = "../store", version = "= 0.110.0-rc1" } -ckb-verification = { path = "../verification", version = "= 0.110.0-rc1" } -ckb-verification-contextual = { path = "../verification/contextual", version = "= 0.110.0-rc1" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.110.0-rc1" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.110.0-rc1" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.110.0-rc1" } -ckb-dao = { path = "../util/dao", version = "= 0.110.0-rc1" } -ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.110.0-rc1" } -ckb-error = { path = "../error", version = "= 0.110.0-rc1" } -ckb-app-config = { path = "../util/app-config", version = "= 0.110.0-rc1" } -ckb-rust-unstable-port = { path = "../util/rust-unstable-port", version = "= 0.110.0-rc1" } -ckb-channel = { path = "../util/channel", version = "= 0.110.0-rc1" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc2" } +ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc2" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc2" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc2" } +ckb-store = { path = "../store", version = "= 0.111.0-rc2" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc2" } +ckb-verification-contextual = { path = "../verification/contextual", version = "= 0.111.0-rc2" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc2" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc2" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc2" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc2" } +ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc2" } +ckb-error = { path = "../error", version = "= 0.111.0-rc2" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc2" } +ckb-rust-unstable-port = { path = "../util/rust-unstable-port", version = "= 0.111.0-rc2" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc2" } faux = { version = "^0.1", optional = true } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.110.0-rc1" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.110.0-rc1" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.110.0-rc1" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.110.0-rc1", features = ["internal"] } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.110.0-rc1" } -ckb-network = { path = "../network", version = "= 0.110.0-rc1" } -ckb-launcher = { path = "../util/launcher", version = "= 0.110.0-rc1" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc2" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc2" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc2" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc2", features = ["internal"] } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc2" } +ckb-network = { path = "../network", version = "= 0.111.0-rc2" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc2" } lazy_static = "1.4" tempfile.workspace = true -ckb-systemtime = { path = "../util/systemtime", version = "= 0.110.0-rc1" ,features = ["enable_faketime"]} +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc2" ,features = ["enable_faketime"]} [features] default = [] diff --git a/ckb-bin/Cargo.toml b/ckb-bin/Cargo.toml index 63bbd5f63a..aa12f18929 100644 --- a/ckb-bin/Cargo.toml +++ b/ckb-bin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-bin" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -14,29 +14,29 @@ serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0" } serde_plain = "0.3.0" toml = "0.5" -ckb-app-config = { path = "../util/app-config", version = "= 0.110.0-rc1" } -ckb-logger = { path = "../util/logger", version = "= 0.110.0-rc1" } -ckb-logger-service = { path = "../util/logger-service", version = "= 0.110.0-rc1" } -ckb-metrics-service = { path = "../util/metrics-service", version = "= 0.110.0-rc1" } -ckb-util = { path = "../util", version = "= 0.110.0-rc1" } -ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } -ckb-channel = { path = "../util/channel", version = "= 0.110.0-rc1" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.110.0-rc1" } -ckb-chain = { path = "../chain", version = "= 0.110.0-rc1" } -ckb-shared = { path = "../shared", version = "= 0.110.0-rc1" } -ckb-store = { path = "../store", version = "= 0.110.0-rc1" } -ckb-chain-spec = {path = "../spec", version = "= 0.110.0-rc1"} -ckb-miner = { path = "../miner", version = "= 0.110.0-rc1" } -ckb-network = { path = "../network", version = "= 0.110.0-rc1"} -ckb-resource = { path = "../resource", version = "= 0.110.0-rc1"} +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc2" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc2" } +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc2" } +ckb-metrics-service = { path = "../util/metrics-service", version = "= 0.111.0-rc2" } +ckb-util = { path = "../util", version = "= 0.111.0-rc2" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc2" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc2" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc2" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc2" } +ckb-store = { path = "../store", version = "= 0.111.0-rc2" } +ckb-chain-spec = {path = "../spec", version = "= 0.111.0-rc2"} +ckb-miner = { path = "../miner", version = "= 0.111.0-rc2" } +ckb-network = { path = "../network", version = "= 0.111.0-rc2"} +ckb-resource = { path = "../resource", version = "= 0.111.0-rc2"} ctrlc = { version = "3.1", features = ["termination"] } -ckb-instrument = { path = "../util/instrument", version = "= 0.110.0-rc1", features = ["progress_bar"] } -ckb-build-info = { path = "../util/build-info", version = "= 0.110.0-rc1" } -ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.110.0-rc1" } -ckb-chain-iter = { path = "../util/chain-iter", version = "= 0.110.0-rc1" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.110.0-rc1" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.110.0-rc1" } -ckb-launcher = { path = "../util/launcher", version = "= 0.110.0-rc1" } +ckb-instrument = { path = "../util/instrument", version = "= 0.111.0-rc2", features = ["progress_bar"] } +ckb-build-info = { path = "../util/build-info", version = "= 0.111.0-rc2" } +ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc2" } +ckb-chain-iter = { path = "../util/chain-iter", version = "= 0.111.0-rc2" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc2" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc2" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc2" } base64 = "0.21.0" tempfile.workspace = true rayon = "1.0" diff --git a/db-migration/Cargo.toml b/db-migration/Cargo.toml index d71d7f2350..9e3d961b96 100644 --- a/db-migration/Cargo.toml +++ b/db-migration/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db-migration" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,16 +11,16 @@ 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.110.0-rc1" } -ckb-logger = { path = "../util/logger", version = "= 0.110.0-rc1" } -ckb-error = { path = "../error", version = "= 0.110.0-rc1" } -ckb-db-schema = { path = "../db-schema", version = "= 0.110.0-rc1" } +ckb-db = { path = "../db", version = "= 0.111.0-rc2" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc2" } +ckb-error = { path = "../error", version = "= 0.111.0-rc2" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc2" } indicatif = "0.16" console = ">=0.9.1, <1.0.0" [dev-dependencies] tempfile.workspace = true -ckb-app-config = { path = "../util/app-config", version = "= 0.110.0-rc1" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc2" } [features] portable = ["ckb-db/portable"] diff --git a/db-schema/Cargo.toml b/db-schema/Cargo.toml index 4815322263..8735b7d37a 100644 --- a/db-schema/Cargo.toml +++ b/db-schema/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db-schema" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/db/Cargo.toml b/db/Cargo.toml index fa075532d4..82654d739d 100644 --- a/db/Cargo.toml +++ b/db/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,12 +9,12 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-app-config = { path = "../util/app-config", version = "= 0.110.0-rc1" } -ckb-logger = { path = "../util/logger", version = "= 0.110.0-rc1" } -ckb-error = { path = "../error", version = "= 0.110.0-rc1" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc2" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc2" } +ckb-error = { path = "../error", version = "= 0.111.0-rc2" } libc = "0.2" rocksdb = { package = "ckb-rocksdb", version ="=0.20.0", features = ["snappy"], default-features = false } -ckb-db-schema = { path = "../db-schema", version = "= 0.110.0-rc1" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc2" } [dev-dependencies] tempfile.workspace = true diff --git a/error/Cargo.toml b/error/Cargo.toml index 7b9c511e6a..ea908e4be9 100644 --- a/error/Cargo.toml +++ b/error/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-error" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,5 +11,5 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] thiserror = "1.0.22" anyhow = "1.0.34" -ckb-occupied-capacity = { path = "../util/occupied-capacity", version = "= 0.110.0-rc1" } +ckb-occupied-capacity = { path = "../util/occupied-capacity", version = "= 0.111.0-rc2" } derive_more = { version = "0.99.0", default-features = false, features = ["display"] } diff --git a/freezer/Cargo.toml b/freezer/Cargo.toml index 161c8a3c74..556a273a24 100644 --- a/freezer/Cargo.toml +++ b/freezer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-freezer" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,11 +10,11 @@ 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.110.0-rc1" } -ckb-error = { path = "../error", version = "= 0.110.0-rc1" } -ckb-logger = { path = "../util/logger", version = "= 0.110.0-rc1" } -ckb-util = { path = "../util", version = "= 0.110.0-rc1" } -ckb-metrics = { path = "../util/metrics", version = "= 0.110.0-rc1" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } +ckb-error = { path = "../error", version = "= 0.111.0-rc2" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc2" } +ckb-util = { path = "../util", version = "= 0.111.0-rc2" } +ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc2" } fs2 = "0.4.3" fail = "0.4" snap = "1" diff --git a/miner/Cargo.toml b/miner/Cargo.toml index ea0be8ab56..fa5f937bac 100644 --- a/miner/Cargo.toml +++ b/miner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-miner" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,23 +9,23 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.110.0-rc1" } -ckb-app-config = { path = "../util/app-config", version = "= 0.110.0-rc1" } -ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } -ckb-channel = { path = "../util/channel", version = "= 0.110.0-rc1" } -ckb-hash = { path = "../util/hash", version = "= 0.110.0-rc1" } -ckb-pow = { path = "../pow", version = "= 0.110.0-rc1" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc2" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc2" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc2" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc2" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc2" } rand = "0.7" rand_distr = "0.3" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.110.0-rc1" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc2" } hyper = { version = "0.14", features = ["client", "http2", "http1", "server"] } hyper-tls = "0.5" futures = "0.3" lru = "0.7.1" -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.110.0-rc1" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.110.0-rc1" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc2" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc2" } indicatif = "0.16" console = ">=0.9.1, <1.0.0" eaglesong = "0.1" diff --git a/network/Cargo.toml b/network/Cargo.toml index 609342dfae..ad82aaa2dd 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-network" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,28 +11,28 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] rand = "0.7" serde = { version = "1.0", features = ["derive"] } -ckb-util = { path = "../util", version = "= 0.110.0-rc1" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.110.0-rc1" } -ckb-logger = { path = "../util/logger", version = "= 0.110.0-rc1" } -ckb-app-config = { path = "../util/app-config", version = "= 0.110.0-rc1" } -ckb-metrics = {path = "../util/metrics", version = "= 0.110.0-rc1"} +ckb-util = { path = "../util", version = "= 0.111.0-rc2" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc2" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc2" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc2" } +ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc2"} tokio = { version = "1", features = ["sync", "macros"] } tokio-util = { version = "0.7", features = ["codec"] } futures = "0.3" -ckb-systemtime = {path = "../util/systemtime", version = "= 0.110.0-rc1"} +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc2"} lazy_static = { version = "1.3.0", optional = true } bs58 = { version = "0.4.0", optional = true } sentry = { version = "0.26.0", optional = true } faster-hex = { version = "0.6", optional = true } -ckb-hash = {path = "../util/hash", version = "= 0.110.0-rc1"} +ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc2"} secp256k1 = {version = "0.24", features = ["recovery"], optional = true } trust-dns-resolver = { version = "0.20", optional = true } snap = "1" -ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } ipnetwork = "0.18" serde_json = "1.0" bloom-filters = "0.1" -ckb-spawn = { path = "../util/spawn", version = "= 0.110.0-rc1" } +ckb-spawn = { path = "../util/spawn", version = "= 0.111.0-rc2" } socket2 = "0.4" bitflags = "1.0" @@ -48,7 +48,7 @@ criterion = "0.4" proptest = "1.0" num_cpus = "1.10" once_cell = "1.8.0" -ckb-systemtime = {path = "../util/systemtime", version = "= 0.110.0-rc1", features = ["enable_faketime"]} +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc2", features = ["enable_faketime"]} [[bench]] name = "peer_store" diff --git a/notify/Cargo.toml b/notify/Cargo.toml index 3cf15f6632..62b772620f 100644 --- a/notify/Cargo.toml +++ b/notify/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-notify" -version = "0.110.0-rc1" +version = "0.111.0-rc2" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.110.0-rc1" } -ckb-app-config = { path = "../util/app-config", version = "= 0.110.0-rc1" } -ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.110.0-rc1" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.110.0-rc1" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc2" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc2" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc2" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc2" } tokio = { version = "1", features = ["sync"] } [dev-dependencies] diff --git a/pow/Cargo.toml b/pow/Cargo.toml index ae60b78f24..1b2556c949 100644 --- a/pow/Cargo.toml +++ b/pow/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-pow" -version = "0.110.0-rc1" +version = "0.111.0-rc2" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,8 +10,8 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } -ckb-hash = { path = "../util/hash", version = "= 0.110.0-rc1"} +ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc2"} serde = { version = "1.0", features = ["derive"] } eaglesong = "0.1" log = "0.4" diff --git a/resource/Cargo.toml b/resource/Cargo.toml index 852b29922f..b5728b6a99 100644 --- a/resource/Cargo.toml +++ b/resource/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-resource" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,13 +13,13 @@ repository = "https://github.com/nervosnetwork/ckb" phf = "0.8.0" includedir = "0.6.0" serde = { version = "1.0", features = ["derive"] } -ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } ckb-system-scripts = { version = "= 0.5.4" } [build-dependencies] includedir_codegen = "0.6.0" walkdir = "2.1.4" -ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } ckb-system-scripts = { version = "= 0.5.4" } [dev-dependencies] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 019d064d9d..88dd2f43c5 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-rpc" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,19 +9,19 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-chain-spec = { path = "../spec", version = "= 0.110.0-rc1" } -ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } -ckb-network = { path = "../network", version = "= 0.110.0-rc1" } -ckb-notify = { path = "../notify", version = "= 0.110.0-rc1" } -ckb-shared = { path = "../shared", version = "= 0.110.0-rc1" } -ckb-store = { path = "../store", version = "= 0.110.0-rc1" } -ckb-sync = { path = "../sync", version = "= 0.110.0-rc1" } -ckb-chain = { path = "../chain", version = "= 0.110.0-rc1" } -ckb-logger = { path = "../util/logger", version = "= 0.110.0-rc1"} -ckb-logger-service = { path = "../util/logger-service", version = "= 0.110.0-rc1"} -ckb-network-alert = { path = "../util/network-alert", version = "= 0.110.0-rc1" } -ckb-app-config = { path = "../util/app-config", version = "= 0.110.0-rc1" } -ckb-constant = { path = "../util/constant", version = "= 0.110.0-rc1" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc2" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } +ckb-network = { path = "../network", version = "= 0.111.0-rc2" } +ckb-notify = { path = "../notify", version = "= 0.111.0-rc2" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc2" } +ckb-store = { path = "../store", version = "= 0.111.0-rc2" } +ckb-sync = { path = "../sync", version = "= 0.111.0-rc2" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc2" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc2"} +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc2"} +ckb-network-alert = { path = "../util/network-alert", version = "= 0.111.0-rc2" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc2" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc2" } jsonrpc-core = "18.0" jsonrpc-derive = "18.0" jsonrpc-http-server = "18.0" @@ -30,27 +30,27 @@ jsonrpc-ws-server = "18.0" jsonrpc-server-utils = "18.0" jsonrpc-pubsub = "18.0" serde_json = "1.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.110.0-rc1" } -ckb-verification = { path = "../verification", version = "= 0.110.0-rc1" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.110.0-rc1" } -ckb-traits = { path = "../traits", version = "= 0.110.0-rc1" } -ckb-util = { path = "../util", version = "= 0.110.0-rc1" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.110.0-rc1" } -ckb-dao = { path = "../util/dao", version = "= 0.110.0-rc1" } -ckb-error = { path = "../error", version = "= 0.110.0-rc1" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.110.0-rc1" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.110.0-rc1" } -ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.110.0-rc1" } -ckb-pow = { path = "../pow", version = "= 0.110.0-rc1" } -ckb-indexer = { path = "../util/indexer", version = "= 0.110.0-rc1" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc2" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc2" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc2" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc2" } +ckb-util = { path = "../util", version = "= 0.111.0-rc2" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc2" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc2" } +ckb-error = { path = "../error", version = "= 0.111.0-rc2" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc2" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc2" } +ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc2" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc2" } +ckb-indexer = { path = "../util/indexer", version = "= 0.111.0-rc2" } itertools = "0.10.5" tokio = "1" [dev-dependencies] reqwest = { version = "0.11.4", features = ["blocking", "json"] } serde = { version = "1.0", features = ["derive"] } -ckb-launcher = { path = "../util/launcher", version = "= 0.110.0-rc1" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.110.0-rc1" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc2" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc2" } tempfile.workspace = true pretty_assertions = "1.3.0" -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.110.0-rc1" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc2" } diff --git a/script/Cargo.toml b/script/Cargo.toml index 40ad7ff23b..898a21cab5 100644 --- a/script/Cargo.toml +++ b/script/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-script" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -18,24 +18,24 @@ logging = ["ckb-logger"] flatmemory = [] [dependencies] -ckb-traits = { path = "../traits", version = "= 0.110.0-rc1" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc2" } byteorder = "1.3.1" -ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } -ckb-hash = { path = "../util/hash", version = "= 0.110.0-rc1" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc2" } ckb-vm = { version = "=0.24.0", default-features = false } faster-hex = "0.6" -ckb-logger = { path = "../util/logger", version = "= 0.110.0-rc1", optional = true } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc2", optional = true } serde = { version = "1.0", features = ["derive"] } -ckb-error = { path = "../error", version = "= 0.110.0-rc1" } -ckb-chain-spec = { path = "../spec", version = "= 0.110.0-rc1" } +ckb-error = { path = "../error", version = "= 0.111.0-rc2" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc2" } [dev-dependencies] proptest = "1.0" -ckb-db = { path = "../db", version = "= 0.110.0-rc1" } -ckb-store = { path = "../store", version = "= 0.110.0-rc1" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.110.0-rc1" } +ckb-db = { path = "../db", version = "= 0.111.0-rc2" } +ckb-store = { path = "../store", version = "= 0.111.0-rc2" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc2" } tiny-keccak = { version = "2.0", features = ["sha3"] } -ckb-crypto = { path = "../util/crypto", version = "= 0.110.0-rc1" } -ckb-db-schema = { path = "../db-schema", version = "= 0.110.0-rc1" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc2" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc2" } tempfile.workspace = true rand = "0.8.4" diff --git a/script/fuzz/Cargo.toml b/script/fuzz/Cargo.toml index dc8917cf3e..c514c5699e 100644 --- a/script/fuzz/Cargo.toml +++ b/script/fuzz/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-script-fuzz" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -15,10 +15,10 @@ cargo-fuzz = true [dependencies] arbitrary = { version = "1", features = ["derive"] } libfuzzer-sys = { version="0.4.0", features=["arbitrary-derive"] } -ckb-traits = { path = "../../traits", version = "= 0.110.0-rc1" } -ckb-types = { path = "../../util/types", version = "= 0.110.0-rc1" } -ckb-script = { path = "../../script", version = "= 0.110.0-rc1" } -ckb-chain-spec = { path = "../../spec", version = "= 0.110.0-rc1" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc2" } +ckb-types = { path = "../../util/types", version = "= 0.111.0-rc2" } +ckb-script = { path = "../../script", version = "= 0.111.0-rc2" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc2" } # Prevent this from interfering with workspaces [workspace] diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 09a9a18dd5..409960a4d9 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-shared" -version = "0.110.0-rc1" +version = "0.111.0-rc2" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,27 +9,27 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } -ckb-chain-spec = { path = "../spec", version = "= 0.110.0-rc1" } -ckb-store = { path = "../store", version = "= 0.110.0-rc1" } -ckb-db = { path = "../db", version = "= 0.110.0-rc1" } -ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.110.0-rc1" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc2" } +ckb-store = { path = "../store", version = "= 0.111.0-rc2" } +ckb-db = { path = "../db", version = "= 0.111.0-rc2" } +ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc2" } arc-swap = "1.3" -ckb-error = { path = "../error", version = "= 0.110.0-rc1" } -ckb-snapshot = { path = "../util/snapshot", version = "= 0.110.0-rc1" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.110.0-rc1" } -ckb-verification = { path = "../verification", version = "= 0.110.0-rc1" } -ckb-notify = { path = "../notify", version = "= 0.110.0-rc1" } -ckb-logger = { path = "../util/logger", version = "= 0.110.0-rc1" } -ckb-db-schema = { path = "../db-schema", version = "= 0.110.0-rc1" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.110.0-rc1" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.110.0-rc1" } -ckb-channel = { path = "../util/channel", version = "= 0.110.0-rc1" } -ckb-constant = { path = "../util/constant", version = "= 0.110.0-rc1" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.110.0-rc1" } +ckb-error = { path = "../error", version = "= 0.111.0-rc2" } +ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc2" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc2" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc2" } +ckb-notify = { path = "../notify", version = "= 0.111.0-rc2" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc2" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc2" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc2" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc2" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc2" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc2" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc2" } [dev-dependencies] -ckb-systemtime = { path = "../util/systemtime", version = "= 0.110.0-rc1", features = ["enable_faketime"] } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc2", features = ["enable_faketime"] } [features] portable = ["ckb-db/portable", "ckb-store/portable", "ckb-tx-pool/portable"] diff --git a/spec/Cargo.toml b/spec/Cargo.toml index f0b9791ad4..2dbd13839e 100644 --- a/spec/Cargo.toml +++ b/spec/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain-spec" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,15 +11,15 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] serde = { version = "1.0", features = ["derive"] } toml = "0.5" -ckb-constant = { path = "../util/constant", version = "= 0.110.0-rc1" } -ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } -ckb-pow = { path = "../pow", version = "= 0.110.0-rc1" } -ckb-resource = { path = "../resource", version = "= 0.110.0-rc1" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.110.0-rc1" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.110.0-rc1" } -ckb-rational = { path = "../util/rational", version = "= 0.110.0-rc1" } -ckb-crypto = { path = "../util/crypto", version = "= 0.110.0-rc1"} -ckb-hash = { path = "../util/hash", version = "= 0.110.0-rc1"} -ckb-error = { path = "../error", version = "= 0.110.0-rc1" } -ckb-traits = { path = "../traits", version = "= 0.110.0-rc1" } -ckb-util = { path = "../util", version = "= 0.110.0-rc1" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc2" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc2" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc2" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc2" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc2" } +ckb-rational = { path = "../util/rational", version = "= 0.111.0-rc2" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc2"} +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc2"} +ckb-error = { path = "../error", version = "= 0.111.0-rc2" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc2" } +ckb-util = { path = "../util", version = "= 0.111.0-rc2" } diff --git a/store/Cargo.toml b/store/Cargo.toml index c88d1e1f91..ea3cff135f 100644 --- a/store/Cargo.toml +++ b/store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-store" -version = "0.110.0-rc1" +version = "0.111.0-rc2" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,16 +9,16 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } -ckb-db = { path = "../db", version = "= 0.110.0-rc1" } -ckb-chain-spec = { path = "../spec", version = "= 0.110.0-rc1" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } +ckb-db = { path = "../db", version = "= 0.111.0-rc2" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc2" } lru = "0.7.1" -ckb-traits = { path = "../traits", version = "= 0.110.0-rc1" } -ckb-util = { path = "../util", version = "= 0.110.0-rc1" } -ckb-error = { path = "../error", version = "= 0.110.0-rc1" } -ckb-app-config = { path = "../util/app-config", version = "= 0.110.0-rc1" } -ckb-db-schema = { path = "../db-schema", version = "= 0.110.0-rc1" } -ckb-freezer = { path = "../freezer", version = "= 0.110.0-rc1" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc2" } +ckb-util = { path = "../util", version = "= 0.111.0-rc2" } +ckb-error = { path = "../error", version = "= 0.111.0-rc2" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc2" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc2" } +ckb-freezer = { path = "../freezer", version = "= 0.111.0-rc2" } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] diff --git a/sync/Cargo.toml b/sync/Cargo.toml index bcf3625062..5f333253aa 100644 --- a/sync/Cargo.toml +++ b/sync/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-sync" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,48 +9,48 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-chain = { path = "../chain", version = "= 0.110.0-rc1" } -ckb-shared = { path = "../shared", version = "= 0.110.0-rc1" } -ckb-store = { path = "../store", version = "= 0.110.0-rc1" } -ckb-app-config = {path = "../util/app-config", version = "= 0.110.0-rc1"} -ckb-types = {path = "../util/types", version = "= 0.110.0-rc1"} -ckb-network = { path = "../network", version = "= 0.110.0-rc1" } -ckb-logger = {path = "../util/logger", version = "= 0.110.0-rc1"} -ckb-metrics = {path = "../util/metrics", version = "= 0.110.0-rc1"} -ckb-util = { path = "../util", version = "= 0.110.0-rc1" } -ckb-verification = { path = "../verification", version = "= 0.110.0-rc1" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.110.0-rc1" } -ckb-chain-spec = { path = "../spec", version = "= 0.110.0-rc1" } -ckb-channel = { path = "../util/channel", version = "= 0.110.0-rc1" } -ckb-traits = { path = "../traits", version = "= 0.110.0-rc1" } -ckb-error = {path = "../error", version = "= 0.110.0-rc1"} -ckb-tx-pool = { path = "../tx-pool", version = "= 0.110.0-rc1" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc2" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc2" } +ckb-store = { path = "../store", version = "= 0.111.0-rc2" } +ckb-app-config = {path = "../util/app-config", version = "= 0.111.0-rc2"} +ckb-types = {path = "../util/types", version = "= 0.111.0-rc2"} +ckb-network = { path = "../network", version = "= 0.111.0-rc2" } +ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc2"} +ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc2"} +ckb-util = { path = "../util", version = "= 0.111.0-rc2" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc2" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc2" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc2" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc2" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc2" } +ckb-error = {path = "../error", version = "= 0.111.0-rc2"} +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc2" } sentry = { version = "0.26.0", optional = true } -ckb-constant = { path = "../util/constant", version = "= 0.110.0-rc1" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.110.0-rc1" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.110.0-rc1" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc2" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc2" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc2" } tokio = { version = "1", features = ["sync"] } lru = "0.7.1" futures = "0.3" governor = "0.3.1" tempfile.workspace = true -ckb-systemtime = { path = "../util/systemtime", version = "= 0.110.0-rc1" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc2" } bitflags = "1.0" dashmap = "4.0" keyed_priority_queue = "0.3" sled = "0.34.7" [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.110.0-rc1" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc2" } rand = "0.7" -ckb-dao = { path = "../util/dao", version = "= 0.110.0-rc1" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.110.0-rc1" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.110.0-rc1" } -ckb-chain = { path = "../chain", version = "= 0.110.0-rc1", features = ["mock"] } -ckb-launcher = { path = "../util/launcher", version = "= 0.110.0-rc1" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc2" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc2" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc2" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc2", features = ["mock"] } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc2" } faux = "^0.1" once_cell = "1.8.0" -ckb-systemtime = { path = "../util/systemtime", version = "= 0.110.0-rc1" , features = ["enable_faketime"]} +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc2" , features = ["enable_faketime"]} [features] default = [] diff --git a/test/Cargo.toml b/test/Cargo.toml index 5945a18652..c6a3dc4d95 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-test" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,28 +11,28 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] clap = { version = "=3.2.21" } toml = "0.5.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.110.0-rc1" } -ckb-app-config = { path = "../util/app-config", version = "= 0.110.0-rc1" } -ckb-network = { path = "../network", version = "= 0.110.0-rc1" } -ckb-channel = { path = "../util/channel", version = "= 0.110.0-rc1" } -ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } -ckb-hash = { path = "../util/hash", version = "= 0.110.0-rc1" } -ckb-util = { path = "../util", version = "= 0.110.0-rc1" } -ckb-chain-spec = { path = "../spec", version = "= 0.110.0-rc1" } -ckb-crypto = { path = "../util/crypto", version = "= 0.110.0-rc1" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.110.0-rc1" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.110.0-rc1" } -ckb-resource = { path = "../resource", version = "= 0.110.0-rc1" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.110.0-rc1" } -ckb-logger = { path = "../util/logger", version = "= 0.110.0-rc1" } -ckb-logger-config = { path = "../util/logger-config", version = "= 0.110.0-rc1" } -ckb-logger-service = { path = "../util/logger-service", version = "= 0.110.0-rc1" } -ckb-error = { path = "../error", version = "= 0.110.0-rc1" } -ckb-constant = { path = "../util/constant", version = "= 0.110.0-rc1" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc2" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc2" } +ckb-network = { path = "../network", version = "= 0.111.0-rc2" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc2" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc2" } +ckb-util = { path = "../util", version = "= 0.111.0-rc2" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc2" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc2" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc2" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc2" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc2" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc2" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc2" } +ckb-logger-config = { path = "../util/logger-config", version = "= 0.111.0-rc2" } +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc2" } +ckb-error = { path = "../error", version = "= 0.111.0-rc2" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc2" } tempfile = "3" reqwest = { version = "0.11.4", features = ["blocking", "json"] } rand = "0.7" -ckb-systemtime = { path = "../util/systemtime", version = "= 0.110.0-rc1" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc2" } serde_json = "1.0" lazy_static = "1.4.0" byteorder = "1.3.1" diff --git a/traits/Cargo.toml b/traits/Cargo.toml index ca9c24833e..cf49301687 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-traits" -version = "0.110.0-rc1" +version = "0.111.0-rc2" authors = ["Nervos Core Dev "] edition = "2021" 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.110.0-rc1" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } diff --git a/tx-pool/Cargo.toml b/tx-pool/Cargo.toml index bc22b09b7f..5db855a3cb 100644 --- a/tx-pool/Cargo.toml +++ b/tx-pool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-tx-pool" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,27 +11,27 @@ 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.110.0-rc1" } -ckb-logger = {path = "../util/logger", version = "= 0.110.0-rc1"} -ckb-verification = { path = "../verification", version = "= 0.110.0-rc1" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.110.0-rc1"} +ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } +ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc2"} +ckb-verification = { path = "../verification", version = "= 0.111.0-rc2" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc2"} lru = "0.7.1" -ckb-dao = { path = "../util/dao", version = "= 0.110.0-rc1" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.110.0-rc1" } -ckb-store = { path = "../store", version = "= 0.110.0-rc1" } -ckb-util = { path = "../util", version = "= 0.110.0-rc1" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.110.0-rc1" } -ckb-chain-spec = { path = "../spec", version = "= 0.110.0-rc1" } -ckb-snapshot = { path = "../util/snapshot", version = "= 0.110.0-rc1" } -ckb-error = { path = "../error", version = "= 0.110.0-rc1" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc2" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc2" } +ckb-store = { path = "../store", version = "= 0.111.0-rc2" } +ckb-util = { path = "../util", version = "= 0.111.0-rc2" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc2" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc2" } +ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc2" } +ckb-error = { path = "../error", version = "= 0.111.0-rc2" } tokio = { version = "1", features = ["sync", "process"] } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.110.0-rc1" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.110.0-rc1" } -ckb-app-config = { path = "../util/app-config", version = "= 0.110.0-rc1" } -ckb-network = { path = "../network", version = "= 0.110.0-rc1" } -ckb-channel = { path = "../util/channel", version = "= 0.110.0-rc1" } -ckb-traits = { path = "../traits", version = "= 0.110.0-rc1" } -ckb-db = { path = "../db", version = "= 0.110.0-rc1" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc2" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc2" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc2" } +ckb-network = { path = "../network", version = "= 0.111.0-rc2" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc2" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc2" } +ckb-db = { path = "../db", version = "= 0.111.0-rc2" } sentry = { version = "0.26.0", optional = true } serde_json = "1.0" rand = "0.8.4" @@ -42,8 +42,8 @@ rustc-hash = "1.1" [dev-dependencies] tempfile.workspace = true -ckb-hash = { path = "../util/hash", version = "= 0.110.0-rc1" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.110.0-rc1", features = ["enable_faketime"]} +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc2" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc2", features = ["enable_faketime"]} [features] default = [] diff --git a/util/Cargo.toml b/util/Cargo.toml index 62fcadf2d1..a7bddd81fc 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-util" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -15,7 +15,7 @@ regex = "1.1.6" once_cell = "1.8.0" [dev-dependencies] -ckb-fixed-hash = { path = "fixed-hash", version = "= 0.110.0-rc1" } +ckb-fixed-hash = { path = "fixed-hash", version = "= 0.111.0-rc2" } [features] deadlock_detection = ["parking_lot/deadlock_detection"] diff --git a/util/app-config/Cargo.toml b/util/app-config/Cargo.toml index b642df4e48..bd31717b7b 100644 --- a/util/app-config/Cargo.toml +++ b/util/app-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-app-config" -version = "0.110.0-rc1" +version = "0.111.0-rc2" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -15,20 +15,20 @@ serde_plain = "0.3.0" serde_json = "1.0" toml = "0.5" path-clean = "0.1.0" -ckb-logger = { path = "../../util/logger", version = "= 0.110.0-rc1" } -ckb-logger-config = { path = "../../util/logger-config", version = "= 0.110.0-rc1" } -ckb-metrics-config = { path = "../../util/metrics-config", version = "= 0.110.0-rc1" } -ckb-chain-spec = {path = "../../spec", version = "= 0.110.0-rc1"} -ckb-jsonrpc-types = {path = "../jsonrpc-types", version = "= 0.110.0-rc1"} -ckb-pow = { path = "../../pow", version = "= 0.110.0-rc1" } -ckb-resource = { path = "../../resource", version = "= 0.110.0-rc1"} -ckb-build-info = { path = "../build-info", version = "= 0.110.0-rc1" } -ckb-types = { path = "../types", version = "= 0.110.0-rc1" } +ckb-logger = { path = "../../util/logger", version = "= 0.111.0-rc2" } +ckb-logger-config = { path = "../../util/logger-config", version = "= 0.111.0-rc2" } +ckb-metrics-config = { path = "../../util/metrics-config", version = "= 0.111.0-rc2" } +ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc2"} +ckb-jsonrpc-types = {path = "../jsonrpc-types", version = "= 0.111.0-rc2"} +ckb-pow = { path = "../../pow", version = "= 0.111.0-rc2" } +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc2"} +ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc2" } +ckb-types = { path = "../types", version = "= 0.111.0-rc2" } secio = { version="0.5.7", package="tentacle-secio" } multiaddr = { version="0.3.0", package="tentacle-multiaddr" } rand = "0.7" sentry = { version = "0.26.0", optional = true } -ckb-systemtime = { path = "../systemtime", version = "= 0.110.0-rc1" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc2" } url = { version = "2.2.2", features = ["serde"] } ubyte = { version = "0.10", features = ["serde"] } @@ -37,4 +37,4 @@ with_sentry = ["sentry"] [dev-dependencies] tempfile.workspace = true -ckb-systemtime = { path = "../systemtime", version = "= 0.110.0-rc1" ,features = ["enable_faketime"]} +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc2" ,features = ["enable_faketime"]} diff --git a/util/build-info/Cargo.toml b/util/build-info/Cargo.toml index bcf3b28150..111633c55b 100644 --- a/util/build-info/Cargo.toml +++ b/util/build-info/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-build-info" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/chain-iter/Cargo.toml b/util/chain-iter/Cargo.toml index 8b3bbbbbb7..7043dc7438 100644 --- a/util/chain-iter/Cargo.toml +++ b/util/chain-iter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain-iter" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.110.0-rc1" } -ckb-store = { path = "../../store", version = "= 0.110.0-rc1" } +ckb-types = { path = "../types", version = "= 0.111.0-rc2" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc2" } diff --git a/util/channel/Cargo.toml b/util/channel/Cargo.toml index 0435c034fe..071f726c0e 100644 --- a/util/channel/Cargo.toml +++ b/util/channel/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-channel" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/constant/Cargo.toml b/util/constant/Cargo.toml index a043c4d7cd..dea783a0e3 100644 --- a/util/constant/Cargo.toml +++ b/util/constant/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-constant" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/crypto/Cargo.toml b/util/crypto/Cargo.toml index a205c31744..ce75ae463b 100644 --- a/util/crypto/Cargo.toml +++ b/util/crypto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-crypto" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.110.0-rc1" } +ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc2" } lazy_static = "1.3" secp256k1 = { version = "0.24", features = ["recovery"], optional = true } thiserror = "1.0.22" diff --git a/util/dao/Cargo.toml b/util/dao/Cargo.toml index 671e4bdac3..becb695523 100644 --- a/util/dao/Cargo.toml +++ b/util/dao/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-dao" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,13 +10,13 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../types", version = "= 0.110.0-rc1" } -ckb-chain-spec = { path = "../../spec", version = "= 0.110.0-rc1" } -ckb-dao-utils = { path = "./utils", version = "= 0.110.0-rc1" } -ckb-traits = { path = "../../traits", version = "= 0.110.0-rc1" } +ckb-types = { path = "../types", version = "= 0.111.0-rc2" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc2" } +ckb-dao-utils = { path = "./utils", version = "= 0.111.0-rc2" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc2" } [dev-dependencies] -ckb-db = { path = "../../db", version = "= 0.110.0-rc1" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.110.0-rc1" } -ckb-store = { path = "../../store", version = "= 0.110.0-rc1" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc2" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc2" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc2" } tempfile.workspace = true diff --git a/util/dao/utils/Cargo.toml b/util/dao/utils/Cargo.toml index 4296ac5084..cfb9352974 100644 --- a/util/dao/utils/Cargo.toml +++ b/util/dao/utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-dao-utils" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,5 +10,5 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../../types", version = "= 0.110.0-rc1" } -ckb-error = { path = "../../../error", version = "= 0.110.0-rc1" } +ckb-types = { path = "../../types", version = "= 0.111.0-rc2" } +ckb-error = { path = "../../../error", version = "= 0.111.0-rc2" } diff --git a/util/fixed-hash/Cargo.toml b/util/fixed-hash/Cargo.toml index 8a16cd6e68..4fe19e423d 100644 --- a/util/fixed-hash/Cargo.toml +++ b/util/fixed-hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-fixed-hash" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -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.110.0-rc1" } -ckb-fixed-hash-macros = { path = "macros", version = "= 0.110.0-rc1" } +ckb-fixed-hash-core = { path = "core", version = "= 0.111.0-rc2" } +ckb-fixed-hash-macros = { path = "macros", version = "= 0.111.0-rc2" } diff --git a/util/fixed-hash/core/Cargo.toml b/util/fixed-hash/core/Cargo.toml index 79ee7132d3..08d858f876 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.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/fixed-hash/macros/Cargo.toml b/util/fixed-hash/macros/Cargo.toml index 8e19e4fb8d..2e355905b1 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.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -12,7 +12,7 @@ repository = "https://github.com/nervosnetwork/ckb" proc-macro = true [dependencies] -ckb-fixed-hash-core = { path = "../core", version = "= 0.110.0-rc1" } +ckb-fixed-hash-core = { path = "../core", version = "= 0.111.0-rc2" } quote = "1.0" syn = "1.0" proc-macro2 = "1.0" diff --git a/util/hash/Cargo.toml b/util/hash/Cargo.toml index a773f07ec9..4ff90b9bf4 100644 --- a/util/hash/Cargo.toml +++ b/util/hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-hash" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/indexer/Cargo.toml b/util/indexer/Cargo.toml index c72f2d8775..7994c412a5 100644 --- a/util/indexer/Cargo.toml +++ b/util/indexer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-indexer" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,15 +13,15 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] thiserror = "1.0" rocksdb = { package = "ckb-rocksdb", version ="=0.20.0", features = ["snappy"], default-features = false } -ckb-db-schema = { path = "../../db-schema", version = "= 0.110.0-rc1" } -ckb-types = { path = "../types", version = "= 0.110.0-rc1" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.110.0-rc1" } -ckb-logger = { path = "../logger", version = "= 0.110.0-rc1" } -ckb-app-config = { path = "../app-config", version = "= 0.110.0-rc1" } -ckb-notify = { path = "../../notify", version = "= 0.110.0-rc1" } -ckb-store = { path = "../../store", version = "= 0.110.0-rc1" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.110.0-rc1" } -ckb-async-runtime = { path = "../runtime", version = "= 0.110.0-rc1" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc2" } +ckb-types = { path = "../types", version = "= 0.111.0-rc2" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc2" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc2" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc2" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc2" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc2" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc2" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc2" } rhai = { version = "1.10.0", features = ["no_function", "no_float", "no_module", "sync"]} serde_json = "1.0" numext-fixed-uint = "0.1" diff --git a/util/instrument/Cargo.toml b/util/instrument/Cargo.toml index b2c7d3eefc..5cec6f93d7 100644 --- a/util/instrument/Cargo.toml +++ b/util/instrument/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-instrument" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.110.0-rc1" } -ckb-chain = { path = "../../chain", version = "= 0.110.0-rc1" } -ckb-chain-iter = { path = "../chain-iter", version = "= 0.110.0-rc1" } -ckb-shared = { path = "../../shared", version = "= 0.110.0-rc1" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.110.0-rc1" } +ckb-types = { path = "../types", version = "= 0.111.0-rc2" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc2" } +ckb-chain-iter = { path = "../chain-iter", version = "= 0.111.0-rc2" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc2" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc2" } serde_json = "1.0" indicatif = { version = "0.16", optional = true } diff --git a/util/jsonrpc-types/Cargo.toml b/util/jsonrpc-types/Cargo.toml index cc8f4b4b42..4495e73bd7 100644 --- a/util/jsonrpc-types/Cargo.toml +++ b/util/jsonrpc-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-jsonrpc-types" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,7 +9,7 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.110.0-rc1" } +ckb-types = { path = "../types", version = "= 0.111.0-rc2" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" faster-hex = "0.6" diff --git a/util/launcher/Cargo.toml b/util/launcher/Cargo.toml index 5f04590d7d..edbe266d87 100644 --- a/util/launcher/Cargo.toml +++ b/util/launcher/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-launcher" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,44 +11,44 @@ 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.110.0-rc1" } -ckb-store = { path = "../../store", version = "= 0.110.0-rc1" } -ckb-db = { path = "../../db", version = "= 0.110.0-rc1" } -ckb-migration-template = { path = "migration-template", version = "= 0.110.0-rc1" } -ckb-app-config = { path = "../app-config", version = "= 0.110.0-rc1" } -ckb-db-migration = { path = "../../db-migration", version = "= 0.110.0-rc1" } -ckb-logger = { path = "../logger", version = "= 0.110.0-rc1" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.110.0-rc1" } -ckb-error = { path = "../../error", version = "= 0.110.0-rc1" } -ckb-build-info = { path = "../build-info", version = "= 0.110.0-rc1" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.110.0-rc1" } -ckb-chain = { path = "../../chain", version = "= 0.110.0-rc1" } -ckb-shared = { path = "../../shared", version = "= 0.110.0-rc1" } -ckb-network = { path = "../../network", version = "= 0.110.0-rc1"} -ckb-rpc = { path = "../../rpc", version = "= 0.110.0-rc1"} -ckb-resource = { path = "../../resource", version = "= 0.110.0-rc1"} -ckb-network-alert = { path = "../network-alert", version = "= 0.110.0-rc1" } -ckb-sync = { path = "../../sync", version = "= 0.110.0-rc1"} -ckb-verification = { path = "../../verification", version = "= 0.110.0-rc1" } -ckb-verification-traits = { path = "../../verification/traits", version = "= 0.110.0-rc1" } -ckb-async-runtime = { path = "../runtime", version = "= 0.110.0-rc1" } -ckb-proposal-table = { path = "../proposal-table", version = "= 0.110.0-rc1" } -ckb-channel = { path = "../channel", version = "= 0.110.0-rc1" } -ckb-chain-spec = { path = "../../spec", version = "= 0.110.0-rc1" } -ckb-freezer = { path = "../../freezer", version = "= 0.110.0-rc1" } -ckb-notify = { path = "../../notify", version = "= 0.110.0-rc1" } -ckb-snapshot = { path = "../snapshot", version = "= 0.110.0-rc1" } -ckb-tx-pool = { path = "../../tx-pool", version = "= 0.110.0-rc1" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.110.0-rc1" } -ckb-light-client-protocol-server = { path = "../light-client-protocol-server", version = "= 0.110.0-rc1" } -ckb-block-filter = { path = "../../block-filter", version = "= 0.110.0-rc1" } -ckb-hash = { path = "../hash", version = "= 0.110.0-rc1" } +ckb-types = { path = "../types", version = "= 0.111.0-rc2" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc2" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc2" } +ckb-migration-template = { path = "migration-template", version = "= 0.111.0-rc2" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc2" } +ckb-db-migration = { path = "../../db-migration", version = "= 0.111.0-rc2" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc2" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc2" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc2" } +ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc2" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc2" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc2" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc2" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc2"} +ckb-rpc = { path = "../../rpc", version = "= 0.111.0-rc2"} +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc2"} +ckb-network-alert = { path = "../network-alert", version = "= 0.111.0-rc2" } +ckb-sync = { path = "../../sync", version = "= 0.111.0-rc2"} +ckb-verification = { path = "../../verification", version = "= 0.111.0-rc2" } +ckb-verification-traits = { path = "../../verification/traits", version = "= 0.111.0-rc2" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc2" } +ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc2" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc2" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc2" } +ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc2" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc2" } +ckb-snapshot = { path = "../snapshot", version = "= 0.111.0-rc2" } +ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc2" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc2" } +ckb-light-client-protocol-server = { path = "../light-client-protocol-server", version = "= 0.111.0-rc2" } +ckb-block-filter = { path = "../../block-filter", version = "= 0.111.0-rc2" } +ckb-hash = { path = "../hash", version = "= 0.111.0-rc2" } num_cpus = "1.10" once_cell = "1.8.0" tempfile.workspace = true [dev-dependencies] -ckb-systemtime = {path = "../systemtime", version = "= 0.110.0-rc1", features = ["enable_faketime"] } +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc2", features = ["enable_faketime"] } [features] with_sentry = [ "ckb-sync/with_sentry", "ckb-network/with_sentry", "ckb-app-config/with_sentry" ] diff --git a/util/launcher/migration-template/Cargo.toml b/util/launcher/migration-template/Cargo.toml index bebe8b25c4..9cb8760a06 100644 --- a/util/launcher/migration-template/Cargo.toml +++ b/util/launcher/migration-template/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-migration-template" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/light-client-protocol-server/Cargo.toml b/util/light-client-protocol-server/Cargo.toml index 4081c70484..277ac27d88 100644 --- a/util/light-client-protocol-server/Cargo.toml +++ b/util/light-client-protocol-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-light-client-protocol-server" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,23 +9,23 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-network = { path = "../../network", version = "= 0.110.0-rc1" } -ckb-shared = { path = "../../shared", version = "= 0.110.0-rc1" } -ckb-logger = { path = "../logger", version = "= 0.110.0-rc1" } -ckb-types = { path = "../types", version = "= 0.110.0-rc1" } -ckb-store = { path = "../../store", version = "= 0.110.0-rc1" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc2" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc2" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc2" } +ckb-types = { path = "../types", version = "= 0.111.0-rc2" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc2" } ckb-merkle-mountain-range = "0.5.2" -ckb-systemtime = {path = "../systemtime", version = "= 0.110.0-rc1"} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc2"} [dev-dependencies] -ckb-chain = { path = "../../chain", version = "= 0.110.0-rc1" } -ckb-chain-spec = { path = "../../spec", version = "= 0.110.0-rc1" } -ckb-tx-pool = { path = "../../tx-pool", version = "= 0.110.0-rc1" } -ckb-launcher = { path = "../launcher", version = "= 0.110.0-rc1" } -ckb-app-config = { path = "../app-config", version = "= 0.110.0-rc1" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.110.0-rc1" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.110.0-rc1" } -ckb-test-chain-utils = { path = "../test-chain-utils", version = "= 0.110.0-rc1" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc2" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc2" } +ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc2" } +ckb-launcher = { path = "../launcher", version = "= 0.111.0-rc2" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc2" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc2" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc2" } +ckb-test-chain-utils = { path = "../test-chain-utils", version = "= 0.111.0-rc2" } tempfile.workspace = true -ckb-systemtime = {path = "../systemtime", version = "= 0.110.0-rc1", features = ["enable_faketime"]} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc2", features = ["enable_faketime"]} tokio = "1.20" diff --git a/util/logger-config/Cargo.toml b/util/logger-config/Cargo.toml index e13c28e217..249894424d 100644 --- a/util/logger-config/Cargo.toml +++ b/util/logger-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger-config" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/logger-service/Cargo.toml b/util/logger-service/Cargo.toml index e0c60a161c..f151ef6723 100644 --- a/util/logger-service/Cargo.toml +++ b/util/logger-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger-service" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -9,9 +9,9 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-util = { path = "..", version = "= 0.110.0-rc1" } -ckb-logger-config = { path = "../logger-config", version = "= 0.110.0-rc1" } -ckb-channel = { path = "../channel", version = "= 0.110.0-rc1" } +ckb-util = { path = "..", version = "= 0.111.0-rc2" } +ckb-logger-config = { path = "../logger-config", version = "= 0.111.0-rc2" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc2" } yansi = "0.5" log = "0.4" env_logger = "0.6" @@ -22,7 +22,7 @@ sentry = { version = "0.26.0", optional = true, features = ["log"] } time = { version = "0.3.11", features = ["formatting"] } [dev-dependencies] -ckb-logger = { path = "../logger", version = "= 0.110.0-rc1" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc2" } tempfile.workspace = true [features] diff --git a/util/logger/Cargo.toml b/util/logger/Cargo.toml index ce1e11b480..9a5ce4de20 100644 --- a/util/logger/Cargo.toml +++ b/util/logger/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/memory-tracker/Cargo.toml b/util/memory-tracker/Cargo.toml index f48532349d..d01484b1ae 100644 --- a/util/memory-tracker/Cargo.toml +++ b/util/memory-tracker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-memory-tracker" -version = "0.110.0-rc1" +version = "0.111.0-rc2" authors = ["Nervos Core Dev "] edition = "2021" 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.110.0-rc1" } -ckb-metrics = { path = "../metrics", version = "= 0.110.0-rc1" } -ckb-db = { path = "../../db", version = "= 0.110.0-rc1" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc2" } +ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc2" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc2" } [target.'cfg(all(not(target_env = "msvc"), not(target_os="macos")))'.dependencies] jemalloc-ctl = { package = "tikv-jemalloc-ctl", version = "0.5.0" } diff --git a/util/metrics-config/Cargo.toml b/util/metrics-config/Cargo.toml index 17fe6c1ef0..20ebed397a 100644 --- a/util/metrics-config/Cargo.toml +++ b/util/metrics-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics-config" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/metrics-service/Cargo.toml b/util/metrics-service/Cargo.toml index 5df489b942..2c4a74e1ce 100644 --- a/util/metrics-service/Cargo.toml +++ b/util/metrics-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics-service" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -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.110.0-rc1" } -ckb-metrics = { path = "../metrics", version = "= 0.110.0-rc1" } -ckb-logger = { path = "../logger", version = "= 0.110.0-rc1" } -ckb-async-runtime = { path = "../runtime", version = "= 0.110.0-rc1" } -ckb-util = { path = "..", version = "= 0.110.0-rc1" } +ckb-metrics-config = { path = "../metrics-config", version = "= 0.111.0-rc2" } +ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc2" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc2" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc2" } +ckb-util = { path = "..", version = "= 0.111.0-rc2" } prometheus = "0.13.3" hyper = { version = "0.14", features = ["http1", "tcp", "server"] } diff --git a/util/metrics/Cargo.toml b/util/metrics/Cargo.toml index e690ab4164..11af7a40c3 100644 --- a/util/metrics/Cargo.toml +++ b/util/metrics/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/multisig/Cargo.toml b/util/multisig/Cargo.toml index e5f4d63b99..2208a7dbb0 100644 --- a/util/multisig/Cargo.toml +++ b/util/multisig/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-multisig" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,9 +9,9 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-error = { path = "../../error", version = "= 0.110.0-rc1" } -ckb-logger = { path = "../logger", version = "= 0.110.0-rc1" } -ckb-crypto = { path = "../crypto", version = "= 0.110.0-rc1" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc2" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc2" } +ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc2" } [dev-dependencies] rand = "0.7" diff --git a/util/network-alert/Cargo.toml b/util/network-alert/Cargo.toml index bf2feed83b..7be9cff9ac 100644 --- a/util/network-alert/Cargo.toml +++ b/util/network-alert/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-network-alert" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,24 +9,24 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-multisig = { path = "../multisig", version = "= 0.110.0-rc1" } -ckb-types = { path = "../types", version = "= 0.110.0-rc1" } -ckb-util = { path = "..", version = "= 0.110.0-rc1" } -ckb-network = { path = "../../network", version = "= 0.110.0-rc1" } -ckb-notify = { path = "../../notify", version = "= 0.110.0-rc1"} -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.110.0-rc1" } -ckb-logger = { path = "../logger", version = "= 0.110.0-rc1"} -ckb-app-config = { path = "../app-config", version = "= 0.110.0-rc1" } -ckb-error = { path = "../../error", version = "= 0.110.0-rc1" } -ckb-systemtime = { path = "../systemtime", version = "= 0.110.0-rc1" } +ckb-multisig = { path = "../multisig", version = "= 0.111.0-rc2" } +ckb-types = { path = "../types", version = "= 0.111.0-rc2" } +ckb-util = { path = "..", version = "= 0.111.0-rc2" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc2" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc2"} +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc2" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc2"} +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc2" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc2" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc2" } lru = "0.7.1" semver = "1.0" [dev-dependencies] -ckb-crypto = { path = "../crypto", version = "= 0.110.0-rc1" } -ckb-async-runtime = { path = "../runtime", version = "= 0.110.0-rc1" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.110.0-rc1" } +ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc2" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc2" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc2" } once_cell = "1.8.0" -ckb-systemtime = {path = "../systemtime", version = "= 0.110.0-rc1", features = ["enable_faketime"]} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc2", features = ["enable_faketime"]} faster-hex = "0.6" serde_json = "1.0" diff --git a/util/occupied-capacity/Cargo.toml b/util/occupied-capacity/Cargo.toml index ac6ce64fd3..99e253729f 100644 --- a/util/occupied-capacity/Cargo.toml +++ b/util/occupied-capacity/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-occupied-capacity" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.110.0-rc1" } -ckb-occupied-capacity-core = { path = "core", version = "= 0.110.0-rc1" } +ckb-occupied-capacity-macros = { path = "macros", version = "= 0.111.0-rc2" } +ckb-occupied-capacity-core = { path = "core", version = "= 0.111.0-rc2" } diff --git a/util/occupied-capacity/core/Cargo.toml b/util/occupied-capacity/core/Cargo.toml index b71f2a1b95..9392285a2a 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.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/occupied-capacity/macros/Cargo.toml b/util/occupied-capacity/macros/Cargo.toml index d96bb25c34..cb4c4a65c9 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.110.0-rc1" +version = "0.111.0-rc2" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -14,4 +14,4 @@ proc-macro = true [dependencies] quote = "1.0" syn = "1.0" -ckb-occupied-capacity-core = { path = "../core", version = "= 0.110.0-rc1" } +ckb-occupied-capacity-core = { path = "../core", version = "= 0.111.0-rc2" } diff --git a/util/proposal-table/Cargo.toml b/util/proposal-table/Cargo.toml index ec7b4b4a4d..fd4a76495f 100644 --- a/util/proposal-table/Cargo.toml +++ b/util/proposal-table/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-proposal-table" -version = "0.110.0-rc1" +version = "0.111.0-rc2" authors = ["Nervos Core Dev "] edition = "2021" 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.110.0-rc1" } -ckb-chain-spec = { path = "../../spec", version = "= 0.110.0-rc1" } -ckb-types = { path = "../types", version = "= 0.110.0-rc1" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc2" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc2" } +ckb-types = { path = "../types", version = "= 0.111.0-rc2" } diff --git a/util/rational/Cargo.toml b/util/rational/Cargo.toml index f5a7d8ba2d..9c80b49399 100644 --- a/util/rational/Cargo.toml +++ b/util/rational/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-rational" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/reward-calculator/Cargo.toml b/util/reward-calculator/Cargo.toml index 764baebb4a..3157939d8f 100644 --- a/util/reward-calculator/Cargo.toml +++ b/util/reward-calculator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-reward-calculator" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,15 +9,15 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.110.0-rc1" } -ckb-store = { path = "../../store", version = "= 0.110.0-rc1" } -ckb-dao = { path = "../dao", version = "= 0.110.0-rc1" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.110.0-rc1" } -ckb-logger = { path = "../logger", version = "= 0.110.0-rc1" } -ckb-chain-spec = {path = "../../spec", version = "= 0.110.0-rc1"} +ckb-types = { path = "../types", version = "= 0.111.0-rc2" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc2" } +ckb-dao = { path = "../dao", version = "= 0.111.0-rc2" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc2" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc2" } +ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc2"} [dev-dependencies] -ckb-db = { path = "../../db", version = "= 0.110.0-rc1" } -ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.110.0-rc1" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.110.0-rc1" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc2" } +ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc2" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc2" } tempfile.workspace = true diff --git a/util/runtime/Cargo.toml b/util/runtime/Cargo.toml index 0273609676..b588dc9b2a 100644 --- a/util/runtime/Cargo.toml +++ b/util/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-async-runtime" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,6 +10,6 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] tokio = { version = "1", features = ["full"] } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.110.0-rc1" } -ckb-logger = { path = "../logger", version = "= 0.110.0-rc1" } -ckb-spawn = { path = "../spawn", version = "= 0.110.0-rc1" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc2" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc2" } +ckb-spawn = { path = "../spawn", version = "= 0.111.0-rc2" } diff --git a/util/rust-unstable-port/Cargo.toml b/util/rust-unstable-port/Cargo.toml index bbc09b2fd4..97a6accbf2 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.110.0-rc1" +version = "0.111.0-rc2" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" diff --git a/util/snapshot/Cargo.toml b/util/snapshot/Cargo.toml index 83a62f2268..0c046df4eb 100644 --- a/util/snapshot/Cargo.toml +++ b/util/snapshot/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-snapshot" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,15 +11,15 @@ 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.110.0-rc1" } -ckb-chain-spec = { path = "../../spec", version = "= 0.110.0-rc1" } -ckb-store = { path = "../../store", version = "= 0.110.0-rc1" } -ckb-db = { path = "../../db", version = "= 0.110.0-rc1" } -ckb-traits = { path = "../../traits", version = "= 0.110.0-rc1" } -ckb-proposal-table = { path = "../proposal-table", version = "= 0.110.0-rc1" } +ckb-types = { path = "../types", version = "= 0.111.0-rc2" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc2" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc2" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc2" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc2" } +ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc2" } arc-swap = "1.3" -ckb-db-schema = { path = "../../db-schema", version = "= 0.110.0-rc1" } -ckb-freezer = { path = "../../freezer", version = "= 0.110.0-rc1" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc2" } +ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc2" } ckb-merkle-mountain-range = "0.5.2" [features] diff --git a/util/spawn/Cargo.toml b/util/spawn/Cargo.toml index 24aec0b676..8dea9fb5bf 100644 --- a/util/spawn/Cargo.toml +++ b/util/spawn/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-spawn" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/stop-handler/Cargo.toml b/util/stop-handler/Cargo.toml index 2bc38313db..135c224f70 100644 --- a/util/stop-handler/Cargo.toml +++ b/util/stop-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-stop-handler" -version = "0.110.0-rc1" +version = "0.111.0-rc2" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,6 +10,6 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] parking_lot = "0.12" -ckb-logger = { path = "../logger", version = "= 0.110.0-rc1" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc2" } tokio = { version = "1", features = ["sync", "rt-multi-thread"] } -ckb-channel = { path = "../channel", version = "= 0.110.0-rc1" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc2" } diff --git a/util/systemtime/Cargo.toml b/util/systemtime/Cargo.toml index 8975023d82..2a1a4532f9 100644 --- a/util/systemtime/Cargo.toml +++ b/util/systemtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-systemtime" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/test-chain-utils/Cargo.toml b/util/test-chain-utils/Cargo.toml index 2e74f00109..30a32faf44 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.110.0-rc1" +version = "0.111.0-rc2" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,18 +9,18 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = {path = "../types", version = "= 0.110.0-rc1"} -ckb-db = { path = "../../db", version = "= 0.110.0-rc1" } -ckb-store = { path = "../../store", version = "= 0.110.0-rc1" } -ckb-chain-spec = { path = "../../spec", version = "= 0.110.0-rc1" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.110.0-rc1" } -ckb-traits = { path = "../../traits", version = "= 0.110.0-rc1" } +ckb-types = {path = "../types", version = "= 0.111.0-rc2"} +ckb-db = { path = "../../db", version = "= 0.111.0-rc2" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc2" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc2" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc2" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc2" } lazy_static = "1.3.0" -ckb-systemtime = { path = "../systemtime", version = "= 0.110.0-rc1" } -ckb-resource = { path = "../../resource", version = "= 0.110.0-rc1" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.110.0-rc1" } -ckb-util = { path = "..", version = "= 0.110.0-rc1" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc2" } +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc2" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc2" } +ckb-util = { path = "..", version = "= 0.111.0-rc2" } tempfile.workspace = true [dev-dependencies] -ckb-systemtime = { path = "../systemtime", version = "= 0.110.0-rc1", features = ["enable_faketime"] } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc2", features = ["enable_faketime"] } diff --git a/util/types/Cargo.toml b/util/types/Cargo.toml index 98d677f6c9..0ad2bd5414 100644 --- a/util/types/Cargo.toml +++ b/util/types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-types" -version = "0.110.0-rc1" +version = "0.111.0-rc2" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,17 +10,17 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] molecule = "=0.7.5" -ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.110.0-rc1" } +ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc2" } numext-fixed-uint = { version = "0.1", features = ["support_rand", "support_heapsize", "support_serde"] } bytes = { version="1", features = ["serde"] } merkle-cbt = "0.3" -ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.110.0-rc1" } -ckb-hash = { path = "../hash", version = "= 0.110.0-rc1" } -ckb-channel = { path = "../channel", version = "= 0.110.0-rc1" } -ckb-constant = { path = "../constant", version = "= 0.110.0-rc1" } +ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc2" } +ckb-hash = { path = "../hash", version = "= 0.111.0-rc2" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc2" } +ckb-constant = { path = "../constant", version = "= 0.111.0-rc2" } bit-vec = "0.6.3" -ckb-error = { path = "../../error", version = "= 0.110.0-rc1" } -ckb-rational = { path = "../rational", version = "= 0.110.0-rc1" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc2" } +ckb-rational = { path = "../rational", version = "= 0.111.0-rc2" } once_cell = "1.8.0" derive_more = { version = "0.99.0", default-features=false, features = ["display"] } ckb-merkle-mountain-range = "0.5.2" diff --git a/verification/Cargo.toml b/verification/Cargo.toml index 061b878668..ecb3537523 100644 --- a/verification/Cargo.toml +++ b/verification/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,20 +9,20 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } -ckb-script = { path = "../script", version = "= 0.110.0-rc1" } -ckb-pow = { path = "../pow", version = "= 0.110.0-rc1" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.110.0-rc1" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } +ckb-script = { path = "../script", version = "= 0.111.0-rc2" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc2" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc2" } lru = "0.7.1" -ckb-traits = { path = "../traits", version = "= 0.110.0-rc1" } -ckb-chain-spec = { path = "../spec", version = "= 0.110.0-rc1" } -ckb-dao = { path = "../util/dao", version = "= 0.110.0-rc1" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.110.0-rc1" } -ckb-error = { path = "../error", version = "= 0.110.0-rc1" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc2" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc2" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc2" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc2" } +ckb-error = { path = "../error", version = "= 0.111.0-rc2" } derive_more = { version = "0.99.0", default-features=false, features = ["display"] } -ckb-verification-traits = { path = "./traits", version = "= 0.110.0-rc1" } +ckb-verification-traits = { path = "./traits", version = "= 0.111.0-rc2" } [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.110.0-rc1" } -ckb-resource = { path = "../resource", version = "= 0.110.0-rc1" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.110.0-rc1", features=["enable_faketime"]} +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc2" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc2" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc2", features=["enable_faketime"]} diff --git a/verification/contextual/Cargo.toml b/verification/contextual/Cargo.toml index a97c366da1..88cd409059 100644 --- a/verification/contextual/Cargo.toml +++ b/verification/contextual/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification-contextual" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,27 +9,27 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../../util/types", version = "= 0.110.0-rc1" } -ckb-store = { path = "../../store", version = "= 0.110.0-rc1" } -ckb-systemtime = { path = "../../util/systemtime", version = "= 0.110.0-rc1" } +ckb-types = { path = "../../util/types", version = "= 0.111.0-rc2" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc2" } +ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc2" } rayon = "1.0" -ckb-traits = { path = "../../traits", version = "= 0.110.0-rc1" } -ckb-chain-spec = { path = "../../spec", version = "= 0.110.0-rc1" } -ckb-dao = { path = "../../util/dao", version = "= 0.110.0-rc1" } -ckb-dao-utils = { path = "../../util/dao/utils", version = "= 0.110.0-rc1" } -ckb-logger = {path = "../../util/logger", version = "= 0.110.0-rc1"} -ckb-reward-calculator= { path = "../../util/reward-calculator", version = "= 0.110.0-rc1" } -ckb-error = { path = "../../error", version = "= 0.110.0-rc1" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc2" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc2" } +ckb-dao = { path = "../../util/dao", version = "= 0.111.0-rc2" } +ckb-dao-utils = { path = "../../util/dao/utils", version = "= 0.111.0-rc2" } +ckb-logger = {path = "../../util/logger", version = "= 0.111.0-rc2"} +ckb-reward-calculator= { path = "../../util/reward-calculator", version = "= 0.111.0-rc2" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc2" } tokio = { version = "1", features = ["sync", "rt-multi-thread"] } -ckb-async-runtime = { path = "../../util/runtime", version = "= 0.110.0-rc1" } -ckb-verification-traits = { path = "../traits", version = "= 0.110.0-rc1" } -ckb-verification = { path = "..", version = "= 0.110.0-rc1" } +ckb-async-runtime = { path = "../../util/runtime", version = "= 0.111.0-rc2" } +ckb-verification-traits = { path = "../traits", version = "= 0.111.0-rc2" } +ckb-verification = { path = "..", version = "= 0.111.0-rc2" } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] -ckb-chain = { path = "../../chain", version = "= 0.110.0-rc1" } -ckb-shared = { path = "../../shared", version = "= 0.110.0-rc1" } -ckb-launcher = { path = "../../util/launcher", version = "= 0.110.0-rc1" } -ckb-test-chain-utils = { path = "../../util/test-chain-utils", version = "= 0.110.0-rc1" } -ckb-systemtime = { path = "../../util/systemtime", version = "= 0.110.0-rc1", features = ["enable_faketime"]} +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc2" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc2" } +ckb-launcher = { path = "../../util/launcher", version = "= 0.111.0-rc2" } +ckb-test-chain-utils = { path = "../../util/test-chain-utils", version = "= 0.111.0-rc2" } +ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc2", features = ["enable_faketime"]} rand = "0.7" diff --git a/verification/traits/Cargo.toml b/verification/traits/Cargo.toml index 24b3898873..adb2987c0f 100644 --- a/verification/traits/Cargo.toml +++ b/verification/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification-traits" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,4 +10,4 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] bitflags = "1.0" -ckb-error = { path = "../../error", version = "= 0.110.0-rc1" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc2" } diff --git a/wasm-build-test/Cargo.toml b/wasm-build-test/Cargo.toml index 2693a21d9f..26f4405e19 100644 --- a/wasm-build-test/Cargo.toml +++ b/wasm-build-test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-wasm-test" -version = "0.110.0-rc1" +version = "0.111.0-rc2" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,8 +9,8 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.110.0-rc1" } -ckb-script = { path = "../script", version = "= 0.110.0-rc1", default-features = false, features = [] } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } +ckb-script = { path = "../script", version = "= 0.111.0-rc2", default-features = false, features = [] } # Prevent this from interfering with workspaces [workspace] From 23ce05106c78eaa44d459caf1ea32979b42fabe5 Mon Sep 17 00:00:00 2001 From: zhangsoledad <787953403@qq.com> Date: Fri, 16 Jun 2023 15:11:25 +0800 Subject: [PATCH 006/125] fix: get_consensus 2023 info --- rpc/README.md | 5 ++++- rpc/src/module/chain.rs | 5 ++++- util/jsonrpc-types/src/blockchain.rs | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/rpc/README.md b/rpc/README.md index 68cda868d2..843f8c56a2 100644 --- a/rpc/README.md +++ b/rpc/README.md @@ -1665,7 +1665,10 @@ Response { "rfc": "0036", "epoch_number": "0x0" }, { "rfc": "0038", "epoch_number": "0x0" } ], - "ckb2023": [] + "ckb2023": [ + { "rfc": "0146", "epoch_number": null }, + { "rfc": "0148", "epoch_number": null } + ] }, "id": "main", "initial_primary_epoch_reward": "0x71afd498d000", diff --git a/rpc/src/module/chain.rs b/rpc/src/module/chain.rs index 803ce1f30b..d238faad09 100644 --- a/rpc/src/module/chain.rs +++ b/rpc/src/module/chain.rs @@ -1347,7 +1347,10 @@ pub trait ChainRpc { /// { "rfc": "0036", "epoch_number": "0x0" }, /// { "rfc": "0038", "epoch_number": "0x0" } /// ], - /// "ckb2023": [] + /// "ckb2023": [ + /// { "rfc": "0146", "epoch_number": null }, + /// { "rfc": "0148", "epoch_number": null } + /// ] /// }, /// "id": "main", /// "initial_primary_epoch_reward": "0x71afd498d000", diff --git a/util/jsonrpc-types/src/blockchain.rs b/util/jsonrpc-types/src/blockchain.rs index 87f19c2a7f..519d3adeea 100644 --- a/util/jsonrpc-types/src/blockchain.rs +++ b/util/jsonrpc-types/src/blockchain.rs @@ -1402,7 +1402,10 @@ impl HardForks { HardForkFeature::new("0036", convert(hardforks.ckb2021.rfc_0036())), HardForkFeature::new("0038", convert(hardforks.ckb2021.rfc_0038())), ], - ckb2023: vec![], + ckb2023: vec![ + HardForkFeature::new("0146", convert(hardforks.ckb2023.rfc_0146())), + HardForkFeature::new("0148", convert(hardforks.ckb2023.rfc_0148())), + ], } } } From 1beb18a6216b8a8b239a933f14cdd2d736f476b5 Mon Sep 17 00:00:00 2001 From: zhangsoledad <787953403@qq.com> Date: Fri, 16 Jun 2023 17:08:50 +0800 Subject: [PATCH 007/125] chore: update 2023 rfc number --- chain/src/chain.rs | 4 +-- rpc/README.md | 4 +-- rpc/src/module/chain.rs | 4 +-- .../transaction_scripts_verifier_data2.rs | 2 +- script/src/verify/tests/utils.rs | 2 +- spec/src/consensus.rs | 8 ++--- spec/src/hardfork.rs | 2 +- tx-pool/src/util.rs | 6 ++-- util/jsonrpc-types/src/blockchain.rs | 4 +-- util/types/src/core/hardfork/ckb2023.rs | 36 +++++++++---------- verification/src/tests/header_verifier.rs | 2 +- 11 files changed, 37 insertions(+), 37 deletions(-) diff --git a/chain/src/chain.rs b/chain/src/chain.rs index 004782a5c2..b6291211d5 100644 --- a/chain/src/chain.rs +++ b/chain/src/chain.rs @@ -193,14 +193,14 @@ impl ForkChanges { false } else { // This method assumes that the input blocks are sorted and unique. - let rfc_0148 = hardfork.ckb2023.rfc_0148(); + let rfc_0049 = hardfork.ckb2023.rfc_0049(); let epoch_first = blocks.front().unwrap().epoch().number(); let epoch_next = blocks .back() .unwrap() .epoch() .minimum_epoch_number_after_n_blocks(1); - epoch_first < rfc_0148 && rfc_0148 <= epoch_next + epoch_first < rfc_0049 && rfc_0049 <= epoch_next } } } diff --git a/rpc/README.md b/rpc/README.md index 843f8c56a2..cf33106e12 100644 --- a/rpc/README.md +++ b/rpc/README.md @@ -1666,8 +1666,8 @@ Response { "rfc": "0038", "epoch_number": "0x0" } ], "ckb2023": [ - { "rfc": "0146", "epoch_number": null }, - { "rfc": "0148", "epoch_number": null } + { "rfc": "0048", "epoch_number": null }, + { "rfc": "0049", "epoch_number": null } ] }, "id": "main", diff --git a/rpc/src/module/chain.rs b/rpc/src/module/chain.rs index d238faad09..27f05e5bd8 100644 --- a/rpc/src/module/chain.rs +++ b/rpc/src/module/chain.rs @@ -1348,8 +1348,8 @@ pub trait ChainRpc { /// { "rfc": "0038", "epoch_number": "0x0" } /// ], /// "ckb2023": [ - /// { "rfc": "0146", "epoch_number": null }, - /// { "rfc": "0148", "epoch_number": null } + /// { "rfc": "0048", "epoch_number": null }, + /// { "rfc": "0049", "epoch_number": null } /// ] /// }, /// "id": "main", diff --git a/script/fuzz/fuzz_targets/transaction_scripts_verifier_data2.rs b/script/fuzz/fuzz_targets/transaction_scripts_verifier_data2.rs index 934b84f2ab..81f030f105 100644 --- a/script/fuzz/fuzz_targets/transaction_scripts_verifier_data2.rs +++ b/script/fuzz/fuzz_targets/transaction_scripts_verifier_data2.rs @@ -101,7 +101,7 @@ fn run(data: &[u8]) { ckb2021: CKB2021::new_mirana().as_builder().build().unwrap(), ckb2023: CKB2023::new_mirana() .as_builder() - .rfc_0148(0) + .rfc_0049(0) .build() .unwrap(), }; diff --git a/script/src/verify/tests/utils.rs b/script/src/verify/tests/utils.rs index 2239d8ab57..a92ed6cd11 100644 --- a/script/src/verify/tests/utils.rs +++ b/script/src/verify/tests/utils.rs @@ -141,7 +141,7 @@ impl TransactionScriptsVerifierWithEnv { ckb2021: CKB2021::new_mirana(), ckb2023: CKB2023::new_mirana() .as_builder() - .rfc_0148(version_2_enabled_at) + .rfc_0049(version_2_enabled_at) .build() .unwrap(), }; diff --git a/spec/src/consensus.rs b/spec/src/consensus.rs index a7d053610c..02f7769822 100644 --- a/spec/src/consensus.rs +++ b/spec/src/consensus.rs @@ -1019,13 +1019,13 @@ impl Consensus { let epoch_number = epoch.number(); - let rfc_0148 = self.hardfork_switch.ckb2023.rfc_0148(); + let rfc_0049 = self.hardfork_switch.ckb2023.rfc_0049(); // dev default is 0 - if rfc_0148 != 0 && rfc_0148 != EpochNumber::MAX { - return (epoch_number + 1 == rfc_0148 + if rfc_0049 != 0 && rfc_0049 != EpochNumber::MAX { + return (epoch_number + 1 == rfc_0049 && (proposal_window.farthest() + index) >= epoch_length) - || (epoch_number == rfc_0148 && index <= proposal_window.farthest()); + || (epoch_number == rfc_0049 && index <= proposal_window.farthest()); } false } diff --git a/spec/src/hardfork.rs b/spec/src/hardfork.rs index 4e0251e801..edce4ccbc7 100644 --- a/spec/src/hardfork.rs +++ b/spec/src/hardfork.rs @@ -69,7 +69,7 @@ impl HardForkConfig { builder: CKB2023Builder, ckb2023: EpochNumber, ) -> Result { - let builder = builder.rfc_0146(ckb2023).rfc_0148(ckb2023); + let builder = builder.rfc_0048(ckb2023).rfc_0049(ckb2023); Ok(builder) } diff --git a/tx-pool/src/util.rs b/tx-pool/src/util.rs index 7efc62fcca..b4d6c3b5d5 100644 --- a/tx-pool/src/util.rs +++ b/tx-pool/src/util.rs @@ -150,11 +150,11 @@ pub(crate) fn after_delay_window(snapshot: &Snapshot) -> bool { let index = epoch.index(); let epoch_number = epoch.number(); - let rfc_0148 = snapshot.consensus().hardfork_switch.ckb2023.rfc_0148(); + let rfc_0049 = snapshot.consensus().hardfork_switch.ckb2023.rfc_0049(); - if rfc_0148 == 0 && rfc_0148 == EpochNumber::MAX { + if rfc_0049 == 0 && rfc_0049 == EpochNumber::MAX { return true; } - epoch_number > rfc_0148 || (epoch_number == rfc_0148 && index > proposal_window.farthest()) + epoch_number > rfc_0049 || (epoch_number == rfc_0049 && index > proposal_window.farthest()) } diff --git a/util/jsonrpc-types/src/blockchain.rs b/util/jsonrpc-types/src/blockchain.rs index 519d3adeea..44f81994a8 100644 --- a/util/jsonrpc-types/src/blockchain.rs +++ b/util/jsonrpc-types/src/blockchain.rs @@ -1403,8 +1403,8 @@ impl HardForks { HardForkFeature::new("0038", convert(hardforks.ckb2021.rfc_0038())), ], ckb2023: vec![ - HardForkFeature::new("0146", convert(hardforks.ckb2023.rfc_0146())), - HardForkFeature::new("0148", convert(hardforks.ckb2023.rfc_0148())), + HardForkFeature::new("0048", convert(hardforks.ckb2023.rfc_0048())), + HardForkFeature::new("0049", convert(hardforks.ckb2023.rfc_0049())), ], } } diff --git a/util/types/src/core/hardfork/ckb2023.rs b/util/types/src/core/hardfork/ckb2023.rs index 22b539d268..ba0ad73c07 100644 --- a/util/types/src/core/hardfork/ckb2023.rs +++ b/util/types/src/core/hardfork/ckb2023.rs @@ -10,8 +10,8 @@ use paste::paste; /// [`CKB2023Builder`]: struct.CKB2023Builder.html #[derive(Debug, Clone)] pub struct CKB2023 { - rfc_0146: EpochNumber, - rfc_0148: EpochNumber, + rfc_0048: EpochNumber, + rfc_0049: EpochNumber, } /// Builder for [`CKB2023`]. @@ -19,8 +19,8 @@ pub struct CKB2023 { /// [`CKB2023`]: struct.CKB2023.html #[derive(Debug, Clone, Default)] pub struct CKB2023Builder { - rfc_0146: Option, - rfc_0148: Option, + rfc_0048: Option, + rfc_0049: Option, } impl CKB2023 { @@ -32,16 +32,16 @@ impl CKB2023 { /// Creates a new builder based on the current instance. pub fn as_builder(&self) -> CKB2023Builder { Self::new_builder() - .rfc_0146(self.rfc_0146()) - .rfc_0148(self.rfc_0148()) + .rfc_0048(self.rfc_0048()) + .rfc_0049(self.rfc_0049()) } /// Creates a new mirana instance. pub fn new_mirana() -> Self { // Use a builder to ensure all features are set manually. Self::new_builder() - .rfc_0146(hardfork::mainnet::CKB2023_START_EPOCH) - .rfc_0148(hardfork::mainnet::CKB2023_START_EPOCH) + .rfc_0048(hardfork::mainnet::CKB2023_START_EPOCH) + .rfc_0049(hardfork::mainnet::CKB2023_START_EPOCH) .build() .unwrap() } @@ -49,25 +49,25 @@ impl CKB2023 { /// Creates a new dev instance. pub fn new_dev() -> Self { // Use a builder to ensure all features are set manually. - Self::new_builder().rfc_0146(0).rfc_0148(0).build().unwrap() + Self::new_builder().rfc_0048(0).rfc_0049(0).build().unwrap() } } define_methods!( CKB2023, - rfc_0146, + rfc_0048, remove_header_version_reservation_rule, is_remove_header_version_reservation_rule_enabled, - disable_rfc_0146, - "RFC PR 0146" + disable_rfc_0048, + "RFC PR 0048" ); define_methods!( CKB2023, - rfc_0148, + rfc_0049, vm_version_2_and_syscalls_3, is_vm_version_2_and_syscalls_3_enabled, - disable_rfc_0148, - "RFC PR 0148" + disable_rfc_0049, + "RFC PR 0049" ); impl CKB2023Builder { @@ -78,9 +78,9 @@ impl CKB2023Builder { /// /// [`CKB2023`]: struct.CKB2023.html pub fn build(self) -> Result { - let rfc_0146 = try_find!(self, rfc_0146); - let rfc_0148 = try_find!(self, rfc_0148); + let rfc_0048 = try_find!(self, rfc_0048); + let rfc_0049 = try_find!(self, rfc_0049); - Ok(CKB2023 { rfc_0146, rfc_0148 }) + Ok(CKB2023 { rfc_0048, rfc_0049 }) } } diff --git a/verification/src/tests/header_verifier.rs b/verification/src/tests/header_verifier.rs index 82556b833b..2e9219c525 100644 --- a/verification/src/tests/header_verifier.rs +++ b/verification/src/tests/header_verifier.rs @@ -32,7 +32,7 @@ pub fn test_version() { ckb2021: CKB2021::new_mirana(), ckb2023: CKB2023::new_mirana() .as_builder() - .rfc_0146(10) + .rfc_0048(10) .build() .unwrap(), }; From efcd7b9dc0906fdb135a74997086f6a6ba4da135 Mon Sep 17 00:00:00 2001 From: zhangsoledad <787953403@qq.com> Date: Mon, 19 Jun 2023 11:55:01 +0800 Subject: [PATCH 008/125] feat: dev configurable hardfork --- docs/hashes.toml | 2 +- resource/specs/dev.toml | 1 + spec/src/hardfork.rs | 22 ++++++++++++++++++++-- util/types/src/core/hardfork/ckb2021.rs | 2 +- util/types/src/core/hardfork/ckb2023.rs | 12 +++++++++++- util/types/src/core/hardfork/mod.rs | 4 ++-- 6 files changed, 36 insertions(+), 7 deletions(-) diff --git a/docs/hashes.toml b/docs/hashes.toml index 365e8a545b..73c4e670b2 100644 --- a/docs/hashes.toml +++ b/docs/hashes.toml @@ -127,7 +127,7 @@ tx_hash = "0xd5780747735fd22c9ba7363bde8afe59061658caa836962867253b03cbda264e" index = 1 [ckb_dev] -spec_hash = "0xdd75ca95ff59da78879506a46f509adf4e8d131f1826827be708408e60ebde37" +spec_hash = "0x6cb679a15a7ff16596cad85f4680ab4335c87bcbf43956c591c23d11841719e4" genesis = "0x823b2ff5785b12da8b1363cac9a5cbe566d8b715a4311441b119c39a0367488c" cellbase = "0xa563884b3686078ec7e7677a5f86449b15cf2693f3c1241766c6996f206cc541" diff --git a/resource/specs/dev.toml b/resource/specs/dev.toml index 0f5b32a817..8ae8149df2 100644 --- a/resource/specs/dev.toml +++ b/resource/specs/dev.toml @@ -96,6 +96,7 @@ genesis_epoch_length = 1000 permanent_difficulty_in_dummy = true [params.hardfork] +ckb2023 = 0 [pow] diff --git a/spec/src/hardfork.rs b/spec/src/hardfork.rs index edce4ccbc7..77ceeef70b 100644 --- a/spec/src/hardfork.rs +++ b/spec/src/hardfork.rs @@ -10,7 +10,9 @@ use serde::{Deserialize, Serialize}; /// Hard forks parameters for spec. #[derive(Default, Clone, PartialEq, Eq, Debug, Serialize, Deserialize)] #[serde(deny_unknown_fields)] -pub struct HardForkConfig {} +pub struct HardForkConfig { + ckb2023: Option, +} impl HardForkConfig { /// If all parameters which have been set are correct for mainnet, then @@ -77,6 +79,22 @@ impl HardForkConfig { /// /// Enable features which are set to `None` at the dev default config. pub fn complete_with_dev_default(&self) -> Result { - Ok(HardForks::new_dev()) + let mut ckb2021 = CKB2021::new_builder(); + ckb2021 = self.update_2021( + ckb2021, + testnet::CKB2021_START_EPOCH, + testnet::RFC0028_START_EPOCH, + )?; + + let ckb2023 = if let Some(epoch) = self.ckb2023 { + CKB2023::new_with_specified(epoch) + } else { + CKB2023::new_dev_default() + }; + + Ok(HardForks { + ckb2021: ckb2021.build()?, + ckb2023, + }) } } diff --git a/util/types/src/core/hardfork/ckb2021.rs b/util/types/src/core/hardfork/ckb2021.rs index 82cc6040a8..ffe10d3e95 100644 --- a/util/types/src/core/hardfork/ckb2021.rs +++ b/util/types/src/core/hardfork/ckb2021.rs @@ -99,7 +99,7 @@ impl CKB2021 { } /// Creates a new dev instance. - pub fn new_dev() -> Self { + pub fn new_dev_default() -> Self { // Use a builder to ensure all features are set manually. Self::new_builder() .rfc_0028(0) diff --git a/util/types/src/core/hardfork/ckb2023.rs b/util/types/src/core/hardfork/ckb2023.rs index ba0ad73c07..bff61241f0 100644 --- a/util/types/src/core/hardfork/ckb2023.rs +++ b/util/types/src/core/hardfork/ckb2023.rs @@ -47,10 +47,20 @@ impl CKB2023 { } /// Creates a new dev instance. - pub fn new_dev() -> Self { + pub fn new_dev_default() -> Self { // Use a builder to ensure all features are set manually. Self::new_builder().rfc_0048(0).rfc_0049(0).build().unwrap() } + + /// Creates a new instance with specified. + pub fn new_with_specified(epoch: EpochNumber) -> Self { + // Use a builder to ensure all features are set manually. + Self::new_builder() + .rfc_0048(epoch) + .rfc_0049(epoch) + .build() + .unwrap() + } } define_methods!( diff --git a/util/types/src/core/hardfork/mod.rs b/util/types/src/core/hardfork/mod.rs index 37b42fb5c0..b2229c83ec 100644 --- a/util/types/src/core/hardfork/mod.rs +++ b/util/types/src/core/hardfork/mod.rs @@ -29,8 +29,8 @@ impl HardForks { /// construct dev configuration pub fn new_dev() -> HardForks { HardForks { - ckb2021: CKB2021::new_dev(), - ckb2023: CKB2023::new_dev(), + ckb2021: CKB2021::new_dev_default(), + ckb2023: CKB2023::new_dev_default(), } } } From 9889be65dd7265f40f8c5460401b38e003883632 Mon Sep 17 00:00:00 2001 From: zhangsoledad <787953403@qq.com> Date: Mon, 19 Jun 2023 19:16:53 +0800 Subject: [PATCH 009/125] fix: 2023 vm version check --- script/src/verify.rs | 8 +- spec/src/hardfork.rs | 3 +- test/src/main.rs | 3 +- test/src/specs/hardfork/mod.rs | 2 + test/src/specs/hardfork/v2021/mod.rs | 4 +- .../v2021/{vm_version.rs => vm_version1.rs} | 4 +- test/src/specs/hardfork/v2023/mod.rs | 3 + test/src/specs/hardfork/v2023/vm_version2.rs | 408 ++++++++++++++++++ verification/src/transaction_verifier.rs | 79 ++++ 9 files changed, 507 insertions(+), 7 deletions(-) rename test/src/specs/hardfork/v2021/{vm_version.rs => vm_version1.rs} (99%) create mode 100644 test/src/specs/hardfork/v2023/mod.rs create mode 100644 test/src/specs/hardfork/v2023/vm_version2.rs diff --git a/script/src/verify.rs b/script/src/verify.rs index 0ff5aca316..ee1e524e32 100644 --- a/script/src/verify.rs +++ b/script/src/verify.rs @@ -540,7 +540,13 @@ impl Ok(ScriptVersion::V0), ScriptHashType::Data1 => Ok(ScriptVersion::V1), - ScriptHashType::Data2 => Ok(ScriptVersion::V2), + ScriptHashType::Data2 => { + if is_vm_version_2_and_syscalls_3_enabled { + Ok(ScriptVersion::V2) + } else { + Err(ScriptError::InvalidVmVersion(2)) + } + } ScriptHashType::Type => { if is_vm_version_2_and_syscalls_3_enabled { Ok(ScriptVersion::V2) diff --git a/spec/src/hardfork.rs b/spec/src/hardfork.rs index 77ceeef70b..2c1f411a2f 100644 --- a/spec/src/hardfork.rs +++ b/spec/src/hardfork.rs @@ -11,7 +11,8 @@ use serde::{Deserialize, Serialize}; #[derive(Default, Clone, PartialEq, Eq, Debug, Serialize, Deserialize)] #[serde(deny_unknown_fields)] pub struct HardForkConfig { - ckb2023: Option, + /// ckb 2023 epoch + pub ckb2023: Option, } impl HardForkConfig { diff --git a/test/src/main.rs b/test/src/main.rs index 6b8034fd34..0ef0feafff 100644 --- a/test/src/main.rs +++ b/test/src/main.rs @@ -530,7 +530,8 @@ fn all_specs() -> Vec> { Box::new(CheckCellDeps), Box::new(CheckAbsoluteEpochSince), Box::new(CheckRelativeEpochSince), - Box::new(CheckVmVersion), + Box::new(CheckVmVersion1), + Box::new(CheckVmVersion2), Box::new(CheckVmBExtension), ]; specs.shuffle(&mut thread_rng()); diff --git a/test/src/specs/hardfork/mod.rs b/test/src/specs/hardfork/mod.rs index 422849ec4a..14092f87b4 100644 --- a/test/src/specs/hardfork/mod.rs +++ b/test/src/specs/hardfork/mod.rs @@ -1,3 +1,5 @@ mod v2021; +mod v2023; pub use v2021::*; +pub use v2023::*; diff --git a/test/src/specs/hardfork/v2021/mod.rs b/test/src/specs/hardfork/v2021/mod.rs index e80e4adc43..56a1422b9f 100644 --- a/test/src/specs/hardfork/v2021/mod.rs +++ b/test/src/specs/hardfork/v2021/mod.rs @@ -1,9 +1,9 @@ mod cell_deps; mod since; mod vm_b_extension; -mod vm_version; +mod vm_version1; pub use cell_deps::CheckCellDeps; pub use since::{CheckAbsoluteEpochSince, CheckRelativeEpochSince}; pub use vm_b_extension::CheckVmBExtension; -pub use vm_version::CheckVmVersion; +pub use vm_version1::CheckVmVersion1; diff --git a/test/src/specs/hardfork/v2021/vm_version.rs b/test/src/specs/hardfork/v2021/vm_version1.rs similarity index 99% rename from test/src/specs/hardfork/v2021/vm_version.rs rename to test/src/specs/hardfork/v2021/vm_version1.rs index 46a4ff393c..f49d955275 100644 --- a/test/src/specs/hardfork/v2021/vm_version.rs +++ b/test/src/specs/hardfork/v2021/vm_version1.rs @@ -21,7 +21,7 @@ const GENESIS_EPOCH_LENGTH: u64 = 10; const TEST_CASES_COUNT: usize = (RPC_MAX_VM_VERSION as usize + 1 + 1) * 2; const INITIAL_INPUTS_COUNT: usize = 1 + TEST_CASES_COUNT * 2; -pub struct CheckVmVersion; +pub struct CheckVmVersion1; struct NewScript { cell_dep: packed::CellDep, @@ -42,7 +42,7 @@ struct CheckVmVersionTestRunner<'a> { node: &'a Node, } -impl Spec for CheckVmVersion { +impl Spec for CheckVmVersion1 { crate::setup!(num_nodes: 2); fn run(&self, nodes: &mut Vec) { diff --git a/test/src/specs/hardfork/v2023/mod.rs b/test/src/specs/hardfork/v2023/mod.rs new file mode 100644 index 0000000000..a9ce71a763 --- /dev/null +++ b/test/src/specs/hardfork/v2023/mod.rs @@ -0,0 +1,3 @@ +mod vm_version2; + +pub use vm_version2::CheckVmVersion2; diff --git a/test/src/specs/hardfork/v2023/vm_version2.rs b/test/src/specs/hardfork/v2023/vm_version2.rs new file mode 100644 index 0000000000..adbc3258c5 --- /dev/null +++ b/test/src/specs/hardfork/v2023/vm_version2.rs @@ -0,0 +1,408 @@ +use crate::{ + util::{ + cell::gen_spendable, + check::{assert_epoch_should_less_than, is_transaction_committed}, + }, + utils::{assert_send_transaction_fail, wait_until}, + Node, Spec, +}; +use ckb_jsonrpc_types as rpc; +use ckb_jsonrpc_types::Either; +use ckb_logger::{debug, info}; +use ckb_types::{ + core::{Capacity, DepType, ScriptHashType, TransactionView}, + packed, + prelude::*, +}; +use std::fmt; + +const RPC_MAX_VM_VERSION: u8 = 2; +const MAX_VM_VERSION: u8 = 2; + +const GENESIS_EPOCH_LENGTH: u64 = 10; +const CKB2023_START_EPOCH: u64 = 10; + +const TEST_CASES_COUNT: usize = (RPC_MAX_VM_VERSION as usize + 1 + 1) * 2; +const INITIAL_INPUTS_COUNT: usize = 1 + TEST_CASES_COUNT * 2; + +pub struct CheckVmVersion2; + +struct NewScript { + cell_dep: packed::CellDep, + data_hash: packed::Byte32, + type_hash: packed::Byte32, +} + +#[derive(Debug, Clone, Copy)] +enum ExpectedResult { + ShouldBePassed, + IncompatibleVmV2, + RpcInvalidVmVersion, + LockInvalidVmVersion, + TypeInvalidVmVersion, +} + +struct CheckVmVersionTestRunner<'a> { + node: &'a Node, +} + +impl Spec for CheckVmVersion2 { + crate::setup!(num_nodes: 2); + + fn run(&self, nodes: &mut Vec) { + let epoch_length = GENESIS_EPOCH_LENGTH; + let ckb2021_last_epoch = CKB2023_START_EPOCH - 1; + + let node = &nodes[0]; + let node1 = &nodes[1]; + + node.mine(1); + node1.connect(node); + + { + let mut inputs = gen_spendable(node, INITIAL_INPUTS_COUNT) + .into_iter() + .map(|input| packed::CellInput::new(input.out_point, 0)); + let script = NewScript::new_with_id(node, 0, &mut inputs); + let runner = CheckVmVersionTestRunner::new(node); + + info!("CKB v2021:"); + runner.run_all_tests(&mut inputs, &script, 1); + + assert_epoch_should_less_than(node, ckb2021_last_epoch, epoch_length - 4, epoch_length); + node.mine_until_epoch(ckb2021_last_epoch, epoch_length - 4, epoch_length); + + info!("CKB v2023:"); + runner.run_all_tests(&mut inputs, &script, 2); + } + + { + info!("Test Sync:"); + let (rpc_client0, rpc_client1) = (node.rpc_client(), node1.rpc_client()); + + // The GetHeaders will be sent every 15s. + // When reach tip, the GetHeaders will be paused 28s. + let ret = wait_until(60, || { + let header0 = rpc_client0.get_tip_header(); + let header1 = rpc_client1.get_tip_header(); + header0 == header1 + }); + assert!( + ret, + "Nodes should sync with each other until same tip chain", + ); + } + } + + fn modify_chain_spec(&self, spec: &mut ckb_chain_spec::ChainSpec) { + spec.params.permanent_difficulty_in_dummy = Some(true); + spec.params.genesis_epoch_length = Some(GENESIS_EPOCH_LENGTH); + if spec.params.hardfork.is_none() { + spec.params.hardfork = Some(Default::default()); + } + if let Some(mut switch) = spec.params.hardfork.as_mut() { + switch.ckb2023 = Some(CKB2023_START_EPOCH); + } + } +} + +impl NewScript { + fn new_with_id( + node: &Node, + id: u8, + inputs: &mut impl Iterator, + ) -> Self { + let original_data = node.always_success_raw_data(); + let data = packed::Bytes::new_builder() + .extend(original_data.as_ref().iter().map(|x| (*x).into())) + .push(id.into()) + .build(); + let tx = Self::deploy(node, &data, inputs); + let cell_dep = packed::CellDep::new_builder() + .out_point(packed::OutPoint::new(tx.hash(), 0)) + .dep_type(DepType::Code.into()) + .build(); + let data_hash = packed::CellOutput::calc_data_hash(&data.raw_data()); + let type_hash = tx + .output(0) + .unwrap() + .type_() + .to_opt() + .unwrap() + .calc_script_hash(); + Self { + cell_dep, + data_hash, + type_hash, + } + } + + fn deploy( + node: &Node, + data: &packed::Bytes, + inputs: &mut impl Iterator, + ) -> TransactionView { + let type_script = node.always_success_script(); + let tx_template = TransactionView::new_advanced_builder(); + let cell_input = inputs.next().unwrap(); + let cell_output = packed::CellOutput::new_builder() + .type_(Some(type_script).pack()) + .build_exact_capacity(Capacity::bytes(data.len()).unwrap()) + .unwrap(); + let tx = tx_template + .cell_dep(node.always_success_cell_dep()) + .input(cell_input) + .output(cell_output) + .output_data(data.clone()) + .build(); + node.submit_transaction(&tx); + node.mine_until_bool(|| is_transaction_committed(node, &tx)); + tx + } + + fn cell_dep(&self) -> packed::CellDep { + self.cell_dep.clone() + } + + fn as_data_script(&self, vm_version: u8) -> packed::Script { + let hash_type = match vm_version { + 0 => ScriptHashType::Data, + 1 => ScriptHashType::Data1, + 2 => ScriptHashType::Data2, + _ => panic!("unknown vm_version [{}]", vm_version), + }; + packed::Script::new_builder() + .code_hash(self.data_hash.clone()) + .hash_type(hash_type.into()) + .build() + } + + fn as_type_script(&self) -> packed::Script { + packed::Script::new_builder() + .code_hash(self.type_hash.clone()) + .hash_type(ScriptHashType::Type.into()) + .build() + } +} + +impl fmt::Display for ExpectedResult { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + match self { + Self::ShouldBePassed => write!(f, " allowed"), + _ => write!(f, "not allowed"), + } + } +} + +impl ExpectedResult { + fn error_message(self) -> Option<&'static str> { + match self { + Self::ShouldBePassed => None, + Self::IncompatibleVmV2 => Some( + "{\"code\":-302,\"message\":\"TransactionFailedToVerify: \ + Verification failed Transaction(Compatible: \ + the feature \\\"VM Version 2\\\"", + ), + Self::RpcInvalidVmVersion => Some( + "{\"code\":-32602,\"message\":\"\ + Invalid params: the maximum vm version currently supported is", + ), + Self::LockInvalidVmVersion => Some( + "{\"code\":-302,\"message\":\"TransactionFailedToVerify: \ + Verification failed Script(TransactionScriptError \ + { source: Inputs[0].Lock, cause: Invalid VM Version:", + ), + Self::TypeInvalidVmVersion => Some( + "{\"code\":-302,\"message\":\"TransactionFailedToVerify: \ + Verification failed Script(TransactionScriptError { \ + source: Outputs[0].Type, cause: Invalid VM Version: ", + ), + } + } +} + +impl<'a> CheckVmVersionTestRunner<'a> { + fn new(node: &'a Node) -> Self { + Self { node } + } + + fn test_create( + &self, + inputs: &mut impl Iterator, + cell_dep_opt: Option, + script: packed::Script, + expected: ExpectedResult, + ) -> Option { + let (tx_builder, co_builder) = if let Some(cell_dep) = cell_dep_opt { + ( + TransactionView::new_advanced_builder().cell_dep(cell_dep), + packed::CellOutput::new_builder() + .lock(self.node.always_success_script()) + .type_(Some(script).pack()), + ) + } else { + ( + TransactionView::new_advanced_builder(), + packed::CellOutput::new_builder().lock(script), + ) + }; + let cell_input = inputs.next().unwrap(); + let input_cell = self.get_previous_output(&cell_input); + let cell_output = co_builder + .capacity((input_cell.capacity.value() - 1).pack()) + .build(); + let tx = tx_builder + .cell_dep(self.node.always_success_cell_dep()) + .input(cell_input) + .output(cell_output) + .output_data(Default::default()) + .build(); + if let Some(errmsg) = expected.error_message() { + assert_send_transaction_fail(self.node, &tx, errmsg); + None + } else { + self.submit_transaction_until_committed(&tx); + Some(tx) + } + } + + fn test_spend( + &self, + tx: TransactionView, + cell_dep: packed::CellDep, + has_always_success: bool, + expected: ExpectedResult, + ) { + let out_point = packed::OutPoint::new(tx.hash(), 0); + let input = packed::CellInput::new(out_point, 0); + let output = packed::CellOutput::new_builder() + .build_exact_capacity(Capacity::shannons(0)) + .unwrap(); + let tx = if has_always_success { + TransactionView::new_advanced_builder().cell_dep(self.node.always_success_cell_dep()) + } else { + TransactionView::new_advanced_builder() + } + .cell_dep(cell_dep) + .input(input) + .output(output) + .output_data(Default::default()) + .build(); + if let Some(errmsg) = expected.error_message() { + assert_send_transaction_fail(self.node, &tx, errmsg); + } else { + self.submit_transaction_until_committed(&tx); + } + } + + fn get_previous_output(&self, cell_input: &packed::CellInput) -> rpc::CellOutput { + let previous_output = cell_input.previous_output(); + let previous_output_index: usize = previous_output.index().unpack(); + + if let Either::Left(tx) = self + .node + .rpc_client() + .get_transaction(previous_output.tx_hash()) + .transaction + .unwrap() + .inner + { + tx.inner.outputs[previous_output_index].clone() + } else { + panic!("get_previous_output failed"); + } + } + + fn submit_transaction_until_committed(&self, tx: &TransactionView) { + debug!(">>> >>> submit: transaction {:#x}.", tx.hash()); + self.node.submit_transaction(tx); + self.node + .mine_until_bool(|| is_transaction_committed(self.node, tx)); + } + + fn run_all_tests( + &self, + inputs: &mut impl Iterator, + script: &NewScript, + max_vm_version: u8, + ) { + for vm_version in 0..=RPC_MAX_VM_VERSION { + let res = if vm_version <= max_vm_version { + ExpectedResult::ShouldBePassed + } else if vm_version <= MAX_VM_VERSION { + ExpectedResult::IncompatibleVmV2 + } else { + ExpectedResult::RpcInvalidVmVersion + }; + info!( + ">>> Create a cell with Data({:2}) lock script is {}", + vm_version, res + ); + let s = script.as_data_script(vm_version); + if let Some(tx) = self.test_create(inputs, None, s, res) { + let res = if vm_version <= max_vm_version { + ExpectedResult::ShouldBePassed + } else { + ExpectedResult::LockInvalidVmVersion + }; + info!( + ">>> Spend the cell with Data({:2}) lock script is {}", + vm_version, res + ); + let dep = script.cell_dep(); + self.test_spend(tx, dep, false, res); + } + } + { + let res = ExpectedResult::ShouldBePassed; + info!(">>> Create a cell with Type lock script is {}", res); + let s = script.as_type_script(); + if let Some(tx) = self.test_create(inputs, None, s, res) { + let res = ExpectedResult::ShouldBePassed; + info!(">>> Spend the cell with Type lock script is {}", res); + let dep = script.cell_dep(); + self.test_spend(tx, dep, false, res); + } + } + for vm_version in 0..=RPC_MAX_VM_VERSION { + let res = if vm_version <= max_vm_version { + ExpectedResult::ShouldBePassed + } else if vm_version <= MAX_VM_VERSION { + ExpectedResult::TypeInvalidVmVersion + } else { + ExpectedResult::RpcInvalidVmVersion + }; + info!( + ">>> Create a cell with Data({:2}) type script is {}", + vm_version, res + ); + let dep = Some(script.cell_dep()); + let s = script.as_data_script(vm_version); + if let Some(tx) = self.test_create(inputs, dep, s, res) { + let res = if vm_version <= max_vm_version { + ExpectedResult::ShouldBePassed + } else { + ExpectedResult::TypeInvalidVmVersion + }; + info!( + ">>> Spend the cell with Data({:2}) type script is {}", + vm_version, res + ); + let dep = script.cell_dep(); + self.test_spend(tx, dep, true, res); + } + } + { + let res = ExpectedResult::ShouldBePassed; + info!(">>> Create a cell with Type type script is {}", res); + let dep = Some(script.cell_dep()); + let s = script.as_type_script(); + if let Some(tx) = self.test_create(inputs, dep, s, res) { + let res = ExpectedResult::ShouldBePassed; + info!(">>> Spend the cell with Type type script is {}", res); + let dep = script.cell_dep(); + self.test_spend(tx, dep, true, res); + } + } + } +} diff --git a/verification/src/transaction_verifier.rs b/verification/src/transaction_verifier.rs index 7b78086642..8c4e11e734 100644 --- a/verification/src/transaction_verifier.rs +++ b/verification/src/transaction_verifier.rs @@ -99,11 +99,13 @@ impl<'a> NonContextualTransactionVerifier<'a> { /// Context-dependent verification checks for transaction /// /// Contains: +/// [`CompatibleVerifier`](./struct.CompatibleVerifier.html) /// [`TimeRelativeTransactionVerifier`](./struct.TimeRelativeTransactionVerifier.html) /// [`CapacityVerifier`](./struct.CapacityVerifier.html) /// [`ScriptVerifier`](./struct.ScriptVerifier.html) /// [`FeeCalculator`](./struct.FeeCalculator.html) pub struct ContextualTransactionVerifier
{ + pub(crate) compatible: CompatibleVerifier, pub(crate) time_relative: TimeRelativeTransactionVerifier
, pub(crate) capacity: CapacityVerifier, pub(crate) script: ScriptVerifier
, @@ -130,6 +132,11 @@ where tx_env: Arc, ) -> Self { ContextualTransactionVerifier { + compatible: CompatibleVerifier::new( + Arc::clone(&rtx), + Arc::clone(&consensus), + Arc::clone(&tx_env), + ), time_relative: TimeRelativeTransactionVerifier::new( Arc::clone(&rtx), Arc::clone(&consensus), @@ -149,6 +156,7 @@ where /// Perform resumable context-dependent verification, return a `Result` to `CacheEntry` pub fn resumable_verify(&self, limit_cycles: Cycle) -> Result<(VerifyResult, Capacity), Error> { + self.compatible.verify()?; self.time_relative.verify()?; self.capacity.verify()?; let fee = self.fee_calculator.transaction_fee()?; @@ -160,6 +168,7 @@ where /// /// skip script verify will result in the return value cycle always is zero pub fn verify(&self, max_cycles: Cycle, skip_script_verify: bool) -> Result { + self.compatible.verify()?; self.time_relative.verify()?; self.capacity.verify()?; let cycles = if skip_script_verify { @@ -180,6 +189,7 @@ where skip_script_verify: bool, snapshot: &TransactionSnapshot, ) -> Result { + self.compatible.verify()?; self.time_relative.verify()?; self.capacity.verify()?; let cycles = if skip_script_verify { @@ -832,6 +842,68 @@ impl<'a> OutputsDataVerifier<'a> { } } +/// Check compatible between different versions CKB clients. +/// +/// When a new client with hardfork features released, before the hardfork started, the old CKB +/// clients will still be able to work. +/// So, the new CKB client have to add several necessary checks to avoid fork attacks. +/// +/// After hardfork, the old clients will be no longer available. Then we can delete all code in +/// this verifier until next hardfork. +pub struct CompatibleVerifier { + rtx: Arc, + consensus: Arc, + tx_env: Arc, +} + +impl CompatibleVerifier { + pub fn new( + rtx: Arc, + consensus: Arc, + tx_env: Arc, + ) -> Self { + Self { + rtx, + consensus, + tx_env, + } + } + + pub fn verify(&self) -> Result<(), Error> { + let proposal_window = self.consensus.tx_proposal_window(); + let epoch_number = self.tx_env.epoch_number(proposal_window); + if !self + .consensus + .hardfork_switch() + .ckb2023 + .is_vm_version_2_and_syscalls_3_enabled(epoch_number) + { + for ht in self + .rtx + .transaction + .outputs() + .into_iter() + .map(|output| output.lock().hash_type()) + { + let hash_type: ScriptHashType = ht.try_into().map_err(|_| { + let val: u8 = ht.into(); + // This couldn't happen, because we already check it. + TransactionError::Internal { + description: format!("unknown hash type {:02x}", val), + } + })?; + if hash_type == ScriptHashType::Data2 { + return Err(TransactionError::Compatible { + feature: "VM Version 2", + } + .into()); + } + } + } + Ok(()) + } +} + /// Context-dependent checks exclude script /// /// Contains: @@ -839,6 +911,7 @@ impl<'a> OutputsDataVerifier<'a> { /// [`CapacityVerifier`](./struct.CapacityVerifier.html) /// [`FeeCalculator`](./struct.FeeCalculator.html) pub struct ContextualWithoutScriptTransactionVerifier
{ + pub(crate) compatible: CompatibleVerifier, pub(crate) time_relative: TimeRelativeTransactionVerifier
, pub(crate) capacity: CapacityVerifier, pub(crate) fee_calculator: FeeCalculator
, @@ -864,6 +937,11 @@ where tx_env: Arc, ) -> Self { ContextualWithoutScriptTransactionVerifier { + compatible: CompatibleVerifier::new( + Arc::clone(&rtx), + Arc::clone(&consensus), + Arc::clone(&tx_env), + ), time_relative: TimeRelativeTransactionVerifier::new( Arc::clone(&rtx), Arc::clone(&consensus), @@ -877,6 +955,7 @@ where /// Perform verification pub fn verify(&self) -> Result { + self.compatible.verify()?; self.time_relative.verify()?; self.capacity.verify()?; let fee = self.fee_calculator.transaction_fee()?; From 6801cc41c6cf413b980f8872698957c527391664 Mon Sep 17 00:00:00 2001 From: ian Date: Tue, 20 Jun 2023 05:43:29 +0200 Subject: [PATCH 010/125] chore: bump to v0.111.0-rc3 --- Cargo.lock | 136 +++++++++---------- Cargo.toml | 8 +- README.md | 2 +- benches/Cargo.toml | 36 ++--- block-filter/Cargo.toml | 14 +- chain/Cargo.toml | 52 +++---- ckb-bin/Cargo.toml | 46 +++---- db-migration/Cargo.toml | 12 +- db-schema/Cargo.toml | 2 +- db/Cargo.toml | 10 +- error/Cargo.toml | 4 +- freezer/Cargo.toml | 12 +- miner/Cargo.toml | 20 +-- network/Cargo.toml | 22 +-- notify/Cargo.toml | 12 +- pow/Cargo.toml | 6 +- resource/Cargo.toml | 6 +- rpc/Cargo.toml | 60 ++++---- script/Cargo.toml | 24 ++-- script/fuzz/Cargo.toml | 10 +- shared/Cargo.toml | 38 +++--- spec/Cargo.toml | 26 ++-- store/Cargo.toml | 20 +-- sync/Cargo.toml | 56 ++++---- test/Cargo.toml | 40 +++--- traits/Cargo.toml | 4 +- tx-pool/Cargo.toml | 44 +++--- util/Cargo.toml | 4 +- util/app-config/Cargo.toml | 24 ++-- util/build-info/Cargo.toml | 2 +- util/chain-iter/Cargo.toml | 6 +- util/channel/Cargo.toml | 2 +- util/constant/Cargo.toml | 2 +- util/crypto/Cargo.toml | 4 +- util/dao/Cargo.toml | 16 +-- util/dao/utils/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/indexer/Cargo.toml | 20 +-- util/instrument/Cargo.toml | 12 +- util/jsonrpc-types/Cargo.toml | 4 +- util/launcher/Cargo.toml | 68 +++++----- util/launcher/migration-template/Cargo.toml | 2 +- util/light-client-protocol-server/Cargo.toml | 32 ++--- util/logger-config/Cargo.toml | 2 +- util/logger-service/Cargo.toml | 10 +- util/logger/Cargo.toml | 2 +- util/memory-tracker/Cargo.toml | 8 +- util/metrics-config/Cargo.toml | 2 +- util/metrics-service/Cargo.toml | 12 +- util/metrics/Cargo.toml | 2 +- util/multisig/Cargo.toml | 8 +- util/network-alert/Cargo.toml | 30 ++-- 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 | 20 +-- util/runtime/Cargo.toml | 8 +- util/rust-unstable-port/Cargo.toml | 2 +- util/snapshot/Cargo.toml | 18 +-- util/spawn/Cargo.toml | 2 +- util/stop-handler/Cargo.toml | 6 +- util/systemtime/Cargo.toml | 2 +- util/test-chain-utils/Cargo.toml | 24 ++-- util/types/Cargo.toml | 16 +-- verification/Cargo.toml | 28 ++-- verification/contextual/Cargo.toml | 38 +++--- verification/traits/Cargo.toml | 4 +- wasm-build-test/Cargo.toml | 6 +- 73 files changed, 606 insertions(+), 606 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ae72f75c58..1fc15b4075 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -395,7 +395,7 @@ dependencies = [ [[package]] name = "ckb" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-bin", "ckb-build-info", @@ -404,7 +404,7 @@ dependencies = [ [[package]] name = "ckb-app-config" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-build-info", "ckb-chain-spec", @@ -433,7 +433,7 @@ dependencies = [ [[package]] name = "ckb-async-runtime" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-logger", "ckb-spawn", @@ -443,7 +443,7 @@ dependencies = [ [[package]] name = "ckb-benches" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-app-config", "ckb-chain", @@ -471,7 +471,7 @@ dependencies = [ [[package]] name = "ckb-bin" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "base64", "ckb-app-config", @@ -511,7 +511,7 @@ dependencies = [ [[package]] name = "ckb-block-filter" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-async-runtime", "ckb-logger", @@ -523,11 +523,11 @@ dependencies = [ [[package]] name = "ckb-build-info" -version = "0.111.0-rc2" +version = "0.111.0-rc3" [[package]] name = "ckb-chain" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -561,7 +561,7 @@ dependencies = [ [[package]] name = "ckb-chain-iter" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-store", "ckb-types", @@ -569,7 +569,7 @@ dependencies = [ [[package]] name = "ckb-chain-spec" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-constant", "ckb-crypto", @@ -589,18 +589,18 @@ dependencies = [ [[package]] name = "ckb-channel" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "crossbeam-channel", ] [[package]] name = "ckb-constant" -version = "0.111.0-rc2" +version = "0.111.0-rc3" [[package]] name = "ckb-crypto" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-fixed-hash", "faster-hex", @@ -612,7 +612,7 @@ dependencies = [ [[package]] name = "ckb-dao" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "byteorder", "ckb-chain-spec", @@ -627,7 +627,7 @@ dependencies = [ [[package]] name = "ckb-dao-utils" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "byteorder", "ckb-error", @@ -636,7 +636,7 @@ dependencies = [ [[package]] name = "ckb-db" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-app-config", "ckb-db-schema", @@ -649,7 +649,7 @@ dependencies = [ [[package]] name = "ckb-db-migration" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-app-config", "ckb-db", @@ -663,11 +663,11 @@ dependencies = [ [[package]] name = "ckb-db-schema" -version = "0.111.0-rc2" +version = "0.111.0-rc3" [[package]] name = "ckb-error" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "anyhow", "ckb-occupied-capacity", @@ -677,7 +677,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-fixed-hash-core", "ckb-fixed-hash-macros", @@ -685,7 +685,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-core" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "faster-hex", "serde", @@ -695,7 +695,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-macros" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-fixed-hash-core", "proc-macro2", @@ -705,7 +705,7 @@ dependencies = [ [[package]] name = "ckb-freezer" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-error", "ckb-logger", @@ -721,7 +721,7 @@ dependencies = [ [[package]] name = "ckb-hash" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "blake2b-ref", "blake2b-rs", @@ -729,7 +729,7 @@ dependencies = [ [[package]] name = "ckb-indexer" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -751,7 +751,7 @@ dependencies = [ [[package]] name = "ckb-instrument" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-chain", "ckb-chain-iter", @@ -764,7 +764,7 @@ dependencies = [ [[package]] name = "ckb-jsonrpc-types" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-types", "faster-hex", @@ -777,7 +777,7 @@ dependencies = [ [[package]] name = "ckb-launcher" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -833,7 +833,7 @@ dependencies = [ [[package]] name = "ckb-light-client-protocol-server" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-app-config", "ckb-chain", @@ -856,14 +856,14 @@ dependencies = [ [[package]] name = "ckb-logger" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "log", ] [[package]] name = "ckb-logger-config" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "serde", "toml", @@ -871,7 +871,7 @@ dependencies = [ [[package]] name = "ckb-logger-service" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "backtrace", "ckb-channel", @@ -890,7 +890,7 @@ dependencies = [ [[package]] name = "ckb-memory-tracker" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-db", "ckb-logger", @@ -912,7 +912,7 @@ dependencies = [ [[package]] name = "ckb-metrics" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "once_cell", "prometheus", @@ -921,14 +921,14 @@ dependencies = [ [[package]] name = "ckb-metrics-config" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "serde", ] [[package]] name = "ckb-metrics-service" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-async-runtime", "ckb-logger", @@ -941,7 +941,7 @@ dependencies = [ [[package]] name = "ckb-migration-template" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "quote", "syn", @@ -949,7 +949,7 @@ dependencies = [ [[package]] name = "ckb-miner" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "base64", "ckb-app-config", @@ -978,7 +978,7 @@ dependencies = [ [[package]] name = "ckb-multisig" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-crypto", "ckb-error", @@ -988,7 +988,7 @@ dependencies = [ [[package]] name = "ckb-network" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "bitflags", "bloom-filters", @@ -1026,7 +1026,7 @@ dependencies = [ [[package]] name = "ckb-network-alert" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1050,7 +1050,7 @@ dependencies = [ [[package]] name = "ckb-notify" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1062,7 +1062,7 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-occupied-capacity-core", "ckb-occupied-capacity-macros", @@ -1070,14 +1070,14 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity-core" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "serde", ] [[package]] name = "ckb-occupied-capacity-macros" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-occupied-capacity-core", "quote", @@ -1086,7 +1086,7 @@ dependencies = [ [[package]] name = "ckb-pow" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "byteorder", "ckb-hash", @@ -1098,7 +1098,7 @@ dependencies = [ [[package]] name = "ckb-proposal-table" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-chain-spec", "ckb-logger", @@ -1107,7 +1107,7 @@ dependencies = [ [[package]] name = "ckb-rational" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "numext-fixed-uint", "proptest", @@ -1116,7 +1116,7 @@ dependencies = [ [[package]] name = "ckb-resource" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-system-scripts", "ckb-types", @@ -1130,7 +1130,7 @@ dependencies = [ [[package]] name = "ckb-reward-calculator" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-chain-spec", "ckb-dao", @@ -1157,7 +1157,7 @@ dependencies = [ [[package]] name = "ckb-rpc" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-app-config", "ckb-chain", @@ -1206,14 +1206,14 @@ dependencies = [ [[package]] name = "ckb-rust-unstable-port" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "is_sorted", ] [[package]] name = "ckb-script" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "byteorder", "ckb-chain-spec", @@ -1238,7 +1238,7 @@ dependencies = [ [[package]] name = "ckb-shared" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "arc-swap", "ckb-async-runtime", @@ -1262,7 +1262,7 @@ dependencies = [ [[package]] name = "ckb-snapshot" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "arc-swap", "ckb-chain-spec", @@ -1278,11 +1278,11 @@ dependencies = [ [[package]] name = "ckb-spawn" -version = "0.111.0-rc2" +version = "0.111.0-rc3" [[package]] name = "ckb-stop-handler" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-channel", "ckb-logger", @@ -1292,7 +1292,7 @@ dependencies = [ [[package]] name = "ckb-store" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -1310,7 +1310,7 @@ dependencies = [ [[package]] name = "ckb-sync" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "bitflags", "ckb-app-config", @@ -1367,11 +1367,11 @@ dependencies = [ [[package]] name = "ckb-systemtime" -version = "0.111.0-rc2" +version = "0.111.0-rc3" [[package]] name = "ckb-test-chain-utils" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-chain-spec", "ckb-dao-utils", @@ -1389,14 +1389,14 @@ dependencies = [ [[package]] name = "ckb-traits" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-types", ] [[package]] name = "ckb-tx-pool" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1432,7 +1432,7 @@ dependencies = [ [[package]] name = "ckb-types" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "bit-vec", "bytes 1.4.0", @@ -1456,7 +1456,7 @@ dependencies = [ [[package]] name = "ckb-util" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-fixed-hash", "linked-hash-map", @@ -1467,7 +1467,7 @@ dependencies = [ [[package]] name = "ckb-verification" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-chain-spec", "ckb-dao", @@ -1487,7 +1487,7 @@ dependencies = [ [[package]] name = "ckb-verification-contextual" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "ckb-async-runtime", "ckb-chain", @@ -1514,7 +1514,7 @@ dependencies = [ [[package]] name = "ckb-verification-traits" -version = "0.111.0-rc2" +version = "0.111.0-rc3" dependencies = [ "bitflags", "ckb-error", diff --git a/Cargo.toml b/Cargo.toml index ffa072d9eb..1d03db1ad9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,11 +11,11 @@ repository = "https://github.com/nervosnetwork/ckb" rust-version = "1.67.1" [build-dependencies] -ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc2" } +ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc3" } [dependencies] -ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc2" } -ckb-bin = { path = "ckb-bin", version = "= 0.111.0-rc2" } +ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc3" } +ckb-bin = { path = "ckb-bin", version = "= 0.111.0-rc3" } [dev-dependencies] diff --git a/README.md b/README.md index 4624e61a31..5f21359f20 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.111.0--rc2-orange.svg)](https://github.com/nervosnetwork/ckb/releases) +[![Version](https://img.shields.io/badge/version-0.111.0--rc3-orange.svg)](https://github.com/nervosnetwork/ckb/releases) [![Nervos Talk](https://img.shields.io/badge/discuss-on%20Nervos%20Talk-3CC68A.svg)](https://talk.nervos.org/t/where-to-discuss-ckb-and-how-to-ask-for-support/6024) master | develop diff --git a/benches/Cargo.toml b/benches/Cargo.toml index 53f92c460b..8442774929 100644 --- a/benches/Cargo.toml +++ b/benches/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-benches" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,26 +13,26 @@ repository = "https://github.com/nervosnetwork/ckb" [dev-dependencies] criterion = "0.4" -ckb-chain = { path = "../chain", version = "= 0.111.0-rc2" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc2" } -ckb-store = { path = "../store", version = "= 0.111.0-rc2" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc2" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc3" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc3" } +ckb-store = { path = "../store", version = "= 0.111.0-rc3" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc3" } rand = "0.7" -ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc2"} -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc2" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc2" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc2" } +ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc3"} +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc3" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc3" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc3" } ckb-system-scripts = { version = "= 0.5.4" } lazy_static = "1.3.0" -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc2" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc2" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc2" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc2" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc2" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc2" } -ckb-network = { path = "../network", version = "= 0.111.0-rc2" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc2" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc3" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc3" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc3" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc3" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc3" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc3" } +ckb-network = { path = "../network", version = "= 0.111.0-rc3" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc3" } tempfile.workspace = true [[bench]] diff --git a/block-filter/Cargo.toml b/block-filter/Cargo.toml index 796909fba3..b16fd21981 100644 --- a/block-filter/Cargo.toml +++ b/block-filter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-block-filter" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,9 +11,9 @@ repository = "https://github.com/nervosnetwork/ckb" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ckb-store = { path = "../store", version = "= 0.111.0-rc2" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc2" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc2" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc2" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc2" } +ckb-store = { path = "../store", version = "= 0.111.0-rc3" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc3" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc3" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc3" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc3" } diff --git a/chain/Cargo.toml b/chain/Cargo.toml index be4ac5017e..9e5e2df03d 100644 --- a/chain/Cargo.toml +++ b/chain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,37 +9,37 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc2" } -ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc2" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc2" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc2" } -ckb-store = { path = "../store", version = "= 0.111.0-rc2" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc2" } -ckb-verification-contextual = { path = "../verification/contextual", version = "= 0.111.0-rc2" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc2" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc2" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc2" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc2" } -ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc2" } -ckb-error = { path = "../error", version = "= 0.111.0-rc2" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc2" } -ckb-rust-unstable-port = { path = "../util/rust-unstable-port", version = "= 0.111.0-rc2" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc2" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc3" } +ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc3" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc3" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc3" } +ckb-store = { path = "../store", version = "= 0.111.0-rc3" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc3" } +ckb-verification-contextual = { path = "../verification/contextual", version = "= 0.111.0-rc3" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc3" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc3" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc3" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc3" } +ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc3" } +ckb-error = { path = "../error", version = "= 0.111.0-rc3" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc3" } +ckb-rust-unstable-port = { path = "../util/rust-unstable-port", version = "= 0.111.0-rc3" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc3" } faux = { version = "^0.1", optional = true } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc2" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc2" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc2" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc2", features = ["internal"] } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc2" } -ckb-network = { path = "../network", version = "= 0.111.0-rc2" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc2" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc3" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc3" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc3" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc3", features = ["internal"] } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc3" } +ckb-network = { path = "../network", version = "= 0.111.0-rc3" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc3" } lazy_static = "1.4" tempfile.workspace = true -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc2" ,features = ["enable_faketime"]} +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc3" ,features = ["enable_faketime"]} [features] default = [] diff --git a/ckb-bin/Cargo.toml b/ckb-bin/Cargo.toml index aa12f18929..7467722dc2 100644 --- a/ckb-bin/Cargo.toml +++ b/ckb-bin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-bin" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -14,29 +14,29 @@ serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0" } serde_plain = "0.3.0" toml = "0.5" -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc2" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc2" } -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc2" } -ckb-metrics-service = { path = "../util/metrics-service", version = "= 0.111.0-rc2" } -ckb-util = { path = "../util", version = "= 0.111.0-rc2" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc2" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc2" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc2" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc2" } -ckb-store = { path = "../store", version = "= 0.111.0-rc2" } -ckb-chain-spec = {path = "../spec", version = "= 0.111.0-rc2"} -ckb-miner = { path = "../miner", version = "= 0.111.0-rc2" } -ckb-network = { path = "../network", version = "= 0.111.0-rc2"} -ckb-resource = { path = "../resource", version = "= 0.111.0-rc2"} +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc3" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc3" } +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc3" } +ckb-metrics-service = { path = "../util/metrics-service", version = "= 0.111.0-rc3" } +ckb-util = { path = "../util", version = "= 0.111.0-rc3" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc3" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc3" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc3" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc3" } +ckb-store = { path = "../store", version = "= 0.111.0-rc3" } +ckb-chain-spec = {path = "../spec", version = "= 0.111.0-rc3"} +ckb-miner = { path = "../miner", version = "= 0.111.0-rc3" } +ckb-network = { path = "../network", version = "= 0.111.0-rc3"} +ckb-resource = { path = "../resource", version = "= 0.111.0-rc3"} ctrlc = { version = "3.1", features = ["termination"] } -ckb-instrument = { path = "../util/instrument", version = "= 0.111.0-rc2", features = ["progress_bar"] } -ckb-build-info = { path = "../util/build-info", version = "= 0.111.0-rc2" } -ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc2" } -ckb-chain-iter = { path = "../util/chain-iter", version = "= 0.111.0-rc2" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc2" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc2" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc2" } +ckb-instrument = { path = "../util/instrument", version = "= 0.111.0-rc3", features = ["progress_bar"] } +ckb-build-info = { path = "../util/build-info", version = "= 0.111.0-rc3" } +ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc3" } +ckb-chain-iter = { path = "../util/chain-iter", version = "= 0.111.0-rc3" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc3" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc3" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc3" } base64 = "0.21.0" tempfile.workspace = true rayon = "1.0" diff --git a/db-migration/Cargo.toml b/db-migration/Cargo.toml index 9e3d961b96..da0eb85033 100644 --- a/db-migration/Cargo.toml +++ b/db-migration/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db-migration" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,16 +11,16 @@ 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.111.0-rc2" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc2" } -ckb-error = { path = "../error", version = "= 0.111.0-rc2" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc2" } +ckb-db = { path = "../db", version = "= 0.111.0-rc3" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc3" } +ckb-error = { path = "../error", version = "= 0.111.0-rc3" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc3" } indicatif = "0.16" console = ">=0.9.1, <1.0.0" [dev-dependencies] tempfile.workspace = true -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc2" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc3" } [features] portable = ["ckb-db/portable"] diff --git a/db-schema/Cargo.toml b/db-schema/Cargo.toml index 8735b7d37a..d603a96f15 100644 --- a/db-schema/Cargo.toml +++ b/db-schema/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db-schema" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/db/Cargo.toml b/db/Cargo.toml index 82654d739d..6c87ab85e6 100644 --- a/db/Cargo.toml +++ b/db/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,12 +9,12 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc2" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc2" } -ckb-error = { path = "../error", version = "= 0.111.0-rc2" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc3" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc3" } +ckb-error = { path = "../error", version = "= 0.111.0-rc3" } libc = "0.2" rocksdb = { package = "ckb-rocksdb", version ="=0.20.0", features = ["snappy"], default-features = false } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc2" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc3" } [dev-dependencies] tempfile.workspace = true diff --git a/error/Cargo.toml b/error/Cargo.toml index ea908e4be9..2b696bb797 100644 --- a/error/Cargo.toml +++ b/error/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-error" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,5 +11,5 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] thiserror = "1.0.22" anyhow = "1.0.34" -ckb-occupied-capacity = { path = "../util/occupied-capacity", version = "= 0.111.0-rc2" } +ckb-occupied-capacity = { path = "../util/occupied-capacity", version = "= 0.111.0-rc3" } derive_more = { version = "0.99.0", default-features = false, features = ["display"] } diff --git a/freezer/Cargo.toml b/freezer/Cargo.toml index 556a273a24..e9a2ddb3e7 100644 --- a/freezer/Cargo.toml +++ b/freezer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-freezer" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,11 +10,11 @@ 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.111.0-rc2" } -ckb-error = { path = "../error", version = "= 0.111.0-rc2" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc2" } -ckb-util = { path = "../util", version = "= 0.111.0-rc2" } -ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc2" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } +ckb-error = { path = "../error", version = "= 0.111.0-rc3" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc3" } +ckb-util = { path = "../util", version = "= 0.111.0-rc3" } +ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc3" } fs2 = "0.4.3" fail = "0.4" snap = "1" diff --git a/miner/Cargo.toml b/miner/Cargo.toml index fa5f937bac..bd21444074 100644 --- a/miner/Cargo.toml +++ b/miner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-miner" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,23 +9,23 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc2" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc2" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc2" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc2" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc2" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc3" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc3" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc3" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc3" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc3" } rand = "0.7" rand_distr = "0.3" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc2" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc3" } hyper = { version = "0.14", features = ["client", "http2", "http1", "server"] } hyper-tls = "0.5" futures = "0.3" lru = "0.7.1" -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc2" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc2" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc3" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc3" } indicatif = "0.16" console = ">=0.9.1, <1.0.0" eaglesong = "0.1" diff --git a/network/Cargo.toml b/network/Cargo.toml index ad82aaa2dd..8b13039585 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-network" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,28 +11,28 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] rand = "0.7" serde = { version = "1.0", features = ["derive"] } -ckb-util = { path = "../util", version = "= 0.111.0-rc2" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc2" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc2" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc2" } -ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc2"} +ckb-util = { path = "../util", version = "= 0.111.0-rc3" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc3" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc3" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc3" } +ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc3"} tokio = { version = "1", features = ["sync", "macros"] } tokio-util = { version = "0.7", features = ["codec"] } futures = "0.3" -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc2"} +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc3"} lazy_static = { version = "1.3.0", optional = true } bs58 = { version = "0.4.0", optional = true } sentry = { version = "0.26.0", optional = true } faster-hex = { version = "0.6", optional = true } -ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc2"} +ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc3"} secp256k1 = {version = "0.24", features = ["recovery"], optional = true } trust-dns-resolver = { version = "0.20", optional = true } snap = "1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } ipnetwork = "0.18" serde_json = "1.0" bloom-filters = "0.1" -ckb-spawn = { path = "../util/spawn", version = "= 0.111.0-rc2" } +ckb-spawn = { path = "../util/spawn", version = "= 0.111.0-rc3" } socket2 = "0.4" bitflags = "1.0" @@ -48,7 +48,7 @@ criterion = "0.4" proptest = "1.0" num_cpus = "1.10" once_cell = "1.8.0" -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc2", features = ["enable_faketime"]} +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc3", features = ["enable_faketime"]} [[bench]] name = "peer_store" diff --git a/notify/Cargo.toml b/notify/Cargo.toml index 62b772620f..41d8b4bebe 100644 --- a/notify/Cargo.toml +++ b/notify/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-notify" -version = "0.111.0-rc2" +version = "0.111.0-rc3" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc2" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc2" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc2" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc2" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc3" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc3" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc3" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc3" } tokio = { version = "1", features = ["sync"] } [dev-dependencies] diff --git a/pow/Cargo.toml b/pow/Cargo.toml index 1b2556c949..64fa6d334b 100644 --- a/pow/Cargo.toml +++ b/pow/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-pow" -version = "0.111.0-rc2" +version = "0.111.0-rc3" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,8 +10,8 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc2"} +ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc3"} serde = { version = "1.0", features = ["derive"] } eaglesong = "0.1" log = "0.4" diff --git a/resource/Cargo.toml b/resource/Cargo.toml index b5728b6a99..0445711862 100644 --- a/resource/Cargo.toml +++ b/resource/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-resource" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,13 +13,13 @@ repository = "https://github.com/nervosnetwork/ckb" phf = "0.8.0" includedir = "0.6.0" serde = { version = "1.0", features = ["derive"] } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } ckb-system-scripts = { version = "= 0.5.4" } [build-dependencies] includedir_codegen = "0.6.0" walkdir = "2.1.4" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } ckb-system-scripts = { version = "= 0.5.4" } [dev-dependencies] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 88dd2f43c5..52772ab26d 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-rpc" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,19 +9,19 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc2" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } -ckb-network = { path = "../network", version = "= 0.111.0-rc2" } -ckb-notify = { path = "../notify", version = "= 0.111.0-rc2" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc2" } -ckb-store = { path = "../store", version = "= 0.111.0-rc2" } -ckb-sync = { path = "../sync", version = "= 0.111.0-rc2" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc2" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc2"} -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc2"} -ckb-network-alert = { path = "../util/network-alert", version = "= 0.111.0-rc2" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc2" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc2" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc3" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } +ckb-network = { path = "../network", version = "= 0.111.0-rc3" } +ckb-notify = { path = "../notify", version = "= 0.111.0-rc3" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc3" } +ckb-store = { path = "../store", version = "= 0.111.0-rc3" } +ckb-sync = { path = "../sync", version = "= 0.111.0-rc3" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc3" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc3"} +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc3"} +ckb-network-alert = { path = "../util/network-alert", version = "= 0.111.0-rc3" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc3" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc3" } jsonrpc-core = "18.0" jsonrpc-derive = "18.0" jsonrpc-http-server = "18.0" @@ -30,27 +30,27 @@ jsonrpc-ws-server = "18.0" jsonrpc-server-utils = "18.0" jsonrpc-pubsub = "18.0" serde_json = "1.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc2" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc2" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc2" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc2" } -ckb-util = { path = "../util", version = "= 0.111.0-rc2" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc2" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc2" } -ckb-error = { path = "../error", version = "= 0.111.0-rc2" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc2" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc2" } -ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc2" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc2" } -ckb-indexer = { path = "../util/indexer", version = "= 0.111.0-rc2" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc3" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc3" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc3" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc3" } +ckb-util = { path = "../util", version = "= 0.111.0-rc3" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc3" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc3" } +ckb-error = { path = "../error", version = "= 0.111.0-rc3" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc3" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc3" } +ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc3" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc3" } +ckb-indexer = { path = "../util/indexer", version = "= 0.111.0-rc3" } itertools = "0.10.5" tokio = "1" [dev-dependencies] reqwest = { version = "0.11.4", features = ["blocking", "json"] } serde = { version = "1.0", features = ["derive"] } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc2" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc2" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc3" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc3" } tempfile.workspace = true pretty_assertions = "1.3.0" -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc2" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc3" } diff --git a/script/Cargo.toml b/script/Cargo.toml index 898a21cab5..88eae0a821 100644 --- a/script/Cargo.toml +++ b/script/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-script" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -18,24 +18,24 @@ logging = ["ckb-logger"] flatmemory = [] [dependencies] -ckb-traits = { path = "../traits", version = "= 0.111.0-rc2" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc3" } byteorder = "1.3.1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc2" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc3" } ckb-vm = { version = "=0.24.0", default-features = false } faster-hex = "0.6" -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc2", optional = true } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc3", optional = true } serde = { version = "1.0", features = ["derive"] } -ckb-error = { path = "../error", version = "= 0.111.0-rc2" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc2" } +ckb-error = { path = "../error", version = "= 0.111.0-rc3" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc3" } [dev-dependencies] proptest = "1.0" -ckb-db = { path = "../db", version = "= 0.111.0-rc2" } -ckb-store = { path = "../store", version = "= 0.111.0-rc2" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc2" } +ckb-db = { path = "../db", version = "= 0.111.0-rc3" } +ckb-store = { path = "../store", version = "= 0.111.0-rc3" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc3" } tiny-keccak = { version = "2.0", features = ["sha3"] } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc2" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc2" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc3" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc3" } tempfile.workspace = true rand = "0.8.4" diff --git a/script/fuzz/Cargo.toml b/script/fuzz/Cargo.toml index c514c5699e..6a46f15fed 100644 --- a/script/fuzz/Cargo.toml +++ b/script/fuzz/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-script-fuzz" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -15,10 +15,10 @@ cargo-fuzz = true [dependencies] arbitrary = { version = "1", features = ["derive"] } libfuzzer-sys = { version="0.4.0", features=["arbitrary-derive"] } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc2" } -ckb-types = { path = "../../util/types", version = "= 0.111.0-rc2" } -ckb-script = { path = "../../script", version = "= 0.111.0-rc2" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc2" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc3" } +ckb-types = { path = "../../util/types", version = "= 0.111.0-rc3" } +ckb-script = { path = "../../script", version = "= 0.111.0-rc3" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc3" } # Prevent this from interfering with workspaces [workspace] diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 409960a4d9..f55e06a62d 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-shared" -version = "0.111.0-rc2" +version = "0.111.0-rc3" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,27 +9,27 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc2" } -ckb-store = { path = "../store", version = "= 0.111.0-rc2" } -ckb-db = { path = "../db", version = "= 0.111.0-rc2" } -ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc2" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc3" } +ckb-store = { path = "../store", version = "= 0.111.0-rc3" } +ckb-db = { path = "../db", version = "= 0.111.0-rc3" } +ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc3" } arc-swap = "1.3" -ckb-error = { path = "../error", version = "= 0.111.0-rc2" } -ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc2" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc2" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc2" } -ckb-notify = { path = "../notify", version = "= 0.111.0-rc2" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc2" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc2" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc2" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc2" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc2" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc2" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc2" } +ckb-error = { path = "../error", version = "= 0.111.0-rc3" } +ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc3" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc3" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc3" } +ckb-notify = { path = "../notify", version = "= 0.111.0-rc3" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc3" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc3" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc3" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc3" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc3" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc3" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc3" } [dev-dependencies] -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc2", features = ["enable_faketime"] } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc3", features = ["enable_faketime"] } [features] portable = ["ckb-db/portable", "ckb-store/portable", "ckb-tx-pool/portable"] diff --git a/spec/Cargo.toml b/spec/Cargo.toml index 2dbd13839e..a429d9ddb1 100644 --- a/spec/Cargo.toml +++ b/spec/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain-spec" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,15 +11,15 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] serde = { version = "1.0", features = ["derive"] } toml = "0.5" -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc2" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc2" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc2" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc2" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc2" } -ckb-rational = { path = "../util/rational", version = "= 0.111.0-rc2" } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc2"} -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc2"} -ckb-error = { path = "../error", version = "= 0.111.0-rc2" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc2" } -ckb-util = { path = "../util", version = "= 0.111.0-rc2" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc3" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc3" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc3" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc3" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc3" } +ckb-rational = { path = "../util/rational", version = "= 0.111.0-rc3" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc3"} +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc3"} +ckb-error = { path = "../error", version = "= 0.111.0-rc3" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc3" } +ckb-util = { path = "../util", version = "= 0.111.0-rc3" } diff --git a/store/Cargo.toml b/store/Cargo.toml index ea3cff135f..e382143d44 100644 --- a/store/Cargo.toml +++ b/store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-store" -version = "0.111.0-rc2" +version = "0.111.0-rc3" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,16 +9,16 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } -ckb-db = { path = "../db", version = "= 0.111.0-rc2" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc2" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } +ckb-db = { path = "../db", version = "= 0.111.0-rc3" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc3" } lru = "0.7.1" -ckb-traits = { path = "../traits", version = "= 0.111.0-rc2" } -ckb-util = { path = "../util", version = "= 0.111.0-rc2" } -ckb-error = { path = "../error", version = "= 0.111.0-rc2" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc2" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc2" } -ckb-freezer = { path = "../freezer", version = "= 0.111.0-rc2" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc3" } +ckb-util = { path = "../util", version = "= 0.111.0-rc3" } +ckb-error = { path = "../error", version = "= 0.111.0-rc3" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc3" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc3" } +ckb-freezer = { path = "../freezer", version = "= 0.111.0-rc3" } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] diff --git a/sync/Cargo.toml b/sync/Cargo.toml index 5f333253aa..23a1cef8ce 100644 --- a/sync/Cargo.toml +++ b/sync/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-sync" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,48 +9,48 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-chain = { path = "../chain", version = "= 0.111.0-rc2" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc2" } -ckb-store = { path = "../store", version = "= 0.111.0-rc2" } -ckb-app-config = {path = "../util/app-config", version = "= 0.111.0-rc2"} -ckb-types = {path = "../util/types", version = "= 0.111.0-rc2"} -ckb-network = { path = "../network", version = "= 0.111.0-rc2" } -ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc2"} -ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc2"} -ckb-util = { path = "../util", version = "= 0.111.0-rc2" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc2" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc2" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc2" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc2" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc2" } -ckb-error = {path = "../error", version = "= 0.111.0-rc2"} -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc2" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc3" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc3" } +ckb-store = { path = "../store", version = "= 0.111.0-rc3" } +ckb-app-config = {path = "../util/app-config", version = "= 0.111.0-rc3"} +ckb-types = {path = "../util/types", version = "= 0.111.0-rc3"} +ckb-network = { path = "../network", version = "= 0.111.0-rc3" } +ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc3"} +ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc3"} +ckb-util = { path = "../util", version = "= 0.111.0-rc3" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc3" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc3" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc3" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc3" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc3" } +ckb-error = {path = "../error", version = "= 0.111.0-rc3"} +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc3" } sentry = { version = "0.26.0", optional = true } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc2" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc2" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc2" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc3" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc3" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc3" } tokio = { version = "1", features = ["sync"] } lru = "0.7.1" futures = "0.3" governor = "0.3.1" tempfile.workspace = true -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc2" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc3" } bitflags = "1.0" dashmap = "4.0" keyed_priority_queue = "0.3" sled = "0.34.7" [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc2" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc3" } rand = "0.7" -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc2" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc2" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc2" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc2", features = ["mock"] } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc2" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc3" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc3" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc3" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc3", features = ["mock"] } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc3" } faux = "^0.1" once_cell = "1.8.0" -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc2" , features = ["enable_faketime"]} +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc3" , features = ["enable_faketime"]} [features] default = [] diff --git a/test/Cargo.toml b/test/Cargo.toml index c6a3dc4d95..7f0df33b21 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-test" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,28 +11,28 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] clap = { version = "=3.2.21" } toml = "0.5.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc2" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc2" } -ckb-network = { path = "../network", version = "= 0.111.0-rc2" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc2" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc2" } -ckb-util = { path = "../util", version = "= 0.111.0-rc2" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc2" } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc2" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc2" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc2" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc2" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc2" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc2" } -ckb-logger-config = { path = "../util/logger-config", version = "= 0.111.0-rc2" } -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc2" } -ckb-error = { path = "../error", version = "= 0.111.0-rc2" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc2" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc3" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc3" } +ckb-network = { path = "../network", version = "= 0.111.0-rc3" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc3" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc3" } +ckb-util = { path = "../util", version = "= 0.111.0-rc3" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc3" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc3" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc3" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc3" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc3" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc3" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc3" } +ckb-logger-config = { path = "../util/logger-config", version = "= 0.111.0-rc3" } +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc3" } +ckb-error = { path = "../error", version = "= 0.111.0-rc3" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc3" } tempfile = "3" reqwest = { version = "0.11.4", features = ["blocking", "json"] } rand = "0.7" -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc2" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc3" } serde_json = "1.0" lazy_static = "1.4.0" byteorder = "1.3.1" diff --git a/traits/Cargo.toml b/traits/Cargo.toml index cf49301687..4184f81750 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-traits" -version = "0.111.0-rc2" +version = "0.111.0-rc3" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc2" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } diff --git a/tx-pool/Cargo.toml b/tx-pool/Cargo.toml index 5db855a3cb..3ce1463942 100644 --- a/tx-pool/Cargo.toml +++ b/tx-pool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-tx-pool" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,27 +11,27 @@ 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.111.0-rc2" } -ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc2"} -ckb-verification = { path = "../verification", version = "= 0.111.0-rc2" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc2"} +ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } +ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc3"} +ckb-verification = { path = "../verification", version = "= 0.111.0-rc3" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc3"} lru = "0.7.1" -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc2" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc2" } -ckb-store = { path = "../store", version = "= 0.111.0-rc2" } -ckb-util = { path = "../util", version = "= 0.111.0-rc2" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc2" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc2" } -ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc2" } -ckb-error = { path = "../error", version = "= 0.111.0-rc2" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc3" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc3" } +ckb-store = { path = "../store", version = "= 0.111.0-rc3" } +ckb-util = { path = "../util", version = "= 0.111.0-rc3" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc3" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc3" } +ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc3" } +ckb-error = { path = "../error", version = "= 0.111.0-rc3" } tokio = { version = "1", features = ["sync", "process"] } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc2" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc2" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc2" } -ckb-network = { path = "../network", version = "= 0.111.0-rc2" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc2" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc2" } -ckb-db = { path = "../db", version = "= 0.111.0-rc2" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc3" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc3" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc3" } +ckb-network = { path = "../network", version = "= 0.111.0-rc3" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc3" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc3" } +ckb-db = { path = "../db", version = "= 0.111.0-rc3" } sentry = { version = "0.26.0", optional = true } serde_json = "1.0" rand = "0.8.4" @@ -42,8 +42,8 @@ rustc-hash = "1.1" [dev-dependencies] tempfile.workspace = true -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc2" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc2", features = ["enable_faketime"]} +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc3" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc3", features = ["enable_faketime"]} [features] default = [] diff --git a/util/Cargo.toml b/util/Cargo.toml index a7bddd81fc..a8ea96039c 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-util" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -15,7 +15,7 @@ regex = "1.1.6" once_cell = "1.8.0" [dev-dependencies] -ckb-fixed-hash = { path = "fixed-hash", version = "= 0.111.0-rc2" } +ckb-fixed-hash = { path = "fixed-hash", version = "= 0.111.0-rc3" } [features] deadlock_detection = ["parking_lot/deadlock_detection"] diff --git a/util/app-config/Cargo.toml b/util/app-config/Cargo.toml index bd31717b7b..c63dccea13 100644 --- a/util/app-config/Cargo.toml +++ b/util/app-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-app-config" -version = "0.111.0-rc2" +version = "0.111.0-rc3" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -15,20 +15,20 @@ serde_plain = "0.3.0" serde_json = "1.0" toml = "0.5" path-clean = "0.1.0" -ckb-logger = { path = "../../util/logger", version = "= 0.111.0-rc2" } -ckb-logger-config = { path = "../../util/logger-config", version = "= 0.111.0-rc2" } -ckb-metrics-config = { path = "../../util/metrics-config", version = "= 0.111.0-rc2" } -ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc2"} -ckb-jsonrpc-types = {path = "../jsonrpc-types", version = "= 0.111.0-rc2"} -ckb-pow = { path = "../../pow", version = "= 0.111.0-rc2" } -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc2"} -ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc2" } -ckb-types = { path = "../types", version = "= 0.111.0-rc2" } +ckb-logger = { path = "../../util/logger", version = "= 0.111.0-rc3" } +ckb-logger-config = { path = "../../util/logger-config", version = "= 0.111.0-rc3" } +ckb-metrics-config = { path = "../../util/metrics-config", version = "= 0.111.0-rc3" } +ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc3"} +ckb-jsonrpc-types = {path = "../jsonrpc-types", version = "= 0.111.0-rc3"} +ckb-pow = { path = "../../pow", version = "= 0.111.0-rc3" } +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc3"} +ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc3" } +ckb-types = { path = "../types", version = "= 0.111.0-rc3" } secio = { version="0.5.7", package="tentacle-secio" } multiaddr = { version="0.3.0", package="tentacle-multiaddr" } rand = "0.7" sentry = { version = "0.26.0", optional = true } -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc2" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc3" } url = { version = "2.2.2", features = ["serde"] } ubyte = { version = "0.10", features = ["serde"] } @@ -37,4 +37,4 @@ with_sentry = ["sentry"] [dev-dependencies] tempfile.workspace = true -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc2" ,features = ["enable_faketime"]} +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc3" ,features = ["enable_faketime"]} diff --git a/util/build-info/Cargo.toml b/util/build-info/Cargo.toml index 111633c55b..83e62ba9f8 100644 --- a/util/build-info/Cargo.toml +++ b/util/build-info/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-build-info" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/chain-iter/Cargo.toml b/util/chain-iter/Cargo.toml index 7043dc7438..df2a883d6c 100644 --- a/util/chain-iter/Cargo.toml +++ b/util/chain-iter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain-iter" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc2" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc2" } +ckb-types = { path = "../types", version = "= 0.111.0-rc3" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc3" } diff --git a/util/channel/Cargo.toml b/util/channel/Cargo.toml index 071f726c0e..7582196de4 100644 --- a/util/channel/Cargo.toml +++ b/util/channel/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-channel" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/constant/Cargo.toml b/util/constant/Cargo.toml index dea783a0e3..ae04d5f5b1 100644 --- a/util/constant/Cargo.toml +++ b/util/constant/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-constant" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/crypto/Cargo.toml b/util/crypto/Cargo.toml index ce75ae463b..3cd5690731 100644 --- a/util/crypto/Cargo.toml +++ b/util/crypto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-crypto" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc2" } +ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc3" } lazy_static = "1.3" secp256k1 = { version = "0.24", features = ["recovery"], optional = true } thiserror = "1.0.22" diff --git a/util/dao/Cargo.toml b/util/dao/Cargo.toml index becb695523..92a48d3602 100644 --- a/util/dao/Cargo.toml +++ b/util/dao/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-dao" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,13 +10,13 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../types", version = "= 0.111.0-rc2" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc2" } -ckb-dao-utils = { path = "./utils", version = "= 0.111.0-rc2" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc2" } +ckb-types = { path = "../types", version = "= 0.111.0-rc3" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc3" } +ckb-dao-utils = { path = "./utils", version = "= 0.111.0-rc3" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc3" } [dev-dependencies] -ckb-db = { path = "../../db", version = "= 0.111.0-rc2" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc2" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc2" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc3" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc3" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc3" } tempfile.workspace = true diff --git a/util/dao/utils/Cargo.toml b/util/dao/utils/Cargo.toml index cfb9352974..3c26960099 100644 --- a/util/dao/utils/Cargo.toml +++ b/util/dao/utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-dao-utils" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,5 +10,5 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../../types", version = "= 0.111.0-rc2" } -ckb-error = { path = "../../../error", version = "= 0.111.0-rc2" } +ckb-types = { path = "../../types", version = "= 0.111.0-rc3" } +ckb-error = { path = "../../../error", version = "= 0.111.0-rc3" } diff --git a/util/fixed-hash/Cargo.toml b/util/fixed-hash/Cargo.toml index 4fe19e423d..4bbe755b9e 100644 --- a/util/fixed-hash/Cargo.toml +++ b/util/fixed-hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-fixed-hash" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -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.111.0-rc2" } -ckb-fixed-hash-macros = { path = "macros", version = "= 0.111.0-rc2" } +ckb-fixed-hash-core = { path = "core", version = "= 0.111.0-rc3" } +ckb-fixed-hash-macros = { path = "macros", version = "= 0.111.0-rc3" } diff --git a/util/fixed-hash/core/Cargo.toml b/util/fixed-hash/core/Cargo.toml index 08d858f876..e05468ec44 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.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/fixed-hash/macros/Cargo.toml b/util/fixed-hash/macros/Cargo.toml index 2e355905b1..4f810b453d 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.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -12,7 +12,7 @@ repository = "https://github.com/nervosnetwork/ckb" proc-macro = true [dependencies] -ckb-fixed-hash-core = { path = "../core", version = "= 0.111.0-rc2" } +ckb-fixed-hash-core = { path = "../core", version = "= 0.111.0-rc3" } quote = "1.0" syn = "1.0" proc-macro2 = "1.0" diff --git a/util/hash/Cargo.toml b/util/hash/Cargo.toml index 4ff90b9bf4..d29f7e2e4e 100644 --- a/util/hash/Cargo.toml +++ b/util/hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-hash" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/indexer/Cargo.toml b/util/indexer/Cargo.toml index 7994c412a5..7313801610 100644 --- a/util/indexer/Cargo.toml +++ b/util/indexer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-indexer" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,15 +13,15 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] thiserror = "1.0" rocksdb = { package = "ckb-rocksdb", version ="=0.20.0", features = ["snappy"], default-features = false } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc2" } -ckb-types = { path = "../types", version = "= 0.111.0-rc2" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc2" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc2" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc2" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc2" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc2" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc2" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc2" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc3" } +ckb-types = { path = "../types", version = "= 0.111.0-rc3" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc3" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc3" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc3" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc3" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc3" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc3" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc3" } rhai = { version = "1.10.0", features = ["no_function", "no_float", "no_module", "sync"]} serde_json = "1.0" numext-fixed-uint = "0.1" diff --git a/util/instrument/Cargo.toml b/util/instrument/Cargo.toml index 5cec6f93d7..0318ce3fd6 100644 --- a/util/instrument/Cargo.toml +++ b/util/instrument/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-instrument" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc2" } -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc2" } -ckb-chain-iter = { path = "../chain-iter", version = "= 0.111.0-rc2" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc2" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc2" } +ckb-types = { path = "../types", version = "= 0.111.0-rc3" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc3" } +ckb-chain-iter = { path = "../chain-iter", version = "= 0.111.0-rc3" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc3" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc3" } serde_json = "1.0" indicatif = { version = "0.16", optional = true } diff --git a/util/jsonrpc-types/Cargo.toml b/util/jsonrpc-types/Cargo.toml index 4495e73bd7..367e1c8de6 100644 --- a/util/jsonrpc-types/Cargo.toml +++ b/util/jsonrpc-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-jsonrpc-types" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,7 +9,7 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc2" } +ckb-types = { path = "../types", version = "= 0.111.0-rc3" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" faster-hex = "0.6" diff --git a/util/launcher/Cargo.toml b/util/launcher/Cargo.toml index edbe266d87..7f4d874762 100644 --- a/util/launcher/Cargo.toml +++ b/util/launcher/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-launcher" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,44 +11,44 @@ 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.111.0-rc2" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc2" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc2" } -ckb-migration-template = { path = "migration-template", version = "= 0.111.0-rc2" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc2" } -ckb-db-migration = { path = "../../db-migration", version = "= 0.111.0-rc2" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc2" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc2" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc2" } -ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc2" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc2" } -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc2" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc2" } -ckb-network = { path = "../../network", version = "= 0.111.0-rc2"} -ckb-rpc = { path = "../../rpc", version = "= 0.111.0-rc2"} -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc2"} -ckb-network-alert = { path = "../network-alert", version = "= 0.111.0-rc2" } -ckb-sync = { path = "../../sync", version = "= 0.111.0-rc2"} -ckb-verification = { path = "../../verification", version = "= 0.111.0-rc2" } -ckb-verification-traits = { path = "../../verification/traits", version = "= 0.111.0-rc2" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc2" } -ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc2" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc2" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc2" } -ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc2" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc2" } -ckb-snapshot = { path = "../snapshot", version = "= 0.111.0-rc2" } -ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc2" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc2" } -ckb-light-client-protocol-server = { path = "../light-client-protocol-server", version = "= 0.111.0-rc2" } -ckb-block-filter = { path = "../../block-filter", version = "= 0.111.0-rc2" } -ckb-hash = { path = "../hash", version = "= 0.111.0-rc2" } +ckb-types = { path = "../types", version = "= 0.111.0-rc3" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc3" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc3" } +ckb-migration-template = { path = "migration-template", version = "= 0.111.0-rc3" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc3" } +ckb-db-migration = { path = "../../db-migration", version = "= 0.111.0-rc3" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc3" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc3" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc3" } +ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc3" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc3" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc3" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc3" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc3"} +ckb-rpc = { path = "../../rpc", version = "= 0.111.0-rc3"} +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc3"} +ckb-network-alert = { path = "../network-alert", version = "= 0.111.0-rc3" } +ckb-sync = { path = "../../sync", version = "= 0.111.0-rc3"} +ckb-verification = { path = "../../verification", version = "= 0.111.0-rc3" } +ckb-verification-traits = { path = "../../verification/traits", version = "= 0.111.0-rc3" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc3" } +ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc3" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc3" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc3" } +ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc3" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc3" } +ckb-snapshot = { path = "../snapshot", version = "= 0.111.0-rc3" } +ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc3" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc3" } +ckb-light-client-protocol-server = { path = "../light-client-protocol-server", version = "= 0.111.0-rc3" } +ckb-block-filter = { path = "../../block-filter", version = "= 0.111.0-rc3" } +ckb-hash = { path = "../hash", version = "= 0.111.0-rc3" } num_cpus = "1.10" once_cell = "1.8.0" tempfile.workspace = true [dev-dependencies] -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc2", features = ["enable_faketime"] } +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc3", features = ["enable_faketime"] } [features] with_sentry = [ "ckb-sync/with_sentry", "ckb-network/with_sentry", "ckb-app-config/with_sentry" ] diff --git a/util/launcher/migration-template/Cargo.toml b/util/launcher/migration-template/Cargo.toml index 9cb8760a06..d115c2ab1e 100644 --- a/util/launcher/migration-template/Cargo.toml +++ b/util/launcher/migration-template/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-migration-template" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/light-client-protocol-server/Cargo.toml b/util/light-client-protocol-server/Cargo.toml index 277ac27d88..1123ca0bdc 100644 --- a/util/light-client-protocol-server/Cargo.toml +++ b/util/light-client-protocol-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-light-client-protocol-server" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,23 +9,23 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-network = { path = "../../network", version = "= 0.111.0-rc2" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc2" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc2" } -ckb-types = { path = "../types", version = "= 0.111.0-rc2" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc2" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc3" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc3" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc3" } +ckb-types = { path = "../types", version = "= 0.111.0-rc3" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc3" } ckb-merkle-mountain-range = "0.5.2" -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc2"} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc3"} [dev-dependencies] -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc2" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc2" } -ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc2" } -ckb-launcher = { path = "../launcher", version = "= 0.111.0-rc2" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc2" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc2" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc2" } -ckb-test-chain-utils = { path = "../test-chain-utils", version = "= 0.111.0-rc2" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc3" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc3" } +ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc3" } +ckb-launcher = { path = "../launcher", version = "= 0.111.0-rc3" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc3" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc3" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc3" } +ckb-test-chain-utils = { path = "../test-chain-utils", version = "= 0.111.0-rc3" } tempfile.workspace = true -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc2", features = ["enable_faketime"]} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc3", features = ["enable_faketime"]} tokio = "1.20" diff --git a/util/logger-config/Cargo.toml b/util/logger-config/Cargo.toml index 249894424d..694074b47e 100644 --- a/util/logger-config/Cargo.toml +++ b/util/logger-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger-config" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/logger-service/Cargo.toml b/util/logger-service/Cargo.toml index f151ef6723..a4aef3a2a9 100644 --- a/util/logger-service/Cargo.toml +++ b/util/logger-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger-service" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -9,9 +9,9 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-util = { path = "..", version = "= 0.111.0-rc2" } -ckb-logger-config = { path = "../logger-config", version = "= 0.111.0-rc2" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc2" } +ckb-util = { path = "..", version = "= 0.111.0-rc3" } +ckb-logger-config = { path = "../logger-config", version = "= 0.111.0-rc3" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc3" } yansi = "0.5" log = "0.4" env_logger = "0.6" @@ -22,7 +22,7 @@ sentry = { version = "0.26.0", optional = true, features = ["log"] } time = { version = "0.3.11", features = ["formatting"] } [dev-dependencies] -ckb-logger = { path = "../logger", version = "= 0.111.0-rc2" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc3" } tempfile.workspace = true [features] diff --git a/util/logger/Cargo.toml b/util/logger/Cargo.toml index 9a5ce4de20..e3886c3b3e 100644 --- a/util/logger/Cargo.toml +++ b/util/logger/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/memory-tracker/Cargo.toml b/util/memory-tracker/Cargo.toml index d01484b1ae..e3334df7a1 100644 --- a/util/memory-tracker/Cargo.toml +++ b/util/memory-tracker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-memory-tracker" -version = "0.111.0-rc2" +version = "0.111.0-rc3" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc2" } -ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc2" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc2" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc3" } +ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc3" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc3" } [target.'cfg(all(not(target_env = "msvc"), not(target_os="macos")))'.dependencies] jemalloc-ctl = { package = "tikv-jemalloc-ctl", version = "0.5.0" } diff --git a/util/metrics-config/Cargo.toml b/util/metrics-config/Cargo.toml index 20ebed397a..1c7645aca7 100644 --- a/util/metrics-config/Cargo.toml +++ b/util/metrics-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics-config" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/metrics-service/Cargo.toml b/util/metrics-service/Cargo.toml index 2c4a74e1ce..4a618083fb 100644 --- a/util/metrics-service/Cargo.toml +++ b/util/metrics-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics-service" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -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.111.0-rc2" } -ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc2" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc2" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc2" } -ckb-util = { path = "..", version = "= 0.111.0-rc2" } +ckb-metrics-config = { path = "../metrics-config", version = "= 0.111.0-rc3" } +ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc3" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc3" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc3" } +ckb-util = { path = "..", version = "= 0.111.0-rc3" } prometheus = "0.13.3" hyper = { version = "0.14", features = ["http1", "tcp", "server"] } diff --git a/util/metrics/Cargo.toml b/util/metrics/Cargo.toml index 11af7a40c3..5055c12893 100644 --- a/util/metrics/Cargo.toml +++ b/util/metrics/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/multisig/Cargo.toml b/util/multisig/Cargo.toml index 2208a7dbb0..996e9f3ea3 100644 --- a/util/multisig/Cargo.toml +++ b/util/multisig/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-multisig" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,9 +9,9 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-error = { path = "../../error", version = "= 0.111.0-rc2" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc2" } -ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc2" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc3" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc3" } +ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc3" } [dev-dependencies] rand = "0.7" diff --git a/util/network-alert/Cargo.toml b/util/network-alert/Cargo.toml index 7be9cff9ac..f7d67efd21 100644 --- a/util/network-alert/Cargo.toml +++ b/util/network-alert/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-network-alert" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,24 +9,24 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-multisig = { path = "../multisig", version = "= 0.111.0-rc2" } -ckb-types = { path = "../types", version = "= 0.111.0-rc2" } -ckb-util = { path = "..", version = "= 0.111.0-rc2" } -ckb-network = { path = "../../network", version = "= 0.111.0-rc2" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc2"} -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc2" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc2"} -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc2" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc2" } -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc2" } +ckb-multisig = { path = "../multisig", version = "= 0.111.0-rc3" } +ckb-types = { path = "../types", version = "= 0.111.0-rc3" } +ckb-util = { path = "..", version = "= 0.111.0-rc3" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc3" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc3"} +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc3" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc3"} +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc3" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc3" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc3" } lru = "0.7.1" semver = "1.0" [dev-dependencies] -ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc2" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc2" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc2" } +ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc3" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc3" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc3" } once_cell = "1.8.0" -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc2", features = ["enable_faketime"]} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc3", features = ["enable_faketime"]} faster-hex = "0.6" serde_json = "1.0" diff --git a/util/occupied-capacity/Cargo.toml b/util/occupied-capacity/Cargo.toml index 99e253729f..9d03fd9751 100644 --- a/util/occupied-capacity/Cargo.toml +++ b/util/occupied-capacity/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-occupied-capacity" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc2" } -ckb-occupied-capacity-core = { path = "core", version = "= 0.111.0-rc2" } +ckb-occupied-capacity-macros = { path = "macros", version = "= 0.111.0-rc3" } +ckb-occupied-capacity-core = { path = "core", version = "= 0.111.0-rc3" } diff --git a/util/occupied-capacity/core/Cargo.toml b/util/occupied-capacity/core/Cargo.toml index 9392285a2a..fbc1d97086 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.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/occupied-capacity/macros/Cargo.toml b/util/occupied-capacity/macros/Cargo.toml index cb4c4a65c9..a5abb373c7 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.111.0-rc2" +version = "0.111.0-rc3" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -14,4 +14,4 @@ proc-macro = true [dependencies] quote = "1.0" syn = "1.0" -ckb-occupied-capacity-core = { path = "../core", version = "= 0.111.0-rc2" } +ckb-occupied-capacity-core = { path = "../core", version = "= 0.111.0-rc3" } diff --git a/util/proposal-table/Cargo.toml b/util/proposal-table/Cargo.toml index fd4a76495f..00599cb9d1 100644 --- a/util/proposal-table/Cargo.toml +++ b/util/proposal-table/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-proposal-table" -version = "0.111.0-rc2" +version = "0.111.0-rc3" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc2" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc2" } -ckb-types = { path = "../types", version = "= 0.111.0-rc2" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc3" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc3" } +ckb-types = { path = "../types", version = "= 0.111.0-rc3" } diff --git a/util/rational/Cargo.toml b/util/rational/Cargo.toml index 9c80b49399..afa48373ad 100644 --- a/util/rational/Cargo.toml +++ b/util/rational/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-rational" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/reward-calculator/Cargo.toml b/util/reward-calculator/Cargo.toml index 3157939d8f..dfdcb35e3b 100644 --- a/util/reward-calculator/Cargo.toml +++ b/util/reward-calculator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-reward-calculator" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,15 +9,15 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc2" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc2" } -ckb-dao = { path = "../dao", version = "= 0.111.0-rc2" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc2" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc2" } -ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc2"} +ckb-types = { path = "../types", version = "= 0.111.0-rc3" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc3" } +ckb-dao = { path = "../dao", version = "= 0.111.0-rc3" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc3" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc3" } +ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc3"} [dev-dependencies] -ckb-db = { path = "../../db", version = "= 0.111.0-rc2" } -ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc2" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc2" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc3" } +ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc3" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc3" } tempfile.workspace = true diff --git a/util/runtime/Cargo.toml b/util/runtime/Cargo.toml index b588dc9b2a..243ef9b997 100644 --- a/util/runtime/Cargo.toml +++ b/util/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-async-runtime" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,6 +10,6 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] tokio = { version = "1", features = ["full"] } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc2" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc2" } -ckb-spawn = { path = "../spawn", version = "= 0.111.0-rc2" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc3" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc3" } +ckb-spawn = { path = "../spawn", version = "= 0.111.0-rc3" } diff --git a/util/rust-unstable-port/Cargo.toml b/util/rust-unstable-port/Cargo.toml index 97a6accbf2..f77c71d8b9 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.111.0-rc2" +version = "0.111.0-rc3" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" diff --git a/util/snapshot/Cargo.toml b/util/snapshot/Cargo.toml index 0c046df4eb..5c08b8b403 100644 --- a/util/snapshot/Cargo.toml +++ b/util/snapshot/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-snapshot" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,15 +11,15 @@ 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.111.0-rc2" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc2" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc2" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc2" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc2" } -ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc2" } +ckb-types = { path = "../types", version = "= 0.111.0-rc3" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc3" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc3" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc3" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc3" } +ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc3" } arc-swap = "1.3" -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc2" } -ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc2" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc3" } +ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc3" } ckb-merkle-mountain-range = "0.5.2" [features] diff --git a/util/spawn/Cargo.toml b/util/spawn/Cargo.toml index 8dea9fb5bf..b6d8a5523a 100644 --- a/util/spawn/Cargo.toml +++ b/util/spawn/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-spawn" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/stop-handler/Cargo.toml b/util/stop-handler/Cargo.toml index 135c224f70..b9ab77bc59 100644 --- a/util/stop-handler/Cargo.toml +++ b/util/stop-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-stop-handler" -version = "0.111.0-rc2" +version = "0.111.0-rc3" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,6 +10,6 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] parking_lot = "0.12" -ckb-logger = { path = "../logger", version = "= 0.111.0-rc2" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc3" } tokio = { version = "1", features = ["sync", "rt-multi-thread"] } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc2" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc3" } diff --git a/util/systemtime/Cargo.toml b/util/systemtime/Cargo.toml index 2a1a4532f9..46de84cb05 100644 --- a/util/systemtime/Cargo.toml +++ b/util/systemtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-systemtime" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/test-chain-utils/Cargo.toml b/util/test-chain-utils/Cargo.toml index 30a32faf44..557e9e2080 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.111.0-rc2" +version = "0.111.0-rc3" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,18 +9,18 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = {path = "../types", version = "= 0.111.0-rc2"} -ckb-db = { path = "../../db", version = "= 0.111.0-rc2" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc2" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc2" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc2" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc2" } +ckb-types = {path = "../types", version = "= 0.111.0-rc3"} +ckb-db = { path = "../../db", version = "= 0.111.0-rc3" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc3" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc3" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc3" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc3" } lazy_static = "1.3.0" -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc2" } -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc2" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc2" } -ckb-util = { path = "..", version = "= 0.111.0-rc2" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc3" } +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc3" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc3" } +ckb-util = { path = "..", version = "= 0.111.0-rc3" } tempfile.workspace = true [dev-dependencies] -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc2", features = ["enable_faketime"] } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc3", features = ["enable_faketime"] } diff --git a/util/types/Cargo.toml b/util/types/Cargo.toml index 0ad2bd5414..4584b85191 100644 --- a/util/types/Cargo.toml +++ b/util/types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-types" -version = "0.111.0-rc2" +version = "0.111.0-rc3" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,17 +10,17 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] molecule = "=0.7.5" -ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc2" } +ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc3" } numext-fixed-uint = { version = "0.1", features = ["support_rand", "support_heapsize", "support_serde"] } bytes = { version="1", features = ["serde"] } merkle-cbt = "0.3" -ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc2" } -ckb-hash = { path = "../hash", version = "= 0.111.0-rc2" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc2" } -ckb-constant = { path = "../constant", version = "= 0.111.0-rc2" } +ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc3" } +ckb-hash = { path = "../hash", version = "= 0.111.0-rc3" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc3" } +ckb-constant = { path = "../constant", version = "= 0.111.0-rc3" } bit-vec = "0.6.3" -ckb-error = { path = "../../error", version = "= 0.111.0-rc2" } -ckb-rational = { path = "../rational", version = "= 0.111.0-rc2" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc3" } +ckb-rational = { path = "../rational", version = "= 0.111.0-rc3" } once_cell = "1.8.0" derive_more = { version = "0.99.0", default-features=false, features = ["display"] } ckb-merkle-mountain-range = "0.5.2" diff --git a/verification/Cargo.toml b/verification/Cargo.toml index ecb3537523..b133a5d205 100644 --- a/verification/Cargo.toml +++ b/verification/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,20 +9,20 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } -ckb-script = { path = "../script", version = "= 0.111.0-rc2" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc2" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc2" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } +ckb-script = { path = "../script", version = "= 0.111.0-rc3" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc3" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc3" } lru = "0.7.1" -ckb-traits = { path = "../traits", version = "= 0.111.0-rc2" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc2" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc2" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc2" } -ckb-error = { path = "../error", version = "= 0.111.0-rc2" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc3" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc3" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc3" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc3" } +ckb-error = { path = "../error", version = "= 0.111.0-rc3" } derive_more = { version = "0.99.0", default-features=false, features = ["display"] } -ckb-verification-traits = { path = "./traits", version = "= 0.111.0-rc2" } +ckb-verification-traits = { path = "./traits", version = "= 0.111.0-rc3" } [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc2" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc2" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc2", features=["enable_faketime"]} +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc3" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc3" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc3", features=["enable_faketime"]} diff --git a/verification/contextual/Cargo.toml b/verification/contextual/Cargo.toml index 88cd409059..8790c33657 100644 --- a/verification/contextual/Cargo.toml +++ b/verification/contextual/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification-contextual" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,27 +9,27 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../../util/types", version = "= 0.111.0-rc2" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc2" } -ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc2" } +ckb-types = { path = "../../util/types", version = "= 0.111.0-rc3" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc3" } +ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc3" } rayon = "1.0" -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc2" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc2" } -ckb-dao = { path = "../../util/dao", version = "= 0.111.0-rc2" } -ckb-dao-utils = { path = "../../util/dao/utils", version = "= 0.111.0-rc2" } -ckb-logger = {path = "../../util/logger", version = "= 0.111.0-rc2"} -ckb-reward-calculator= { path = "../../util/reward-calculator", version = "= 0.111.0-rc2" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc2" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc3" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc3" } +ckb-dao = { path = "../../util/dao", version = "= 0.111.0-rc3" } +ckb-dao-utils = { path = "../../util/dao/utils", version = "= 0.111.0-rc3" } +ckb-logger = {path = "../../util/logger", version = "= 0.111.0-rc3"} +ckb-reward-calculator= { path = "../../util/reward-calculator", version = "= 0.111.0-rc3" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc3" } tokio = { version = "1", features = ["sync", "rt-multi-thread"] } -ckb-async-runtime = { path = "../../util/runtime", version = "= 0.111.0-rc2" } -ckb-verification-traits = { path = "../traits", version = "= 0.111.0-rc2" } -ckb-verification = { path = "..", version = "= 0.111.0-rc2" } +ckb-async-runtime = { path = "../../util/runtime", version = "= 0.111.0-rc3" } +ckb-verification-traits = { path = "../traits", version = "= 0.111.0-rc3" } +ckb-verification = { path = "..", version = "= 0.111.0-rc3" } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc2" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc2" } -ckb-launcher = { path = "../../util/launcher", version = "= 0.111.0-rc2" } -ckb-test-chain-utils = { path = "../../util/test-chain-utils", version = "= 0.111.0-rc2" } -ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc2", features = ["enable_faketime"]} +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc3" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc3" } +ckb-launcher = { path = "../../util/launcher", version = "= 0.111.0-rc3" } +ckb-test-chain-utils = { path = "../../util/test-chain-utils", version = "= 0.111.0-rc3" } +ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc3", features = ["enable_faketime"]} rand = "0.7" diff --git a/verification/traits/Cargo.toml b/verification/traits/Cargo.toml index adb2987c0f..439ca77f84 100644 --- a/verification/traits/Cargo.toml +++ b/verification/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification-traits" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,4 +10,4 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] bitflags = "1.0" -ckb-error = { path = "../../error", version = "= 0.111.0-rc2" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc3" } diff --git a/wasm-build-test/Cargo.toml b/wasm-build-test/Cargo.toml index 26f4405e19..156012c363 100644 --- a/wasm-build-test/Cargo.toml +++ b/wasm-build-test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-wasm-test" -version = "0.111.0-rc2" +version = "0.111.0-rc3" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,8 +9,8 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc2" } -ckb-script = { path = "../script", version = "= 0.111.0-rc2", default-features = false, features = [] } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } +ckb-script = { path = "../script", version = "= 0.111.0-rc3", default-features = false, features = [] } # Prevent this from interfering with workspaces [workspace] From bbb38d5d3b535c52c94bf03b55032e135bd41997 Mon Sep 17 00:00:00 2001 From: zhangsoledad <787953403@qq.com> Date: Tue, 20 Jun 2023 15:02:55 +0800 Subject: [PATCH 011/125] chore: adjust 2023 activation time --- util/constant/src/hardfork/testnet.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/constant/src/hardfork/testnet.rs b/util/constant/src/hardfork/testnet.rs index 4f476b5493..6de8bc7bbe 100644 --- a/util/constant/src/hardfork/testnet.rs +++ b/util/constant/src/hardfork/testnet.rs @@ -7,5 +7,5 @@ pub const RFC0028_START_EPOCH: u64 = 3113; // pub const CKB2021_START_EPOCH: u64 = 3113; pub const CKB2021_START_EPOCH: u64 = 0; -/// hardcode ckb2023 epoch, about 2023/06/25 6:50 UTC -pub const CKB2023_START_EPOCH: u64 = 6765; +/// hardcode ckb2023 epoch, about 2023/06/30 6:50 UTC +pub const CKB2023_START_EPOCH: u64 = 6795; From 429a043653ff91ce8fba3128412df0906fba20a7 Mon Sep 17 00:00:00 2001 From: ian Date: Wed, 21 Jun 2023 04:21:54 +0200 Subject: [PATCH 012/125] chore: bump to v0.111.0-rc4 --- Cargo.lock | 136 +++++++++---------- Cargo.toml | 8 +- README.md | 2 +- benches/Cargo.toml | 36 ++--- block-filter/Cargo.toml | 14 +- chain/Cargo.toml | 52 +++---- ckb-bin/Cargo.toml | 46 +++---- db-migration/Cargo.toml | 12 +- db-schema/Cargo.toml | 2 +- db/Cargo.toml | 10 +- error/Cargo.toml | 4 +- freezer/Cargo.toml | 12 +- miner/Cargo.toml | 20 +-- network/Cargo.toml | 22 +-- notify/Cargo.toml | 12 +- pow/Cargo.toml | 6 +- resource/Cargo.toml | 6 +- rpc/Cargo.toml | 60 ++++---- script/Cargo.toml | 24 ++-- script/fuzz/Cargo.toml | 10 +- shared/Cargo.toml | 38 +++--- spec/Cargo.toml | 26 ++-- store/Cargo.toml | 20 +-- sync/Cargo.toml | 56 ++++---- test/Cargo.toml | 40 +++--- traits/Cargo.toml | 4 +- tx-pool/Cargo.toml | 44 +++--- util/Cargo.toml | 4 +- util/app-config/Cargo.toml | 24 ++-- util/build-info/Cargo.toml | 2 +- util/chain-iter/Cargo.toml | 6 +- util/channel/Cargo.toml | 2 +- util/constant/Cargo.toml | 2 +- util/crypto/Cargo.toml | 4 +- util/dao/Cargo.toml | 16 +-- util/dao/utils/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/indexer/Cargo.toml | 20 +-- util/instrument/Cargo.toml | 12 +- util/jsonrpc-types/Cargo.toml | 4 +- util/launcher/Cargo.toml | 68 +++++----- util/launcher/migration-template/Cargo.toml | 2 +- util/light-client-protocol-server/Cargo.toml | 32 ++--- util/logger-config/Cargo.toml | 2 +- util/logger-service/Cargo.toml | 10 +- util/logger/Cargo.toml | 2 +- util/memory-tracker/Cargo.toml | 8 +- util/metrics-config/Cargo.toml | 2 +- util/metrics-service/Cargo.toml | 12 +- util/metrics/Cargo.toml | 2 +- util/multisig/Cargo.toml | 8 +- util/network-alert/Cargo.toml | 30 ++-- 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 | 20 +-- util/runtime/Cargo.toml | 8 +- util/rust-unstable-port/Cargo.toml | 2 +- util/snapshot/Cargo.toml | 18 +-- util/spawn/Cargo.toml | 2 +- util/stop-handler/Cargo.toml | 6 +- util/systemtime/Cargo.toml | 2 +- util/test-chain-utils/Cargo.toml | 24 ++-- util/types/Cargo.toml | 16 +-- verification/Cargo.toml | 28 ++-- verification/contextual/Cargo.toml | 38 +++--- verification/traits/Cargo.toml | 4 +- wasm-build-test/Cargo.toml | 6 +- 73 files changed, 606 insertions(+), 606 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1fc15b4075..896957dd92 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -395,7 +395,7 @@ dependencies = [ [[package]] name = "ckb" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-bin", "ckb-build-info", @@ -404,7 +404,7 @@ dependencies = [ [[package]] name = "ckb-app-config" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-build-info", "ckb-chain-spec", @@ -433,7 +433,7 @@ dependencies = [ [[package]] name = "ckb-async-runtime" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-logger", "ckb-spawn", @@ -443,7 +443,7 @@ dependencies = [ [[package]] name = "ckb-benches" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-app-config", "ckb-chain", @@ -471,7 +471,7 @@ dependencies = [ [[package]] name = "ckb-bin" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "base64", "ckb-app-config", @@ -511,7 +511,7 @@ dependencies = [ [[package]] name = "ckb-block-filter" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-async-runtime", "ckb-logger", @@ -523,11 +523,11 @@ dependencies = [ [[package]] name = "ckb-build-info" -version = "0.111.0-rc3" +version = "0.111.0-rc4" [[package]] name = "ckb-chain" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -561,7 +561,7 @@ dependencies = [ [[package]] name = "ckb-chain-iter" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-store", "ckb-types", @@ -569,7 +569,7 @@ dependencies = [ [[package]] name = "ckb-chain-spec" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-constant", "ckb-crypto", @@ -589,18 +589,18 @@ dependencies = [ [[package]] name = "ckb-channel" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "crossbeam-channel", ] [[package]] name = "ckb-constant" -version = "0.111.0-rc3" +version = "0.111.0-rc4" [[package]] name = "ckb-crypto" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-fixed-hash", "faster-hex", @@ -612,7 +612,7 @@ dependencies = [ [[package]] name = "ckb-dao" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "byteorder", "ckb-chain-spec", @@ -627,7 +627,7 @@ dependencies = [ [[package]] name = "ckb-dao-utils" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "byteorder", "ckb-error", @@ -636,7 +636,7 @@ dependencies = [ [[package]] name = "ckb-db" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-app-config", "ckb-db-schema", @@ -649,7 +649,7 @@ dependencies = [ [[package]] name = "ckb-db-migration" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-app-config", "ckb-db", @@ -663,11 +663,11 @@ dependencies = [ [[package]] name = "ckb-db-schema" -version = "0.111.0-rc3" +version = "0.111.0-rc4" [[package]] name = "ckb-error" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "anyhow", "ckb-occupied-capacity", @@ -677,7 +677,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-fixed-hash-core", "ckb-fixed-hash-macros", @@ -685,7 +685,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-core" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "faster-hex", "serde", @@ -695,7 +695,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-macros" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-fixed-hash-core", "proc-macro2", @@ -705,7 +705,7 @@ dependencies = [ [[package]] name = "ckb-freezer" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-error", "ckb-logger", @@ -721,7 +721,7 @@ dependencies = [ [[package]] name = "ckb-hash" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "blake2b-ref", "blake2b-rs", @@ -729,7 +729,7 @@ dependencies = [ [[package]] name = "ckb-indexer" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -751,7 +751,7 @@ dependencies = [ [[package]] name = "ckb-instrument" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-chain", "ckb-chain-iter", @@ -764,7 +764,7 @@ dependencies = [ [[package]] name = "ckb-jsonrpc-types" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-types", "faster-hex", @@ -777,7 +777,7 @@ dependencies = [ [[package]] name = "ckb-launcher" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -833,7 +833,7 @@ dependencies = [ [[package]] name = "ckb-light-client-protocol-server" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-app-config", "ckb-chain", @@ -856,14 +856,14 @@ dependencies = [ [[package]] name = "ckb-logger" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "log", ] [[package]] name = "ckb-logger-config" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "serde", "toml", @@ -871,7 +871,7 @@ dependencies = [ [[package]] name = "ckb-logger-service" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "backtrace", "ckb-channel", @@ -890,7 +890,7 @@ dependencies = [ [[package]] name = "ckb-memory-tracker" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-db", "ckb-logger", @@ -912,7 +912,7 @@ dependencies = [ [[package]] name = "ckb-metrics" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "once_cell", "prometheus", @@ -921,14 +921,14 @@ dependencies = [ [[package]] name = "ckb-metrics-config" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "serde", ] [[package]] name = "ckb-metrics-service" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-async-runtime", "ckb-logger", @@ -941,7 +941,7 @@ dependencies = [ [[package]] name = "ckb-migration-template" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "quote", "syn", @@ -949,7 +949,7 @@ dependencies = [ [[package]] name = "ckb-miner" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "base64", "ckb-app-config", @@ -978,7 +978,7 @@ dependencies = [ [[package]] name = "ckb-multisig" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-crypto", "ckb-error", @@ -988,7 +988,7 @@ dependencies = [ [[package]] name = "ckb-network" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "bitflags", "bloom-filters", @@ -1026,7 +1026,7 @@ dependencies = [ [[package]] name = "ckb-network-alert" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1050,7 +1050,7 @@ dependencies = [ [[package]] name = "ckb-notify" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1062,7 +1062,7 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-occupied-capacity-core", "ckb-occupied-capacity-macros", @@ -1070,14 +1070,14 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity-core" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "serde", ] [[package]] name = "ckb-occupied-capacity-macros" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-occupied-capacity-core", "quote", @@ -1086,7 +1086,7 @@ dependencies = [ [[package]] name = "ckb-pow" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "byteorder", "ckb-hash", @@ -1098,7 +1098,7 @@ dependencies = [ [[package]] name = "ckb-proposal-table" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-chain-spec", "ckb-logger", @@ -1107,7 +1107,7 @@ dependencies = [ [[package]] name = "ckb-rational" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "numext-fixed-uint", "proptest", @@ -1116,7 +1116,7 @@ dependencies = [ [[package]] name = "ckb-resource" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-system-scripts", "ckb-types", @@ -1130,7 +1130,7 @@ dependencies = [ [[package]] name = "ckb-reward-calculator" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-chain-spec", "ckb-dao", @@ -1157,7 +1157,7 @@ dependencies = [ [[package]] name = "ckb-rpc" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-app-config", "ckb-chain", @@ -1206,14 +1206,14 @@ dependencies = [ [[package]] name = "ckb-rust-unstable-port" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "is_sorted", ] [[package]] name = "ckb-script" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "byteorder", "ckb-chain-spec", @@ -1238,7 +1238,7 @@ dependencies = [ [[package]] name = "ckb-shared" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "arc-swap", "ckb-async-runtime", @@ -1262,7 +1262,7 @@ dependencies = [ [[package]] name = "ckb-snapshot" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "arc-swap", "ckb-chain-spec", @@ -1278,11 +1278,11 @@ dependencies = [ [[package]] name = "ckb-spawn" -version = "0.111.0-rc3" +version = "0.111.0-rc4" [[package]] name = "ckb-stop-handler" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-channel", "ckb-logger", @@ -1292,7 +1292,7 @@ dependencies = [ [[package]] name = "ckb-store" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -1310,7 +1310,7 @@ dependencies = [ [[package]] name = "ckb-sync" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "bitflags", "ckb-app-config", @@ -1367,11 +1367,11 @@ dependencies = [ [[package]] name = "ckb-systemtime" -version = "0.111.0-rc3" +version = "0.111.0-rc4" [[package]] name = "ckb-test-chain-utils" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-chain-spec", "ckb-dao-utils", @@ -1389,14 +1389,14 @@ dependencies = [ [[package]] name = "ckb-traits" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-types", ] [[package]] name = "ckb-tx-pool" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1432,7 +1432,7 @@ dependencies = [ [[package]] name = "ckb-types" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "bit-vec", "bytes 1.4.0", @@ -1456,7 +1456,7 @@ dependencies = [ [[package]] name = "ckb-util" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-fixed-hash", "linked-hash-map", @@ -1467,7 +1467,7 @@ dependencies = [ [[package]] name = "ckb-verification" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-chain-spec", "ckb-dao", @@ -1487,7 +1487,7 @@ dependencies = [ [[package]] name = "ckb-verification-contextual" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "ckb-async-runtime", "ckb-chain", @@ -1514,7 +1514,7 @@ dependencies = [ [[package]] name = "ckb-verification-traits" -version = "0.111.0-rc3" +version = "0.111.0-rc4" dependencies = [ "bitflags", "ckb-error", diff --git a/Cargo.toml b/Cargo.toml index 1d03db1ad9..6a93b86786 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,11 +11,11 @@ repository = "https://github.com/nervosnetwork/ckb" rust-version = "1.67.1" [build-dependencies] -ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc3" } +ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc4" } [dependencies] -ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc3" } -ckb-bin = { path = "ckb-bin", version = "= 0.111.0-rc3" } +ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc4" } +ckb-bin = { path = "ckb-bin", version = "= 0.111.0-rc4" } [dev-dependencies] diff --git a/README.md b/README.md index 5f21359f20..3608750bef 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.111.0--rc3-orange.svg)](https://github.com/nervosnetwork/ckb/releases) +[![Version](https://img.shields.io/badge/version-0.111.0--rc4-orange.svg)](https://github.com/nervosnetwork/ckb/releases) [![Nervos Talk](https://img.shields.io/badge/discuss-on%20Nervos%20Talk-3CC68A.svg)](https://talk.nervos.org/t/where-to-discuss-ckb-and-how-to-ask-for-support/6024) master | develop diff --git a/benches/Cargo.toml b/benches/Cargo.toml index 8442774929..d74ba582dd 100644 --- a/benches/Cargo.toml +++ b/benches/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-benches" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,26 +13,26 @@ repository = "https://github.com/nervosnetwork/ckb" [dev-dependencies] criterion = "0.4" -ckb-chain = { path = "../chain", version = "= 0.111.0-rc3" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc3" } -ckb-store = { path = "../store", version = "= 0.111.0-rc3" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc3" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc4" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc4" } +ckb-store = { path = "../store", version = "= 0.111.0-rc4" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc4" } rand = "0.7" -ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc3"} -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc3" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc3" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc3" } +ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc4"} +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc4" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc4" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc4" } ckb-system-scripts = { version = "= 0.5.4" } lazy_static = "1.3.0" -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc3" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc3" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc3" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc3" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc3" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc3" } -ckb-network = { path = "../network", version = "= 0.111.0-rc3" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc3" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc4" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc4" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc4" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc4" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc4" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc4" } +ckb-network = { path = "../network", version = "= 0.111.0-rc4" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc4" } tempfile.workspace = true [[bench]] diff --git a/block-filter/Cargo.toml b/block-filter/Cargo.toml index b16fd21981..e74dab59f1 100644 --- a/block-filter/Cargo.toml +++ b/block-filter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-block-filter" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,9 +11,9 @@ repository = "https://github.com/nervosnetwork/ckb" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ckb-store = { path = "../store", version = "= 0.111.0-rc3" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc3" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc3" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc3" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc3" } +ckb-store = { path = "../store", version = "= 0.111.0-rc4" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc4" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc4" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc4" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc4" } diff --git a/chain/Cargo.toml b/chain/Cargo.toml index 9e5e2df03d..b91ee52d82 100644 --- a/chain/Cargo.toml +++ b/chain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,37 +9,37 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc3" } -ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc3" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc3" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc3" } -ckb-store = { path = "../store", version = "= 0.111.0-rc3" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc3" } -ckb-verification-contextual = { path = "../verification/contextual", version = "= 0.111.0-rc3" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc3" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc3" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc3" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc3" } -ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc3" } -ckb-error = { path = "../error", version = "= 0.111.0-rc3" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc3" } -ckb-rust-unstable-port = { path = "../util/rust-unstable-port", version = "= 0.111.0-rc3" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc3" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc4" } +ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc4" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc4" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc4" } +ckb-store = { path = "../store", version = "= 0.111.0-rc4" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc4" } +ckb-verification-contextual = { path = "../verification/contextual", version = "= 0.111.0-rc4" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc4" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc4" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc4" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc4" } +ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc4" } +ckb-error = { path = "../error", version = "= 0.111.0-rc4" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc4" } +ckb-rust-unstable-port = { path = "../util/rust-unstable-port", version = "= 0.111.0-rc4" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc4" } faux = { version = "^0.1", optional = true } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc3" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc3" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc3" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc3", features = ["internal"] } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc3" } -ckb-network = { path = "../network", version = "= 0.111.0-rc3" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc3" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc4" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc4" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc4" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc4", features = ["internal"] } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc4" } +ckb-network = { path = "../network", version = "= 0.111.0-rc4" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc4" } lazy_static = "1.4" tempfile.workspace = true -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc3" ,features = ["enable_faketime"]} +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc4" ,features = ["enable_faketime"]} [features] default = [] diff --git a/ckb-bin/Cargo.toml b/ckb-bin/Cargo.toml index 7467722dc2..aa0558d123 100644 --- a/ckb-bin/Cargo.toml +++ b/ckb-bin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-bin" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -14,29 +14,29 @@ serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0" } serde_plain = "0.3.0" toml = "0.5" -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc3" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc3" } -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc3" } -ckb-metrics-service = { path = "../util/metrics-service", version = "= 0.111.0-rc3" } -ckb-util = { path = "../util", version = "= 0.111.0-rc3" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc3" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc3" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc3" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc3" } -ckb-store = { path = "../store", version = "= 0.111.0-rc3" } -ckb-chain-spec = {path = "../spec", version = "= 0.111.0-rc3"} -ckb-miner = { path = "../miner", version = "= 0.111.0-rc3" } -ckb-network = { path = "../network", version = "= 0.111.0-rc3"} -ckb-resource = { path = "../resource", version = "= 0.111.0-rc3"} +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc4" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc4" } +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc4" } +ckb-metrics-service = { path = "../util/metrics-service", version = "= 0.111.0-rc4" } +ckb-util = { path = "../util", version = "= 0.111.0-rc4" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc4" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc4" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc4" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc4" } +ckb-store = { path = "../store", version = "= 0.111.0-rc4" } +ckb-chain-spec = {path = "../spec", version = "= 0.111.0-rc4"} +ckb-miner = { path = "../miner", version = "= 0.111.0-rc4" } +ckb-network = { path = "../network", version = "= 0.111.0-rc4"} +ckb-resource = { path = "../resource", version = "= 0.111.0-rc4"} ctrlc = { version = "3.1", features = ["termination"] } -ckb-instrument = { path = "../util/instrument", version = "= 0.111.0-rc3", features = ["progress_bar"] } -ckb-build-info = { path = "../util/build-info", version = "= 0.111.0-rc3" } -ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc3" } -ckb-chain-iter = { path = "../util/chain-iter", version = "= 0.111.0-rc3" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc3" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc3" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc3" } +ckb-instrument = { path = "../util/instrument", version = "= 0.111.0-rc4", features = ["progress_bar"] } +ckb-build-info = { path = "../util/build-info", version = "= 0.111.0-rc4" } +ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc4" } +ckb-chain-iter = { path = "../util/chain-iter", version = "= 0.111.0-rc4" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc4" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc4" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc4" } base64 = "0.21.0" tempfile.workspace = true rayon = "1.0" diff --git a/db-migration/Cargo.toml b/db-migration/Cargo.toml index da0eb85033..03fb842961 100644 --- a/db-migration/Cargo.toml +++ b/db-migration/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db-migration" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,16 +11,16 @@ 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.111.0-rc3" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc3" } -ckb-error = { path = "../error", version = "= 0.111.0-rc3" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc3" } +ckb-db = { path = "../db", version = "= 0.111.0-rc4" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc4" } +ckb-error = { path = "../error", version = "= 0.111.0-rc4" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc4" } indicatif = "0.16" console = ">=0.9.1, <1.0.0" [dev-dependencies] tempfile.workspace = true -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc3" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc4" } [features] portable = ["ckb-db/portable"] diff --git a/db-schema/Cargo.toml b/db-schema/Cargo.toml index d603a96f15..2e226586c4 100644 --- a/db-schema/Cargo.toml +++ b/db-schema/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db-schema" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/db/Cargo.toml b/db/Cargo.toml index 6c87ab85e6..61d466d224 100644 --- a/db/Cargo.toml +++ b/db/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,12 +9,12 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc3" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc3" } -ckb-error = { path = "../error", version = "= 0.111.0-rc3" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc4" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc4" } +ckb-error = { path = "../error", version = "= 0.111.0-rc4" } libc = "0.2" rocksdb = { package = "ckb-rocksdb", version ="=0.20.0", features = ["snappy"], default-features = false } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc3" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc4" } [dev-dependencies] tempfile.workspace = true diff --git a/error/Cargo.toml b/error/Cargo.toml index 2b696bb797..079af77ff6 100644 --- a/error/Cargo.toml +++ b/error/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-error" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,5 +11,5 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] thiserror = "1.0.22" anyhow = "1.0.34" -ckb-occupied-capacity = { path = "../util/occupied-capacity", version = "= 0.111.0-rc3" } +ckb-occupied-capacity = { path = "../util/occupied-capacity", version = "= 0.111.0-rc4" } derive_more = { version = "0.99.0", default-features = false, features = ["display"] } diff --git a/freezer/Cargo.toml b/freezer/Cargo.toml index e9a2ddb3e7..8984603f0b 100644 --- a/freezer/Cargo.toml +++ b/freezer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-freezer" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,11 +10,11 @@ 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.111.0-rc3" } -ckb-error = { path = "../error", version = "= 0.111.0-rc3" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc3" } -ckb-util = { path = "../util", version = "= 0.111.0-rc3" } -ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc3" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } +ckb-error = { path = "../error", version = "= 0.111.0-rc4" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc4" } +ckb-util = { path = "../util", version = "= 0.111.0-rc4" } +ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc4" } fs2 = "0.4.3" fail = "0.4" snap = "1" diff --git a/miner/Cargo.toml b/miner/Cargo.toml index bd21444074..25bd51817f 100644 --- a/miner/Cargo.toml +++ b/miner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-miner" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,23 +9,23 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc3" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc3" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc3" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc3" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc3" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc4" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc4" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc4" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc4" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc4" } rand = "0.7" rand_distr = "0.3" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc3" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc4" } hyper = { version = "0.14", features = ["client", "http2", "http1", "server"] } hyper-tls = "0.5" futures = "0.3" lru = "0.7.1" -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc3" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc3" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc4" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc4" } indicatif = "0.16" console = ">=0.9.1, <1.0.0" eaglesong = "0.1" diff --git a/network/Cargo.toml b/network/Cargo.toml index 8b13039585..ca4eecc73e 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-network" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,28 +11,28 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] rand = "0.7" serde = { version = "1.0", features = ["derive"] } -ckb-util = { path = "../util", version = "= 0.111.0-rc3" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc3" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc3" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc3" } -ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc3"} +ckb-util = { path = "../util", version = "= 0.111.0-rc4" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc4" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc4" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc4" } +ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc4"} tokio = { version = "1", features = ["sync", "macros"] } tokio-util = { version = "0.7", features = ["codec"] } futures = "0.3" -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc3"} +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc4"} lazy_static = { version = "1.3.0", optional = true } bs58 = { version = "0.4.0", optional = true } sentry = { version = "0.26.0", optional = true } faster-hex = { version = "0.6", optional = true } -ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc3"} +ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc4"} secp256k1 = {version = "0.24", features = ["recovery"], optional = true } trust-dns-resolver = { version = "0.20", optional = true } snap = "1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } ipnetwork = "0.18" serde_json = "1.0" bloom-filters = "0.1" -ckb-spawn = { path = "../util/spawn", version = "= 0.111.0-rc3" } +ckb-spawn = { path = "../util/spawn", version = "= 0.111.0-rc4" } socket2 = "0.4" bitflags = "1.0" @@ -48,7 +48,7 @@ criterion = "0.4" proptest = "1.0" num_cpus = "1.10" once_cell = "1.8.0" -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc3", features = ["enable_faketime"]} +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc4", features = ["enable_faketime"]} [[bench]] name = "peer_store" diff --git a/notify/Cargo.toml b/notify/Cargo.toml index 41d8b4bebe..4e3e595c6b 100644 --- a/notify/Cargo.toml +++ b/notify/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-notify" -version = "0.111.0-rc3" +version = "0.111.0-rc4" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc3" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc3" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc3" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc3" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc4" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc4" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc4" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc4" } tokio = { version = "1", features = ["sync"] } [dev-dependencies] diff --git a/pow/Cargo.toml b/pow/Cargo.toml index 64fa6d334b..2f0fa79655 100644 --- a/pow/Cargo.toml +++ b/pow/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-pow" -version = "0.111.0-rc3" +version = "0.111.0-rc4" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,8 +10,8 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc3"} +ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc4"} serde = { version = "1.0", features = ["derive"] } eaglesong = "0.1" log = "0.4" diff --git a/resource/Cargo.toml b/resource/Cargo.toml index 0445711862..b5ac5153c6 100644 --- a/resource/Cargo.toml +++ b/resource/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-resource" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,13 +13,13 @@ repository = "https://github.com/nervosnetwork/ckb" phf = "0.8.0" includedir = "0.6.0" serde = { version = "1.0", features = ["derive"] } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } ckb-system-scripts = { version = "= 0.5.4" } [build-dependencies] includedir_codegen = "0.6.0" walkdir = "2.1.4" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } ckb-system-scripts = { version = "= 0.5.4" } [dev-dependencies] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 52772ab26d..8efac40750 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-rpc" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,19 +9,19 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc3" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } -ckb-network = { path = "../network", version = "= 0.111.0-rc3" } -ckb-notify = { path = "../notify", version = "= 0.111.0-rc3" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc3" } -ckb-store = { path = "../store", version = "= 0.111.0-rc3" } -ckb-sync = { path = "../sync", version = "= 0.111.0-rc3" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc3" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc3"} -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc3"} -ckb-network-alert = { path = "../util/network-alert", version = "= 0.111.0-rc3" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc3" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc3" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc4" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } +ckb-network = { path = "../network", version = "= 0.111.0-rc4" } +ckb-notify = { path = "../notify", version = "= 0.111.0-rc4" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc4" } +ckb-store = { path = "../store", version = "= 0.111.0-rc4" } +ckb-sync = { path = "../sync", version = "= 0.111.0-rc4" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc4" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc4"} +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc4"} +ckb-network-alert = { path = "../util/network-alert", version = "= 0.111.0-rc4" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc4" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc4" } jsonrpc-core = "18.0" jsonrpc-derive = "18.0" jsonrpc-http-server = "18.0" @@ -30,27 +30,27 @@ jsonrpc-ws-server = "18.0" jsonrpc-server-utils = "18.0" jsonrpc-pubsub = "18.0" serde_json = "1.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc3" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc3" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc3" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc3" } -ckb-util = { path = "../util", version = "= 0.111.0-rc3" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc3" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc3" } -ckb-error = { path = "../error", version = "= 0.111.0-rc3" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc3" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc3" } -ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc3" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc3" } -ckb-indexer = { path = "../util/indexer", version = "= 0.111.0-rc3" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc4" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc4" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc4" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc4" } +ckb-util = { path = "../util", version = "= 0.111.0-rc4" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc4" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc4" } +ckb-error = { path = "../error", version = "= 0.111.0-rc4" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc4" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc4" } +ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc4" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc4" } +ckb-indexer = { path = "../util/indexer", version = "= 0.111.0-rc4" } itertools = "0.10.5" tokio = "1" [dev-dependencies] reqwest = { version = "0.11.4", features = ["blocking", "json"] } serde = { version = "1.0", features = ["derive"] } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc3" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc3" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc4" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc4" } tempfile.workspace = true pretty_assertions = "1.3.0" -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc3" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc4" } diff --git a/script/Cargo.toml b/script/Cargo.toml index 88eae0a821..161ab9487e 100644 --- a/script/Cargo.toml +++ b/script/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-script" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -18,24 +18,24 @@ logging = ["ckb-logger"] flatmemory = [] [dependencies] -ckb-traits = { path = "../traits", version = "= 0.111.0-rc3" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc4" } byteorder = "1.3.1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc3" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc4" } ckb-vm = { version = "=0.24.0", default-features = false } faster-hex = "0.6" -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc3", optional = true } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc4", optional = true } serde = { version = "1.0", features = ["derive"] } -ckb-error = { path = "../error", version = "= 0.111.0-rc3" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc3" } +ckb-error = { path = "../error", version = "= 0.111.0-rc4" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc4" } [dev-dependencies] proptest = "1.0" -ckb-db = { path = "../db", version = "= 0.111.0-rc3" } -ckb-store = { path = "../store", version = "= 0.111.0-rc3" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc3" } +ckb-db = { path = "../db", version = "= 0.111.0-rc4" } +ckb-store = { path = "../store", version = "= 0.111.0-rc4" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc4" } tiny-keccak = { version = "2.0", features = ["sha3"] } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc3" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc3" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc4" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc4" } tempfile.workspace = true rand = "0.8.4" diff --git a/script/fuzz/Cargo.toml b/script/fuzz/Cargo.toml index 6a46f15fed..f50770061b 100644 --- a/script/fuzz/Cargo.toml +++ b/script/fuzz/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-script-fuzz" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -15,10 +15,10 @@ cargo-fuzz = true [dependencies] arbitrary = { version = "1", features = ["derive"] } libfuzzer-sys = { version="0.4.0", features=["arbitrary-derive"] } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc3" } -ckb-types = { path = "../../util/types", version = "= 0.111.0-rc3" } -ckb-script = { path = "../../script", version = "= 0.111.0-rc3" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc3" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc4" } +ckb-types = { path = "../../util/types", version = "= 0.111.0-rc4" } +ckb-script = { path = "../../script", version = "= 0.111.0-rc4" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc4" } # Prevent this from interfering with workspaces [workspace] diff --git a/shared/Cargo.toml b/shared/Cargo.toml index f55e06a62d..62c4a73507 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-shared" -version = "0.111.0-rc3" +version = "0.111.0-rc4" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,27 +9,27 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc3" } -ckb-store = { path = "../store", version = "= 0.111.0-rc3" } -ckb-db = { path = "../db", version = "= 0.111.0-rc3" } -ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc3" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc4" } +ckb-store = { path = "../store", version = "= 0.111.0-rc4" } +ckb-db = { path = "../db", version = "= 0.111.0-rc4" } +ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc4" } arc-swap = "1.3" -ckb-error = { path = "../error", version = "= 0.111.0-rc3" } -ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc3" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc3" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc3" } -ckb-notify = { path = "../notify", version = "= 0.111.0-rc3" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc3" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc3" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc3" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc3" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc3" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc3" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc3" } +ckb-error = { path = "../error", version = "= 0.111.0-rc4" } +ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc4" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc4" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc4" } +ckb-notify = { path = "../notify", version = "= 0.111.0-rc4" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc4" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc4" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc4" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc4" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc4" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc4" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc4" } [dev-dependencies] -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc3", features = ["enable_faketime"] } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc4", features = ["enable_faketime"] } [features] portable = ["ckb-db/portable", "ckb-store/portable", "ckb-tx-pool/portable"] diff --git a/spec/Cargo.toml b/spec/Cargo.toml index a429d9ddb1..771952bbbb 100644 --- a/spec/Cargo.toml +++ b/spec/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain-spec" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,15 +11,15 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] serde = { version = "1.0", features = ["derive"] } toml = "0.5" -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc3" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc3" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc3" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc3" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc3" } -ckb-rational = { path = "../util/rational", version = "= 0.111.0-rc3" } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc3"} -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc3"} -ckb-error = { path = "../error", version = "= 0.111.0-rc3" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc3" } -ckb-util = { path = "../util", version = "= 0.111.0-rc3" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc4" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc4" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc4" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc4" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc4" } +ckb-rational = { path = "../util/rational", version = "= 0.111.0-rc4" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc4"} +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc4"} +ckb-error = { path = "../error", version = "= 0.111.0-rc4" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc4" } +ckb-util = { path = "../util", version = "= 0.111.0-rc4" } diff --git a/store/Cargo.toml b/store/Cargo.toml index e382143d44..49d26fb3e0 100644 --- a/store/Cargo.toml +++ b/store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-store" -version = "0.111.0-rc3" +version = "0.111.0-rc4" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,16 +9,16 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } -ckb-db = { path = "../db", version = "= 0.111.0-rc3" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc3" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } +ckb-db = { path = "../db", version = "= 0.111.0-rc4" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc4" } lru = "0.7.1" -ckb-traits = { path = "../traits", version = "= 0.111.0-rc3" } -ckb-util = { path = "../util", version = "= 0.111.0-rc3" } -ckb-error = { path = "../error", version = "= 0.111.0-rc3" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc3" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc3" } -ckb-freezer = { path = "../freezer", version = "= 0.111.0-rc3" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc4" } +ckb-util = { path = "../util", version = "= 0.111.0-rc4" } +ckb-error = { path = "../error", version = "= 0.111.0-rc4" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc4" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc4" } +ckb-freezer = { path = "../freezer", version = "= 0.111.0-rc4" } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] diff --git a/sync/Cargo.toml b/sync/Cargo.toml index 23a1cef8ce..f392fdf638 100644 --- a/sync/Cargo.toml +++ b/sync/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-sync" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,48 +9,48 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-chain = { path = "../chain", version = "= 0.111.0-rc3" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc3" } -ckb-store = { path = "../store", version = "= 0.111.0-rc3" } -ckb-app-config = {path = "../util/app-config", version = "= 0.111.0-rc3"} -ckb-types = {path = "../util/types", version = "= 0.111.0-rc3"} -ckb-network = { path = "../network", version = "= 0.111.0-rc3" } -ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc3"} -ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc3"} -ckb-util = { path = "../util", version = "= 0.111.0-rc3" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc3" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc3" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc3" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc3" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc3" } -ckb-error = {path = "../error", version = "= 0.111.0-rc3"} -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc3" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc4" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc4" } +ckb-store = { path = "../store", version = "= 0.111.0-rc4" } +ckb-app-config = {path = "../util/app-config", version = "= 0.111.0-rc4"} +ckb-types = {path = "../util/types", version = "= 0.111.0-rc4"} +ckb-network = { path = "../network", version = "= 0.111.0-rc4" } +ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc4"} +ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc4"} +ckb-util = { path = "../util", version = "= 0.111.0-rc4" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc4" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc4" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc4" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc4" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc4" } +ckb-error = {path = "../error", version = "= 0.111.0-rc4"} +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc4" } sentry = { version = "0.26.0", optional = true } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc3" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc3" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc3" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc4" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc4" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc4" } tokio = { version = "1", features = ["sync"] } lru = "0.7.1" futures = "0.3" governor = "0.3.1" tempfile.workspace = true -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc3" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc4" } bitflags = "1.0" dashmap = "4.0" keyed_priority_queue = "0.3" sled = "0.34.7" [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc3" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc4" } rand = "0.7" -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc3" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc3" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc3" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc3", features = ["mock"] } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc3" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc4" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc4" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc4" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc4", features = ["mock"] } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc4" } faux = "^0.1" once_cell = "1.8.0" -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc3" , features = ["enable_faketime"]} +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc4" , features = ["enable_faketime"]} [features] default = [] diff --git a/test/Cargo.toml b/test/Cargo.toml index 7f0df33b21..3945971cd5 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-test" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,28 +11,28 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] clap = { version = "=3.2.21" } toml = "0.5.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc3" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc3" } -ckb-network = { path = "../network", version = "= 0.111.0-rc3" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc3" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc3" } -ckb-util = { path = "../util", version = "= 0.111.0-rc3" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc3" } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc3" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc3" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc3" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc3" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc3" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc3" } -ckb-logger-config = { path = "../util/logger-config", version = "= 0.111.0-rc3" } -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc3" } -ckb-error = { path = "../error", version = "= 0.111.0-rc3" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc3" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc4" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc4" } +ckb-network = { path = "../network", version = "= 0.111.0-rc4" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc4" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc4" } +ckb-util = { path = "../util", version = "= 0.111.0-rc4" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc4" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc4" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc4" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc4" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc4" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc4" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc4" } +ckb-logger-config = { path = "../util/logger-config", version = "= 0.111.0-rc4" } +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc4" } +ckb-error = { path = "../error", version = "= 0.111.0-rc4" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc4" } tempfile = "3" reqwest = { version = "0.11.4", features = ["blocking", "json"] } rand = "0.7" -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc3" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc4" } serde_json = "1.0" lazy_static = "1.4.0" byteorder = "1.3.1" diff --git a/traits/Cargo.toml b/traits/Cargo.toml index 4184f81750..2618fc1561 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-traits" -version = "0.111.0-rc3" +version = "0.111.0-rc4" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc3" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } diff --git a/tx-pool/Cargo.toml b/tx-pool/Cargo.toml index 3ce1463942..e2bbba61f8 100644 --- a/tx-pool/Cargo.toml +++ b/tx-pool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-tx-pool" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,27 +11,27 @@ 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.111.0-rc3" } -ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc3"} -ckb-verification = { path = "../verification", version = "= 0.111.0-rc3" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc3"} +ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } +ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc4"} +ckb-verification = { path = "../verification", version = "= 0.111.0-rc4" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc4"} lru = "0.7.1" -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc3" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc3" } -ckb-store = { path = "../store", version = "= 0.111.0-rc3" } -ckb-util = { path = "../util", version = "= 0.111.0-rc3" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc3" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc3" } -ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc3" } -ckb-error = { path = "../error", version = "= 0.111.0-rc3" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc4" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc4" } +ckb-store = { path = "../store", version = "= 0.111.0-rc4" } +ckb-util = { path = "../util", version = "= 0.111.0-rc4" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc4" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc4" } +ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc4" } +ckb-error = { path = "../error", version = "= 0.111.0-rc4" } tokio = { version = "1", features = ["sync", "process"] } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc3" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc3" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc3" } -ckb-network = { path = "../network", version = "= 0.111.0-rc3" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc3" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc3" } -ckb-db = { path = "../db", version = "= 0.111.0-rc3" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc4" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc4" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc4" } +ckb-network = { path = "../network", version = "= 0.111.0-rc4" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc4" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc4" } +ckb-db = { path = "../db", version = "= 0.111.0-rc4" } sentry = { version = "0.26.0", optional = true } serde_json = "1.0" rand = "0.8.4" @@ -42,8 +42,8 @@ rustc-hash = "1.1" [dev-dependencies] tempfile.workspace = true -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc3" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc3", features = ["enable_faketime"]} +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc4" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc4", features = ["enable_faketime"]} [features] default = [] diff --git a/util/Cargo.toml b/util/Cargo.toml index a8ea96039c..0c880c411c 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-util" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -15,7 +15,7 @@ regex = "1.1.6" once_cell = "1.8.0" [dev-dependencies] -ckb-fixed-hash = { path = "fixed-hash", version = "= 0.111.0-rc3" } +ckb-fixed-hash = { path = "fixed-hash", version = "= 0.111.0-rc4" } [features] deadlock_detection = ["parking_lot/deadlock_detection"] diff --git a/util/app-config/Cargo.toml b/util/app-config/Cargo.toml index c63dccea13..e75547ea66 100644 --- a/util/app-config/Cargo.toml +++ b/util/app-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-app-config" -version = "0.111.0-rc3" +version = "0.111.0-rc4" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -15,20 +15,20 @@ serde_plain = "0.3.0" serde_json = "1.0" toml = "0.5" path-clean = "0.1.0" -ckb-logger = { path = "../../util/logger", version = "= 0.111.0-rc3" } -ckb-logger-config = { path = "../../util/logger-config", version = "= 0.111.0-rc3" } -ckb-metrics-config = { path = "../../util/metrics-config", version = "= 0.111.0-rc3" } -ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc3"} -ckb-jsonrpc-types = {path = "../jsonrpc-types", version = "= 0.111.0-rc3"} -ckb-pow = { path = "../../pow", version = "= 0.111.0-rc3" } -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc3"} -ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc3" } -ckb-types = { path = "../types", version = "= 0.111.0-rc3" } +ckb-logger = { path = "../../util/logger", version = "= 0.111.0-rc4" } +ckb-logger-config = { path = "../../util/logger-config", version = "= 0.111.0-rc4" } +ckb-metrics-config = { path = "../../util/metrics-config", version = "= 0.111.0-rc4" } +ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc4"} +ckb-jsonrpc-types = {path = "../jsonrpc-types", version = "= 0.111.0-rc4"} +ckb-pow = { path = "../../pow", version = "= 0.111.0-rc4" } +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc4"} +ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc4" } +ckb-types = { path = "../types", version = "= 0.111.0-rc4" } secio = { version="0.5.7", package="tentacle-secio" } multiaddr = { version="0.3.0", package="tentacle-multiaddr" } rand = "0.7" sentry = { version = "0.26.0", optional = true } -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc3" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc4" } url = { version = "2.2.2", features = ["serde"] } ubyte = { version = "0.10", features = ["serde"] } @@ -37,4 +37,4 @@ with_sentry = ["sentry"] [dev-dependencies] tempfile.workspace = true -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc3" ,features = ["enable_faketime"]} +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc4" ,features = ["enable_faketime"]} diff --git a/util/build-info/Cargo.toml b/util/build-info/Cargo.toml index 83e62ba9f8..c212a36280 100644 --- a/util/build-info/Cargo.toml +++ b/util/build-info/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-build-info" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/chain-iter/Cargo.toml b/util/chain-iter/Cargo.toml index df2a883d6c..01f6c279d7 100644 --- a/util/chain-iter/Cargo.toml +++ b/util/chain-iter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain-iter" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc3" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc3" } +ckb-types = { path = "../types", version = "= 0.111.0-rc4" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc4" } diff --git a/util/channel/Cargo.toml b/util/channel/Cargo.toml index 7582196de4..5b0ba8c482 100644 --- a/util/channel/Cargo.toml +++ b/util/channel/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-channel" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/constant/Cargo.toml b/util/constant/Cargo.toml index ae04d5f5b1..1aff964436 100644 --- a/util/constant/Cargo.toml +++ b/util/constant/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-constant" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/crypto/Cargo.toml b/util/crypto/Cargo.toml index 3cd5690731..3d365c3da3 100644 --- a/util/crypto/Cargo.toml +++ b/util/crypto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-crypto" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc3" } +ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc4" } lazy_static = "1.3" secp256k1 = { version = "0.24", features = ["recovery"], optional = true } thiserror = "1.0.22" diff --git a/util/dao/Cargo.toml b/util/dao/Cargo.toml index 92a48d3602..7919cb0f47 100644 --- a/util/dao/Cargo.toml +++ b/util/dao/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-dao" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,13 +10,13 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../types", version = "= 0.111.0-rc3" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc3" } -ckb-dao-utils = { path = "./utils", version = "= 0.111.0-rc3" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc3" } +ckb-types = { path = "../types", version = "= 0.111.0-rc4" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc4" } +ckb-dao-utils = { path = "./utils", version = "= 0.111.0-rc4" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc4" } [dev-dependencies] -ckb-db = { path = "../../db", version = "= 0.111.0-rc3" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc3" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc3" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc4" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc4" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc4" } tempfile.workspace = true diff --git a/util/dao/utils/Cargo.toml b/util/dao/utils/Cargo.toml index 3c26960099..8a7bb6c531 100644 --- a/util/dao/utils/Cargo.toml +++ b/util/dao/utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-dao-utils" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,5 +10,5 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../../types", version = "= 0.111.0-rc3" } -ckb-error = { path = "../../../error", version = "= 0.111.0-rc3" } +ckb-types = { path = "../../types", version = "= 0.111.0-rc4" } +ckb-error = { path = "../../../error", version = "= 0.111.0-rc4" } diff --git a/util/fixed-hash/Cargo.toml b/util/fixed-hash/Cargo.toml index 4bbe755b9e..07527da018 100644 --- a/util/fixed-hash/Cargo.toml +++ b/util/fixed-hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-fixed-hash" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -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.111.0-rc3" } -ckb-fixed-hash-macros = { path = "macros", version = "= 0.111.0-rc3" } +ckb-fixed-hash-core = { path = "core", version = "= 0.111.0-rc4" } +ckb-fixed-hash-macros = { path = "macros", version = "= 0.111.0-rc4" } diff --git a/util/fixed-hash/core/Cargo.toml b/util/fixed-hash/core/Cargo.toml index e05468ec44..78bd34c1ae 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.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/fixed-hash/macros/Cargo.toml b/util/fixed-hash/macros/Cargo.toml index 4f810b453d..b669b285d8 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.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -12,7 +12,7 @@ repository = "https://github.com/nervosnetwork/ckb" proc-macro = true [dependencies] -ckb-fixed-hash-core = { path = "../core", version = "= 0.111.0-rc3" } +ckb-fixed-hash-core = { path = "../core", version = "= 0.111.0-rc4" } quote = "1.0" syn = "1.0" proc-macro2 = "1.0" diff --git a/util/hash/Cargo.toml b/util/hash/Cargo.toml index d29f7e2e4e..3763d20a95 100644 --- a/util/hash/Cargo.toml +++ b/util/hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-hash" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/indexer/Cargo.toml b/util/indexer/Cargo.toml index 7313801610..ab02166107 100644 --- a/util/indexer/Cargo.toml +++ b/util/indexer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-indexer" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,15 +13,15 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] thiserror = "1.0" rocksdb = { package = "ckb-rocksdb", version ="=0.20.0", features = ["snappy"], default-features = false } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc3" } -ckb-types = { path = "../types", version = "= 0.111.0-rc3" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc3" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc3" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc3" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc3" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc3" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc3" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc3" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc4" } +ckb-types = { path = "../types", version = "= 0.111.0-rc4" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc4" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc4" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc4" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc4" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc4" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc4" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc4" } rhai = { version = "1.10.0", features = ["no_function", "no_float", "no_module", "sync"]} serde_json = "1.0" numext-fixed-uint = "0.1" diff --git a/util/instrument/Cargo.toml b/util/instrument/Cargo.toml index 0318ce3fd6..ea835d86e4 100644 --- a/util/instrument/Cargo.toml +++ b/util/instrument/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-instrument" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc3" } -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc3" } -ckb-chain-iter = { path = "../chain-iter", version = "= 0.111.0-rc3" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc3" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc3" } +ckb-types = { path = "../types", version = "= 0.111.0-rc4" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc4" } +ckb-chain-iter = { path = "../chain-iter", version = "= 0.111.0-rc4" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc4" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc4" } serde_json = "1.0" indicatif = { version = "0.16", optional = true } diff --git a/util/jsonrpc-types/Cargo.toml b/util/jsonrpc-types/Cargo.toml index 367e1c8de6..bd7e7f008a 100644 --- a/util/jsonrpc-types/Cargo.toml +++ b/util/jsonrpc-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-jsonrpc-types" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,7 +9,7 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc3" } +ckb-types = { path = "../types", version = "= 0.111.0-rc4" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" faster-hex = "0.6" diff --git a/util/launcher/Cargo.toml b/util/launcher/Cargo.toml index 7f4d874762..d3a1c11178 100644 --- a/util/launcher/Cargo.toml +++ b/util/launcher/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-launcher" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,44 +11,44 @@ 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.111.0-rc3" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc3" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc3" } -ckb-migration-template = { path = "migration-template", version = "= 0.111.0-rc3" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc3" } -ckb-db-migration = { path = "../../db-migration", version = "= 0.111.0-rc3" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc3" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc3" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc3" } -ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc3" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc3" } -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc3" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc3" } -ckb-network = { path = "../../network", version = "= 0.111.0-rc3"} -ckb-rpc = { path = "../../rpc", version = "= 0.111.0-rc3"} -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc3"} -ckb-network-alert = { path = "../network-alert", version = "= 0.111.0-rc3" } -ckb-sync = { path = "../../sync", version = "= 0.111.0-rc3"} -ckb-verification = { path = "../../verification", version = "= 0.111.0-rc3" } -ckb-verification-traits = { path = "../../verification/traits", version = "= 0.111.0-rc3" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc3" } -ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc3" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc3" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc3" } -ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc3" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc3" } -ckb-snapshot = { path = "../snapshot", version = "= 0.111.0-rc3" } -ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc3" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc3" } -ckb-light-client-protocol-server = { path = "../light-client-protocol-server", version = "= 0.111.0-rc3" } -ckb-block-filter = { path = "../../block-filter", version = "= 0.111.0-rc3" } -ckb-hash = { path = "../hash", version = "= 0.111.0-rc3" } +ckb-types = { path = "../types", version = "= 0.111.0-rc4" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc4" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc4" } +ckb-migration-template = { path = "migration-template", version = "= 0.111.0-rc4" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc4" } +ckb-db-migration = { path = "../../db-migration", version = "= 0.111.0-rc4" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc4" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc4" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc4" } +ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc4" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc4" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc4" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc4" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc4"} +ckb-rpc = { path = "../../rpc", version = "= 0.111.0-rc4"} +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc4"} +ckb-network-alert = { path = "../network-alert", version = "= 0.111.0-rc4" } +ckb-sync = { path = "../../sync", version = "= 0.111.0-rc4"} +ckb-verification = { path = "../../verification", version = "= 0.111.0-rc4" } +ckb-verification-traits = { path = "../../verification/traits", version = "= 0.111.0-rc4" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc4" } +ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc4" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc4" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc4" } +ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc4" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc4" } +ckb-snapshot = { path = "../snapshot", version = "= 0.111.0-rc4" } +ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc4" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc4" } +ckb-light-client-protocol-server = { path = "../light-client-protocol-server", version = "= 0.111.0-rc4" } +ckb-block-filter = { path = "../../block-filter", version = "= 0.111.0-rc4" } +ckb-hash = { path = "../hash", version = "= 0.111.0-rc4" } num_cpus = "1.10" once_cell = "1.8.0" tempfile.workspace = true [dev-dependencies] -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc3", features = ["enable_faketime"] } +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc4", features = ["enable_faketime"] } [features] with_sentry = [ "ckb-sync/with_sentry", "ckb-network/with_sentry", "ckb-app-config/with_sentry" ] diff --git a/util/launcher/migration-template/Cargo.toml b/util/launcher/migration-template/Cargo.toml index d115c2ab1e..fe77e5c1de 100644 --- a/util/launcher/migration-template/Cargo.toml +++ b/util/launcher/migration-template/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-migration-template" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/light-client-protocol-server/Cargo.toml b/util/light-client-protocol-server/Cargo.toml index 1123ca0bdc..e20a7ec967 100644 --- a/util/light-client-protocol-server/Cargo.toml +++ b/util/light-client-protocol-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-light-client-protocol-server" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,23 +9,23 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-network = { path = "../../network", version = "= 0.111.0-rc3" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc3" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc3" } -ckb-types = { path = "../types", version = "= 0.111.0-rc3" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc3" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc4" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc4" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc4" } +ckb-types = { path = "../types", version = "= 0.111.0-rc4" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc4" } ckb-merkle-mountain-range = "0.5.2" -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc3"} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc4"} [dev-dependencies] -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc3" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc3" } -ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc3" } -ckb-launcher = { path = "../launcher", version = "= 0.111.0-rc3" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc3" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc3" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc3" } -ckb-test-chain-utils = { path = "../test-chain-utils", version = "= 0.111.0-rc3" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc4" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc4" } +ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc4" } +ckb-launcher = { path = "../launcher", version = "= 0.111.0-rc4" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc4" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc4" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc4" } +ckb-test-chain-utils = { path = "../test-chain-utils", version = "= 0.111.0-rc4" } tempfile.workspace = true -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc3", features = ["enable_faketime"]} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc4", features = ["enable_faketime"]} tokio = "1.20" diff --git a/util/logger-config/Cargo.toml b/util/logger-config/Cargo.toml index 694074b47e..3aa83e615c 100644 --- a/util/logger-config/Cargo.toml +++ b/util/logger-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger-config" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/logger-service/Cargo.toml b/util/logger-service/Cargo.toml index a4aef3a2a9..a4c117fe04 100644 --- a/util/logger-service/Cargo.toml +++ b/util/logger-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger-service" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -9,9 +9,9 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-util = { path = "..", version = "= 0.111.0-rc3" } -ckb-logger-config = { path = "../logger-config", version = "= 0.111.0-rc3" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc3" } +ckb-util = { path = "..", version = "= 0.111.0-rc4" } +ckb-logger-config = { path = "../logger-config", version = "= 0.111.0-rc4" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc4" } yansi = "0.5" log = "0.4" env_logger = "0.6" @@ -22,7 +22,7 @@ sentry = { version = "0.26.0", optional = true, features = ["log"] } time = { version = "0.3.11", features = ["formatting"] } [dev-dependencies] -ckb-logger = { path = "../logger", version = "= 0.111.0-rc3" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc4" } tempfile.workspace = true [features] diff --git a/util/logger/Cargo.toml b/util/logger/Cargo.toml index e3886c3b3e..9f19d85938 100644 --- a/util/logger/Cargo.toml +++ b/util/logger/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/memory-tracker/Cargo.toml b/util/memory-tracker/Cargo.toml index e3334df7a1..61397c49e8 100644 --- a/util/memory-tracker/Cargo.toml +++ b/util/memory-tracker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-memory-tracker" -version = "0.111.0-rc3" +version = "0.111.0-rc4" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc3" } -ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc3" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc3" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc4" } +ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc4" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc4" } [target.'cfg(all(not(target_env = "msvc"), not(target_os="macos")))'.dependencies] jemalloc-ctl = { package = "tikv-jemalloc-ctl", version = "0.5.0" } diff --git a/util/metrics-config/Cargo.toml b/util/metrics-config/Cargo.toml index 1c7645aca7..20ca7dea04 100644 --- a/util/metrics-config/Cargo.toml +++ b/util/metrics-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics-config" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/metrics-service/Cargo.toml b/util/metrics-service/Cargo.toml index 4a618083fb..9bd6b34ad9 100644 --- a/util/metrics-service/Cargo.toml +++ b/util/metrics-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics-service" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -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.111.0-rc3" } -ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc3" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc3" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc3" } -ckb-util = { path = "..", version = "= 0.111.0-rc3" } +ckb-metrics-config = { path = "../metrics-config", version = "= 0.111.0-rc4" } +ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc4" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc4" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc4" } +ckb-util = { path = "..", version = "= 0.111.0-rc4" } prometheus = "0.13.3" hyper = { version = "0.14", features = ["http1", "tcp", "server"] } diff --git a/util/metrics/Cargo.toml b/util/metrics/Cargo.toml index 5055c12893..fdf51a1bff 100644 --- a/util/metrics/Cargo.toml +++ b/util/metrics/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/multisig/Cargo.toml b/util/multisig/Cargo.toml index 996e9f3ea3..0a5c95740b 100644 --- a/util/multisig/Cargo.toml +++ b/util/multisig/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-multisig" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,9 +9,9 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-error = { path = "../../error", version = "= 0.111.0-rc3" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc3" } -ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc3" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc4" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc4" } +ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc4" } [dev-dependencies] rand = "0.7" diff --git a/util/network-alert/Cargo.toml b/util/network-alert/Cargo.toml index f7d67efd21..41dac2e87c 100644 --- a/util/network-alert/Cargo.toml +++ b/util/network-alert/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-network-alert" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,24 +9,24 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-multisig = { path = "../multisig", version = "= 0.111.0-rc3" } -ckb-types = { path = "../types", version = "= 0.111.0-rc3" } -ckb-util = { path = "..", version = "= 0.111.0-rc3" } -ckb-network = { path = "../../network", version = "= 0.111.0-rc3" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc3"} -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc3" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc3"} -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc3" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc3" } -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc3" } +ckb-multisig = { path = "../multisig", version = "= 0.111.0-rc4" } +ckb-types = { path = "../types", version = "= 0.111.0-rc4" } +ckb-util = { path = "..", version = "= 0.111.0-rc4" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc4" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc4"} +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc4" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc4"} +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc4" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc4" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc4" } lru = "0.7.1" semver = "1.0" [dev-dependencies] -ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc3" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc3" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc3" } +ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc4" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc4" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc4" } once_cell = "1.8.0" -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc3", features = ["enable_faketime"]} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc4", features = ["enable_faketime"]} faster-hex = "0.6" serde_json = "1.0" diff --git a/util/occupied-capacity/Cargo.toml b/util/occupied-capacity/Cargo.toml index 9d03fd9751..a0282a5273 100644 --- a/util/occupied-capacity/Cargo.toml +++ b/util/occupied-capacity/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-occupied-capacity" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc3" } -ckb-occupied-capacity-core = { path = "core", version = "= 0.111.0-rc3" } +ckb-occupied-capacity-macros = { path = "macros", version = "= 0.111.0-rc4" } +ckb-occupied-capacity-core = { path = "core", version = "= 0.111.0-rc4" } diff --git a/util/occupied-capacity/core/Cargo.toml b/util/occupied-capacity/core/Cargo.toml index fbc1d97086..aa86b12d37 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.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/occupied-capacity/macros/Cargo.toml b/util/occupied-capacity/macros/Cargo.toml index a5abb373c7..a394ae0333 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.111.0-rc3" +version = "0.111.0-rc4" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -14,4 +14,4 @@ proc-macro = true [dependencies] quote = "1.0" syn = "1.0" -ckb-occupied-capacity-core = { path = "../core", version = "= 0.111.0-rc3" } +ckb-occupied-capacity-core = { path = "../core", version = "= 0.111.0-rc4" } diff --git a/util/proposal-table/Cargo.toml b/util/proposal-table/Cargo.toml index 00599cb9d1..75493b27eb 100644 --- a/util/proposal-table/Cargo.toml +++ b/util/proposal-table/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-proposal-table" -version = "0.111.0-rc3" +version = "0.111.0-rc4" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc3" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc3" } -ckb-types = { path = "../types", version = "= 0.111.0-rc3" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc4" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc4" } +ckb-types = { path = "../types", version = "= 0.111.0-rc4" } diff --git a/util/rational/Cargo.toml b/util/rational/Cargo.toml index afa48373ad..8a6bc18e78 100644 --- a/util/rational/Cargo.toml +++ b/util/rational/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-rational" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/reward-calculator/Cargo.toml b/util/reward-calculator/Cargo.toml index dfdcb35e3b..b34f51b3ee 100644 --- a/util/reward-calculator/Cargo.toml +++ b/util/reward-calculator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-reward-calculator" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,15 +9,15 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc3" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc3" } -ckb-dao = { path = "../dao", version = "= 0.111.0-rc3" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc3" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc3" } -ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc3"} +ckb-types = { path = "../types", version = "= 0.111.0-rc4" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc4" } +ckb-dao = { path = "../dao", version = "= 0.111.0-rc4" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc4" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc4" } +ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc4"} [dev-dependencies] -ckb-db = { path = "../../db", version = "= 0.111.0-rc3" } -ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc3" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc3" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc4" } +ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc4" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc4" } tempfile.workspace = true diff --git a/util/runtime/Cargo.toml b/util/runtime/Cargo.toml index 243ef9b997..506b522cb9 100644 --- a/util/runtime/Cargo.toml +++ b/util/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-async-runtime" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,6 +10,6 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] tokio = { version = "1", features = ["full"] } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc3" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc3" } -ckb-spawn = { path = "../spawn", version = "= 0.111.0-rc3" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc4" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc4" } +ckb-spawn = { path = "../spawn", version = "= 0.111.0-rc4" } diff --git a/util/rust-unstable-port/Cargo.toml b/util/rust-unstable-port/Cargo.toml index f77c71d8b9..ac5806c6c3 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.111.0-rc3" +version = "0.111.0-rc4" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" diff --git a/util/snapshot/Cargo.toml b/util/snapshot/Cargo.toml index 5c08b8b403..65cb216797 100644 --- a/util/snapshot/Cargo.toml +++ b/util/snapshot/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-snapshot" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,15 +11,15 @@ 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.111.0-rc3" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc3" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc3" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc3" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc3" } -ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc3" } +ckb-types = { path = "../types", version = "= 0.111.0-rc4" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc4" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc4" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc4" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc4" } +ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc4" } arc-swap = "1.3" -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc3" } -ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc3" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc4" } +ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc4" } ckb-merkle-mountain-range = "0.5.2" [features] diff --git a/util/spawn/Cargo.toml b/util/spawn/Cargo.toml index b6d8a5523a..3e92471db0 100644 --- a/util/spawn/Cargo.toml +++ b/util/spawn/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-spawn" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/stop-handler/Cargo.toml b/util/stop-handler/Cargo.toml index b9ab77bc59..ab7bbdedd0 100644 --- a/util/stop-handler/Cargo.toml +++ b/util/stop-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-stop-handler" -version = "0.111.0-rc3" +version = "0.111.0-rc4" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,6 +10,6 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] parking_lot = "0.12" -ckb-logger = { path = "../logger", version = "= 0.111.0-rc3" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc4" } tokio = { version = "1", features = ["sync", "rt-multi-thread"] } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc3" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc4" } diff --git a/util/systemtime/Cargo.toml b/util/systemtime/Cargo.toml index 46de84cb05..c07c770001 100644 --- a/util/systemtime/Cargo.toml +++ b/util/systemtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-systemtime" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/test-chain-utils/Cargo.toml b/util/test-chain-utils/Cargo.toml index 557e9e2080..7b59d01652 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.111.0-rc3" +version = "0.111.0-rc4" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,18 +9,18 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = {path = "../types", version = "= 0.111.0-rc3"} -ckb-db = { path = "../../db", version = "= 0.111.0-rc3" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc3" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc3" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc3" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc3" } +ckb-types = {path = "../types", version = "= 0.111.0-rc4"} +ckb-db = { path = "../../db", version = "= 0.111.0-rc4" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc4" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc4" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc4" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc4" } lazy_static = "1.3.0" -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc3" } -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc3" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc3" } -ckb-util = { path = "..", version = "= 0.111.0-rc3" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc4" } +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc4" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc4" } +ckb-util = { path = "..", version = "= 0.111.0-rc4" } tempfile.workspace = true [dev-dependencies] -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc3", features = ["enable_faketime"] } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc4", features = ["enable_faketime"] } diff --git a/util/types/Cargo.toml b/util/types/Cargo.toml index 4584b85191..3a41ed4fe1 100644 --- a/util/types/Cargo.toml +++ b/util/types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-types" -version = "0.111.0-rc3" +version = "0.111.0-rc4" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,17 +10,17 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] molecule = "=0.7.5" -ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc3" } +ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc4" } numext-fixed-uint = { version = "0.1", features = ["support_rand", "support_heapsize", "support_serde"] } bytes = { version="1", features = ["serde"] } merkle-cbt = "0.3" -ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc3" } -ckb-hash = { path = "../hash", version = "= 0.111.0-rc3" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc3" } -ckb-constant = { path = "../constant", version = "= 0.111.0-rc3" } +ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc4" } +ckb-hash = { path = "../hash", version = "= 0.111.0-rc4" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc4" } +ckb-constant = { path = "../constant", version = "= 0.111.0-rc4" } bit-vec = "0.6.3" -ckb-error = { path = "../../error", version = "= 0.111.0-rc3" } -ckb-rational = { path = "../rational", version = "= 0.111.0-rc3" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc4" } +ckb-rational = { path = "../rational", version = "= 0.111.0-rc4" } once_cell = "1.8.0" derive_more = { version = "0.99.0", default-features=false, features = ["display"] } ckb-merkle-mountain-range = "0.5.2" diff --git a/verification/Cargo.toml b/verification/Cargo.toml index b133a5d205..f2bb5a19f1 100644 --- a/verification/Cargo.toml +++ b/verification/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,20 +9,20 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } -ckb-script = { path = "../script", version = "= 0.111.0-rc3" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc3" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc3" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } +ckb-script = { path = "../script", version = "= 0.111.0-rc4" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc4" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc4" } lru = "0.7.1" -ckb-traits = { path = "../traits", version = "= 0.111.0-rc3" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc3" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc3" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc3" } -ckb-error = { path = "../error", version = "= 0.111.0-rc3" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc4" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc4" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc4" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc4" } +ckb-error = { path = "../error", version = "= 0.111.0-rc4" } derive_more = { version = "0.99.0", default-features=false, features = ["display"] } -ckb-verification-traits = { path = "./traits", version = "= 0.111.0-rc3" } +ckb-verification-traits = { path = "./traits", version = "= 0.111.0-rc4" } [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc3" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc3" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc3", features=["enable_faketime"]} +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc4" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc4" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc4", features=["enable_faketime"]} diff --git a/verification/contextual/Cargo.toml b/verification/contextual/Cargo.toml index 8790c33657..dabecab216 100644 --- a/verification/contextual/Cargo.toml +++ b/verification/contextual/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification-contextual" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,27 +9,27 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../../util/types", version = "= 0.111.0-rc3" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc3" } -ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc3" } +ckb-types = { path = "../../util/types", version = "= 0.111.0-rc4" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc4" } +ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc4" } rayon = "1.0" -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc3" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc3" } -ckb-dao = { path = "../../util/dao", version = "= 0.111.0-rc3" } -ckb-dao-utils = { path = "../../util/dao/utils", version = "= 0.111.0-rc3" } -ckb-logger = {path = "../../util/logger", version = "= 0.111.0-rc3"} -ckb-reward-calculator= { path = "../../util/reward-calculator", version = "= 0.111.0-rc3" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc3" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc4" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc4" } +ckb-dao = { path = "../../util/dao", version = "= 0.111.0-rc4" } +ckb-dao-utils = { path = "../../util/dao/utils", version = "= 0.111.0-rc4" } +ckb-logger = {path = "../../util/logger", version = "= 0.111.0-rc4"} +ckb-reward-calculator= { path = "../../util/reward-calculator", version = "= 0.111.0-rc4" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc4" } tokio = { version = "1", features = ["sync", "rt-multi-thread"] } -ckb-async-runtime = { path = "../../util/runtime", version = "= 0.111.0-rc3" } -ckb-verification-traits = { path = "../traits", version = "= 0.111.0-rc3" } -ckb-verification = { path = "..", version = "= 0.111.0-rc3" } +ckb-async-runtime = { path = "../../util/runtime", version = "= 0.111.0-rc4" } +ckb-verification-traits = { path = "../traits", version = "= 0.111.0-rc4" } +ckb-verification = { path = "..", version = "= 0.111.0-rc4" } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc3" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc3" } -ckb-launcher = { path = "../../util/launcher", version = "= 0.111.0-rc3" } -ckb-test-chain-utils = { path = "../../util/test-chain-utils", version = "= 0.111.0-rc3" } -ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc3", features = ["enable_faketime"]} +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc4" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc4" } +ckb-launcher = { path = "../../util/launcher", version = "= 0.111.0-rc4" } +ckb-test-chain-utils = { path = "../../util/test-chain-utils", version = "= 0.111.0-rc4" } +ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc4", features = ["enable_faketime"]} rand = "0.7" diff --git a/verification/traits/Cargo.toml b/verification/traits/Cargo.toml index 439ca77f84..8122129a73 100644 --- a/verification/traits/Cargo.toml +++ b/verification/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification-traits" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,4 +10,4 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] bitflags = "1.0" -ckb-error = { path = "../../error", version = "= 0.111.0-rc3" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc4" } diff --git a/wasm-build-test/Cargo.toml b/wasm-build-test/Cargo.toml index 156012c363..5e2c5294a1 100644 --- a/wasm-build-test/Cargo.toml +++ b/wasm-build-test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-wasm-test" -version = "0.111.0-rc3" +version = "0.111.0-rc4" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,8 +9,8 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc3" } -ckb-script = { path = "../script", version = "= 0.111.0-rc3", default-features = false, features = [] } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } +ckb-script = { path = "../script", version = "= 0.111.0-rc4", default-features = false, features = [] } # Prevent this from interfering with workspaces [workspace] From 15911974afe1548615020be64290d82e020784b1 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 21 Jun 2023 11:01:19 +0800 Subject: [PATCH 013/125] Fix RUSTSEC-2023-0044 warning Signed-off-by: Eval EXEC --- Cargo.lock | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 896957dd92..4776ff0e98 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3306,9 +3306,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.48" +version = "0.10.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -3338,11 +3338,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.83" +version = "0.9.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" dependencies = [ - "autocfg", "cc", "libc", "pkg-config", From 8c9ed9ced210718a251adb4aca0d66826d4e231e Mon Sep 17 00:00:00 2001 From: zhangsoledad <787953403@qq.com> Date: Wed, 21 Jun 2023 18:32:26 +0800 Subject: [PATCH 014/125] fix: get_consensus compatibility --- rpc/README.md | 47 +++++++--------------------- rpc/src/module/chain.rs | 26 +++++++-------- util/jsonrpc-types/src/blockchain.rs | 10 ++---- 3 files changed, 25 insertions(+), 58 deletions(-) diff --git a/rpc/README.md b/rpc/README.md index cf33106e12..166d922b30 100644 --- a/rpc/README.md +++ b/rpc/README.md @@ -138,7 +138,6 @@ The crate `ckb-rpc`'s minimum supported rustc version is 1.67.1. * [Type `EstimateCycles`](#type-estimatecycles) * [Type `FeeRateStatistics`](#type-feeratestatistics) * [Type `H256`](#type-h256) - * [Type `HardForkFeature`](#type-hardforkfeature) * [Type `HardForks`](#type-hardforks) * [Type `Header`](#type-header) * [Type `HeaderView`](#type-headerview) @@ -1655,21 +1654,17 @@ Response "dao_type_hash": null, "epoch_duration_target": "0x3840", "genesis_hash": "0x7978ec7ce5b507cfb52e149e36b1a23f6062ed150503c85bbf825da3599095ed", - "hardfork_features": { - "ckb2021": [ - { "rfc": "0028", "epoch_number": "0x1526" }, - { "rfc": "0029", "epoch_number": "0x0" }, - { "rfc": "0030", "epoch_number": "0x0" }, - { "rfc": "0031", "epoch_number": "0x0" }, - { "rfc": "0032", "epoch_number": "0x0" }, - { "rfc": "0036", "epoch_number": "0x0" }, - { "rfc": "0038", "epoch_number": "0x0" } - ], - "ckb2023": [ - { "rfc": "0048", "epoch_number": null }, - { "rfc": "0049", "epoch_number": null } - ] - }, + "hardfork_features": [ + { "rfc": "0028", "epoch_number": "0x1526" }, + { "rfc": "0029", "epoch_number": "0x0" }, + { "rfc": "0030", "epoch_number": "0x0" }, + { "rfc": "0031", "epoch_number": "0x0" }, + { "rfc": "0032", "epoch_number": "0x0" }, + { "rfc": "0036", "epoch_number": "0x0" }, + { "rfc": "0038", "epoch_number": "0x0" }, + { "rfc": "0048", "epoch_number": null }, + { "rfc": "0049", "epoch_number": null } + ], "id": "main", "initial_primary_epoch_reward": "0x71afd498d000", "max_block_bytes": "0x91c08", @@ -5902,30 +5897,10 @@ The fee_rate statistics information, includes mean and median, unit: shannons pe The 256-bit binary data encoded as a 0x-prefixed hex string in JSON. -### Type `HardForkFeature` - -The information about one hardfork feature. - -#### Fields - -`HardForkFeature` is a JSON object with the following fields. - -* `rfc`: `string` - The related RFC ID. - -* `epoch_number`: [`EpochNumber`](#type-epochnumber) `|` `null` - The first epoch when the feature is enabled, `null` indicates that the RFC has never been enabled. - - ### Type `HardForks` Hardfork information -#### Fields - -`HardForks` is a JSON object with the following fields. - -* `ckb2021`: `Array<` [`HardForkFeature`](#type-hardforkfeature) `>` - ckb2021 information - -* `ckb2023`: `Array<` [`HardForkFeature`](#type-hardforkfeature) `>` - ckb2023 information ### Type `Header` diff --git a/rpc/src/module/chain.rs b/rpc/src/module/chain.rs index 27f05e5bd8..dce4c322f8 100644 --- a/rpc/src/module/chain.rs +++ b/rpc/src/module/chain.rs @@ -1337,21 +1337,17 @@ pub trait ChainRpc { /// "dao_type_hash": null, /// "epoch_duration_target": "0x3840", /// "genesis_hash": "0x7978ec7ce5b507cfb52e149e36b1a23f6062ed150503c85bbf825da3599095ed", - /// "hardfork_features": { - /// "ckb2021": [ - /// { "rfc": "0028", "epoch_number": "0x1526" }, - /// { "rfc": "0029", "epoch_number": "0x0" }, - /// { "rfc": "0030", "epoch_number": "0x0" }, - /// { "rfc": "0031", "epoch_number": "0x0" }, - /// { "rfc": "0032", "epoch_number": "0x0" }, - /// { "rfc": "0036", "epoch_number": "0x0" }, - /// { "rfc": "0038", "epoch_number": "0x0" } - /// ], - /// "ckb2023": [ - /// { "rfc": "0048", "epoch_number": null }, - /// { "rfc": "0049", "epoch_number": null } - /// ] - /// }, + /// "hardfork_features": [ + /// { "rfc": "0028", "epoch_number": "0x1526" }, + /// { "rfc": "0029", "epoch_number": "0x0" }, + /// { "rfc": "0030", "epoch_number": "0x0" }, + /// { "rfc": "0031", "epoch_number": "0x0" }, + /// { "rfc": "0032", "epoch_number": "0x0" }, + /// { "rfc": "0036", "epoch_number": "0x0" }, + /// { "rfc": "0038", "epoch_number": "0x0" }, + /// { "rfc": "0048", "epoch_number": null }, + /// { "rfc": "0049", "epoch_number": null } + /// ], /// "id": "main", /// "initial_primary_epoch_reward": "0x71afd498d000", /// "max_block_bytes": "0x91c08", diff --git a/util/jsonrpc-types/src/blockchain.rs b/util/jsonrpc-types/src/blockchain.rs index 44f81994a8..8acaf95ce7 100644 --- a/util/jsonrpc-types/src/blockchain.rs +++ b/util/jsonrpc-types/src/blockchain.rs @@ -1382,18 +1382,16 @@ pub struct Consensus { /// Hardfork information #[derive(Clone, Serialize, Deserialize, Debug)] +#[serde(transparent)] pub struct HardForks { - /// ckb2021 information - pub ckb2021: Vec, - /// ckb2023 information - pub ckb2023: Vec, + inner: Vec, } impl HardForks { /// Returns a list of hardfork features from a hardfork switch. pub fn new(hardforks: &core::hardfork::HardForks) -> Self { HardForks { - ckb2021: vec![ + inner: vec![ HardForkFeature::new("0028", convert(hardforks.ckb2021.rfc_0028())), HardForkFeature::new("0029", convert(hardforks.ckb2021.rfc_0029())), HardForkFeature::new("0030", convert(hardforks.ckb2021.rfc_0030())), @@ -1401,8 +1399,6 @@ impl HardForks { HardForkFeature::new("0032", convert(hardforks.ckb2021.rfc_0032())), HardForkFeature::new("0036", convert(hardforks.ckb2021.rfc_0036())), HardForkFeature::new("0038", convert(hardforks.ckb2021.rfc_0038())), - ], - ckb2023: vec![ HardForkFeature::new("0048", convert(hardforks.ckb2023.rfc_0048())), HardForkFeature::new("0049", convert(hardforks.ckb2023.rfc_0049())), ], From 8362a93a9175d93d592b1b5c4967db5540e268fb Mon Sep 17 00:00:00 2001 From: ian Date: Thu, 22 Jun 2023 03:07:59 +0200 Subject: [PATCH 015/125] chore: bump to v0.111.0-rc5 --- Cargo.lock | 136 +++++++++---------- Cargo.toml | 8 +- README.md | 2 +- benches/Cargo.toml | 36 ++--- block-filter/Cargo.toml | 14 +- chain/Cargo.toml | 52 +++---- ckb-bin/Cargo.toml | 46 +++---- db-migration/Cargo.toml | 12 +- db-schema/Cargo.toml | 2 +- db/Cargo.toml | 10 +- error/Cargo.toml | 4 +- freezer/Cargo.toml | 12 +- miner/Cargo.toml | 20 +-- network/Cargo.toml | 22 +-- notify/Cargo.toml | 12 +- pow/Cargo.toml | 6 +- resource/Cargo.toml | 6 +- rpc/Cargo.toml | 60 ++++---- script/Cargo.toml | 24 ++-- script/fuzz/Cargo.toml | 10 +- shared/Cargo.toml | 38 +++--- spec/Cargo.toml | 26 ++-- store/Cargo.toml | 20 +-- sync/Cargo.toml | 56 ++++---- test/Cargo.toml | 40 +++--- traits/Cargo.toml | 4 +- tx-pool/Cargo.toml | 44 +++--- util/Cargo.toml | 4 +- util/app-config/Cargo.toml | 24 ++-- util/build-info/Cargo.toml | 2 +- util/chain-iter/Cargo.toml | 6 +- util/channel/Cargo.toml | 2 +- util/constant/Cargo.toml | 2 +- util/crypto/Cargo.toml | 4 +- util/dao/Cargo.toml | 16 +-- util/dao/utils/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/indexer/Cargo.toml | 20 +-- util/instrument/Cargo.toml | 12 +- util/jsonrpc-types/Cargo.toml | 4 +- util/launcher/Cargo.toml | 68 +++++----- util/launcher/migration-template/Cargo.toml | 2 +- util/light-client-protocol-server/Cargo.toml | 32 ++--- util/logger-config/Cargo.toml | 2 +- util/logger-service/Cargo.toml | 10 +- util/logger/Cargo.toml | 2 +- util/memory-tracker/Cargo.toml | 8 +- util/metrics-config/Cargo.toml | 2 +- util/metrics-service/Cargo.toml | 12 +- util/metrics/Cargo.toml | 2 +- util/multisig/Cargo.toml | 8 +- util/network-alert/Cargo.toml | 30 ++-- 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 | 20 +-- util/runtime/Cargo.toml | 8 +- util/rust-unstable-port/Cargo.toml | 2 +- util/snapshot/Cargo.toml | 18 +-- util/spawn/Cargo.toml | 2 +- util/stop-handler/Cargo.toml | 6 +- util/systemtime/Cargo.toml | 2 +- util/test-chain-utils/Cargo.toml | 24 ++-- util/types/Cargo.toml | 16 +-- verification/Cargo.toml | 28 ++-- verification/contextual/Cargo.toml | 38 +++--- verification/traits/Cargo.toml | 4 +- wasm-build-test/Cargo.toml | 6 +- 73 files changed, 606 insertions(+), 606 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4776ff0e98..d15358a516 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -395,7 +395,7 @@ dependencies = [ [[package]] name = "ckb" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-bin", "ckb-build-info", @@ -404,7 +404,7 @@ dependencies = [ [[package]] name = "ckb-app-config" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-build-info", "ckb-chain-spec", @@ -433,7 +433,7 @@ dependencies = [ [[package]] name = "ckb-async-runtime" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-logger", "ckb-spawn", @@ -443,7 +443,7 @@ dependencies = [ [[package]] name = "ckb-benches" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-app-config", "ckb-chain", @@ -471,7 +471,7 @@ dependencies = [ [[package]] name = "ckb-bin" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "base64", "ckb-app-config", @@ -511,7 +511,7 @@ dependencies = [ [[package]] name = "ckb-block-filter" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-async-runtime", "ckb-logger", @@ -523,11 +523,11 @@ dependencies = [ [[package]] name = "ckb-build-info" -version = "0.111.0-rc4" +version = "0.111.0-rc5" [[package]] name = "ckb-chain" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -561,7 +561,7 @@ dependencies = [ [[package]] name = "ckb-chain-iter" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-store", "ckb-types", @@ -569,7 +569,7 @@ dependencies = [ [[package]] name = "ckb-chain-spec" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-constant", "ckb-crypto", @@ -589,18 +589,18 @@ dependencies = [ [[package]] name = "ckb-channel" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "crossbeam-channel", ] [[package]] name = "ckb-constant" -version = "0.111.0-rc4" +version = "0.111.0-rc5" [[package]] name = "ckb-crypto" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-fixed-hash", "faster-hex", @@ -612,7 +612,7 @@ dependencies = [ [[package]] name = "ckb-dao" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "byteorder", "ckb-chain-spec", @@ -627,7 +627,7 @@ dependencies = [ [[package]] name = "ckb-dao-utils" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "byteorder", "ckb-error", @@ -636,7 +636,7 @@ dependencies = [ [[package]] name = "ckb-db" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-app-config", "ckb-db-schema", @@ -649,7 +649,7 @@ dependencies = [ [[package]] name = "ckb-db-migration" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-app-config", "ckb-db", @@ -663,11 +663,11 @@ dependencies = [ [[package]] name = "ckb-db-schema" -version = "0.111.0-rc4" +version = "0.111.0-rc5" [[package]] name = "ckb-error" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "anyhow", "ckb-occupied-capacity", @@ -677,7 +677,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-fixed-hash-core", "ckb-fixed-hash-macros", @@ -685,7 +685,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-core" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "faster-hex", "serde", @@ -695,7 +695,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-macros" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-fixed-hash-core", "proc-macro2", @@ -705,7 +705,7 @@ dependencies = [ [[package]] name = "ckb-freezer" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-error", "ckb-logger", @@ -721,7 +721,7 @@ dependencies = [ [[package]] name = "ckb-hash" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "blake2b-ref", "blake2b-rs", @@ -729,7 +729,7 @@ dependencies = [ [[package]] name = "ckb-indexer" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -751,7 +751,7 @@ dependencies = [ [[package]] name = "ckb-instrument" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-chain", "ckb-chain-iter", @@ -764,7 +764,7 @@ dependencies = [ [[package]] name = "ckb-jsonrpc-types" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-types", "faster-hex", @@ -777,7 +777,7 @@ dependencies = [ [[package]] name = "ckb-launcher" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -833,7 +833,7 @@ dependencies = [ [[package]] name = "ckb-light-client-protocol-server" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-app-config", "ckb-chain", @@ -856,14 +856,14 @@ dependencies = [ [[package]] name = "ckb-logger" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "log", ] [[package]] name = "ckb-logger-config" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "serde", "toml", @@ -871,7 +871,7 @@ dependencies = [ [[package]] name = "ckb-logger-service" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "backtrace", "ckb-channel", @@ -890,7 +890,7 @@ dependencies = [ [[package]] name = "ckb-memory-tracker" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-db", "ckb-logger", @@ -912,7 +912,7 @@ dependencies = [ [[package]] name = "ckb-metrics" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "once_cell", "prometheus", @@ -921,14 +921,14 @@ dependencies = [ [[package]] name = "ckb-metrics-config" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "serde", ] [[package]] name = "ckb-metrics-service" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-async-runtime", "ckb-logger", @@ -941,7 +941,7 @@ dependencies = [ [[package]] name = "ckb-migration-template" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "quote", "syn", @@ -949,7 +949,7 @@ dependencies = [ [[package]] name = "ckb-miner" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "base64", "ckb-app-config", @@ -978,7 +978,7 @@ dependencies = [ [[package]] name = "ckb-multisig" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-crypto", "ckb-error", @@ -988,7 +988,7 @@ dependencies = [ [[package]] name = "ckb-network" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "bitflags", "bloom-filters", @@ -1026,7 +1026,7 @@ dependencies = [ [[package]] name = "ckb-network-alert" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1050,7 +1050,7 @@ dependencies = [ [[package]] name = "ckb-notify" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1062,7 +1062,7 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-occupied-capacity-core", "ckb-occupied-capacity-macros", @@ -1070,14 +1070,14 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity-core" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "serde", ] [[package]] name = "ckb-occupied-capacity-macros" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-occupied-capacity-core", "quote", @@ -1086,7 +1086,7 @@ dependencies = [ [[package]] name = "ckb-pow" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "byteorder", "ckb-hash", @@ -1098,7 +1098,7 @@ dependencies = [ [[package]] name = "ckb-proposal-table" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-chain-spec", "ckb-logger", @@ -1107,7 +1107,7 @@ dependencies = [ [[package]] name = "ckb-rational" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "numext-fixed-uint", "proptest", @@ -1116,7 +1116,7 @@ dependencies = [ [[package]] name = "ckb-resource" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-system-scripts", "ckb-types", @@ -1130,7 +1130,7 @@ dependencies = [ [[package]] name = "ckb-reward-calculator" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-chain-spec", "ckb-dao", @@ -1157,7 +1157,7 @@ dependencies = [ [[package]] name = "ckb-rpc" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-app-config", "ckb-chain", @@ -1206,14 +1206,14 @@ dependencies = [ [[package]] name = "ckb-rust-unstable-port" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "is_sorted", ] [[package]] name = "ckb-script" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "byteorder", "ckb-chain-spec", @@ -1238,7 +1238,7 @@ dependencies = [ [[package]] name = "ckb-shared" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "arc-swap", "ckb-async-runtime", @@ -1262,7 +1262,7 @@ dependencies = [ [[package]] name = "ckb-snapshot" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "arc-swap", "ckb-chain-spec", @@ -1278,11 +1278,11 @@ dependencies = [ [[package]] name = "ckb-spawn" -version = "0.111.0-rc4" +version = "0.111.0-rc5" [[package]] name = "ckb-stop-handler" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-channel", "ckb-logger", @@ -1292,7 +1292,7 @@ dependencies = [ [[package]] name = "ckb-store" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -1310,7 +1310,7 @@ dependencies = [ [[package]] name = "ckb-sync" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "bitflags", "ckb-app-config", @@ -1367,11 +1367,11 @@ dependencies = [ [[package]] name = "ckb-systemtime" -version = "0.111.0-rc4" +version = "0.111.0-rc5" [[package]] name = "ckb-test-chain-utils" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-chain-spec", "ckb-dao-utils", @@ -1389,14 +1389,14 @@ dependencies = [ [[package]] name = "ckb-traits" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-types", ] [[package]] name = "ckb-tx-pool" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1432,7 +1432,7 @@ dependencies = [ [[package]] name = "ckb-types" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "bit-vec", "bytes 1.4.0", @@ -1456,7 +1456,7 @@ dependencies = [ [[package]] name = "ckb-util" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-fixed-hash", "linked-hash-map", @@ -1467,7 +1467,7 @@ dependencies = [ [[package]] name = "ckb-verification" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-chain-spec", "ckb-dao", @@ -1487,7 +1487,7 @@ dependencies = [ [[package]] name = "ckb-verification-contextual" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "ckb-async-runtime", "ckb-chain", @@ -1514,7 +1514,7 @@ dependencies = [ [[package]] name = "ckb-verification-traits" -version = "0.111.0-rc4" +version = "0.111.0-rc5" dependencies = [ "bitflags", "ckb-error", diff --git a/Cargo.toml b/Cargo.toml index 6a93b86786..9d027e1b1e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,11 +11,11 @@ repository = "https://github.com/nervosnetwork/ckb" rust-version = "1.67.1" [build-dependencies] -ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc4" } +ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc5" } [dependencies] -ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc4" } -ckb-bin = { path = "ckb-bin", version = "= 0.111.0-rc4" } +ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc5" } +ckb-bin = { path = "ckb-bin", version = "= 0.111.0-rc5" } [dev-dependencies] diff --git a/README.md b/README.md index 3608750bef..1ee8f951bb 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.111.0--rc4-orange.svg)](https://github.com/nervosnetwork/ckb/releases) +[![Version](https://img.shields.io/badge/version-0.111.0--rc5-orange.svg)](https://github.com/nervosnetwork/ckb/releases) [![Nervos Talk](https://img.shields.io/badge/discuss-on%20Nervos%20Talk-3CC68A.svg)](https://talk.nervos.org/t/where-to-discuss-ckb-and-how-to-ask-for-support/6024) master | develop diff --git a/benches/Cargo.toml b/benches/Cargo.toml index d74ba582dd..83758147f8 100644 --- a/benches/Cargo.toml +++ b/benches/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-benches" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,26 +13,26 @@ repository = "https://github.com/nervosnetwork/ckb" [dev-dependencies] criterion = "0.4" -ckb-chain = { path = "../chain", version = "= 0.111.0-rc4" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc4" } -ckb-store = { path = "../store", version = "= 0.111.0-rc4" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc4" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc5" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc5" } +ckb-store = { path = "../store", version = "= 0.111.0-rc5" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc5" } rand = "0.7" -ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc4"} -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc4" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc4" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc4" } +ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc5"} +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc5" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc5" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc5" } ckb-system-scripts = { version = "= 0.5.4" } lazy_static = "1.3.0" -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc4" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc4" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc4" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc4" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc4" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc4" } -ckb-network = { path = "../network", version = "= 0.111.0-rc4" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc4" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc5" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc5" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc5" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc5" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc5" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc5" } +ckb-network = { path = "../network", version = "= 0.111.0-rc5" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc5" } tempfile.workspace = true [[bench]] diff --git a/block-filter/Cargo.toml b/block-filter/Cargo.toml index e74dab59f1..e7beae79f8 100644 --- a/block-filter/Cargo.toml +++ b/block-filter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-block-filter" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,9 +11,9 @@ repository = "https://github.com/nervosnetwork/ckb" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ckb-store = { path = "../store", version = "= 0.111.0-rc4" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc4" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc4" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc4" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc4" } +ckb-store = { path = "../store", version = "= 0.111.0-rc5" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc5" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc5" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc5" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc5" } diff --git a/chain/Cargo.toml b/chain/Cargo.toml index b91ee52d82..7927d40bad 100644 --- a/chain/Cargo.toml +++ b/chain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,37 +9,37 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc4" } -ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc4" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc4" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc4" } -ckb-store = { path = "../store", version = "= 0.111.0-rc4" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc4" } -ckb-verification-contextual = { path = "../verification/contextual", version = "= 0.111.0-rc4" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc4" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc4" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc4" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc4" } -ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc4" } -ckb-error = { path = "../error", version = "= 0.111.0-rc4" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc4" } -ckb-rust-unstable-port = { path = "../util/rust-unstable-port", version = "= 0.111.0-rc4" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc4" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc5" } +ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc5" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc5" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc5" } +ckb-store = { path = "../store", version = "= 0.111.0-rc5" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc5" } +ckb-verification-contextual = { path = "../verification/contextual", version = "= 0.111.0-rc5" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc5" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc5" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc5" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc5" } +ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc5" } +ckb-error = { path = "../error", version = "= 0.111.0-rc5" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc5" } +ckb-rust-unstable-port = { path = "../util/rust-unstable-port", version = "= 0.111.0-rc5" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc5" } faux = { version = "^0.1", optional = true } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc4" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc4" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc4" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc4", features = ["internal"] } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc4" } -ckb-network = { path = "../network", version = "= 0.111.0-rc4" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc4" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc5" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc5" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc5" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc5", features = ["internal"] } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc5" } +ckb-network = { path = "../network", version = "= 0.111.0-rc5" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc5" } lazy_static = "1.4" tempfile.workspace = true -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc4" ,features = ["enable_faketime"]} +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc5" ,features = ["enable_faketime"]} [features] default = [] diff --git a/ckb-bin/Cargo.toml b/ckb-bin/Cargo.toml index aa0558d123..c804b7f495 100644 --- a/ckb-bin/Cargo.toml +++ b/ckb-bin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-bin" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -14,29 +14,29 @@ serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0" } serde_plain = "0.3.0" toml = "0.5" -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc4" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc4" } -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc4" } -ckb-metrics-service = { path = "../util/metrics-service", version = "= 0.111.0-rc4" } -ckb-util = { path = "../util", version = "= 0.111.0-rc4" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc4" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc4" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc4" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc4" } -ckb-store = { path = "../store", version = "= 0.111.0-rc4" } -ckb-chain-spec = {path = "../spec", version = "= 0.111.0-rc4"} -ckb-miner = { path = "../miner", version = "= 0.111.0-rc4" } -ckb-network = { path = "../network", version = "= 0.111.0-rc4"} -ckb-resource = { path = "../resource", version = "= 0.111.0-rc4"} +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc5" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc5" } +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc5" } +ckb-metrics-service = { path = "../util/metrics-service", version = "= 0.111.0-rc5" } +ckb-util = { path = "../util", version = "= 0.111.0-rc5" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc5" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc5" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc5" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc5" } +ckb-store = { path = "../store", version = "= 0.111.0-rc5" } +ckb-chain-spec = {path = "../spec", version = "= 0.111.0-rc5"} +ckb-miner = { path = "../miner", version = "= 0.111.0-rc5" } +ckb-network = { path = "../network", version = "= 0.111.0-rc5"} +ckb-resource = { path = "../resource", version = "= 0.111.0-rc5"} ctrlc = { version = "3.1", features = ["termination"] } -ckb-instrument = { path = "../util/instrument", version = "= 0.111.0-rc4", features = ["progress_bar"] } -ckb-build-info = { path = "../util/build-info", version = "= 0.111.0-rc4" } -ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc4" } -ckb-chain-iter = { path = "../util/chain-iter", version = "= 0.111.0-rc4" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc4" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc4" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc4" } +ckb-instrument = { path = "../util/instrument", version = "= 0.111.0-rc5", features = ["progress_bar"] } +ckb-build-info = { path = "../util/build-info", version = "= 0.111.0-rc5" } +ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc5" } +ckb-chain-iter = { path = "../util/chain-iter", version = "= 0.111.0-rc5" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc5" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc5" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc5" } base64 = "0.21.0" tempfile.workspace = true rayon = "1.0" diff --git a/db-migration/Cargo.toml b/db-migration/Cargo.toml index 03fb842961..46c9d31367 100644 --- a/db-migration/Cargo.toml +++ b/db-migration/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db-migration" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,16 +11,16 @@ 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.111.0-rc4" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc4" } -ckb-error = { path = "../error", version = "= 0.111.0-rc4" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc4" } +ckb-db = { path = "../db", version = "= 0.111.0-rc5" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc5" } +ckb-error = { path = "../error", version = "= 0.111.0-rc5" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc5" } indicatif = "0.16" console = ">=0.9.1, <1.0.0" [dev-dependencies] tempfile.workspace = true -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc4" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc5" } [features] portable = ["ckb-db/portable"] diff --git a/db-schema/Cargo.toml b/db-schema/Cargo.toml index 2e226586c4..e97236b543 100644 --- a/db-schema/Cargo.toml +++ b/db-schema/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db-schema" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/db/Cargo.toml b/db/Cargo.toml index 61d466d224..7a50be2231 100644 --- a/db/Cargo.toml +++ b/db/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,12 +9,12 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc4" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc4" } -ckb-error = { path = "../error", version = "= 0.111.0-rc4" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc5" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc5" } +ckb-error = { path = "../error", version = "= 0.111.0-rc5" } libc = "0.2" rocksdb = { package = "ckb-rocksdb", version ="=0.20.0", features = ["snappy"], default-features = false } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc4" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc5" } [dev-dependencies] tempfile.workspace = true diff --git a/error/Cargo.toml b/error/Cargo.toml index 079af77ff6..fe57a82ea3 100644 --- a/error/Cargo.toml +++ b/error/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-error" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,5 +11,5 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] thiserror = "1.0.22" anyhow = "1.0.34" -ckb-occupied-capacity = { path = "../util/occupied-capacity", version = "= 0.111.0-rc4" } +ckb-occupied-capacity = { path = "../util/occupied-capacity", version = "= 0.111.0-rc5" } derive_more = { version = "0.99.0", default-features = false, features = ["display"] } diff --git a/freezer/Cargo.toml b/freezer/Cargo.toml index 8984603f0b..ce1539c375 100644 --- a/freezer/Cargo.toml +++ b/freezer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-freezer" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,11 +10,11 @@ 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.111.0-rc4" } -ckb-error = { path = "../error", version = "= 0.111.0-rc4" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc4" } -ckb-util = { path = "../util", version = "= 0.111.0-rc4" } -ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc4" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } +ckb-error = { path = "../error", version = "= 0.111.0-rc5" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc5" } +ckb-util = { path = "../util", version = "= 0.111.0-rc5" } +ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc5" } fs2 = "0.4.3" fail = "0.4" snap = "1" diff --git a/miner/Cargo.toml b/miner/Cargo.toml index 25bd51817f..869d2d78aa 100644 --- a/miner/Cargo.toml +++ b/miner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-miner" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,23 +9,23 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc4" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc4" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc4" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc4" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc4" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc5" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc5" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc5" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc5" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc5" } rand = "0.7" rand_distr = "0.3" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc4" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc5" } hyper = { version = "0.14", features = ["client", "http2", "http1", "server"] } hyper-tls = "0.5" futures = "0.3" lru = "0.7.1" -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc4" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc4" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc5" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc5" } indicatif = "0.16" console = ">=0.9.1, <1.0.0" eaglesong = "0.1" diff --git a/network/Cargo.toml b/network/Cargo.toml index ca4eecc73e..20dac3f281 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-network" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,28 +11,28 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] rand = "0.7" serde = { version = "1.0", features = ["derive"] } -ckb-util = { path = "../util", version = "= 0.111.0-rc4" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc4" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc4" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc4" } -ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc4"} +ckb-util = { path = "../util", version = "= 0.111.0-rc5" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc5" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc5" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc5" } +ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc5"} tokio = { version = "1", features = ["sync", "macros"] } tokio-util = { version = "0.7", features = ["codec"] } futures = "0.3" -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc4"} +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc5"} lazy_static = { version = "1.3.0", optional = true } bs58 = { version = "0.4.0", optional = true } sentry = { version = "0.26.0", optional = true } faster-hex = { version = "0.6", optional = true } -ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc4"} +ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc5"} secp256k1 = {version = "0.24", features = ["recovery"], optional = true } trust-dns-resolver = { version = "0.20", optional = true } snap = "1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } ipnetwork = "0.18" serde_json = "1.0" bloom-filters = "0.1" -ckb-spawn = { path = "../util/spawn", version = "= 0.111.0-rc4" } +ckb-spawn = { path = "../util/spawn", version = "= 0.111.0-rc5" } socket2 = "0.4" bitflags = "1.0" @@ -48,7 +48,7 @@ criterion = "0.4" proptest = "1.0" num_cpus = "1.10" once_cell = "1.8.0" -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc4", features = ["enable_faketime"]} +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc5", features = ["enable_faketime"]} [[bench]] name = "peer_store" diff --git a/notify/Cargo.toml b/notify/Cargo.toml index 4e3e595c6b..9dd0723e19 100644 --- a/notify/Cargo.toml +++ b/notify/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-notify" -version = "0.111.0-rc4" +version = "0.111.0-rc5" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc4" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc4" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc4" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc4" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc5" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc5" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc5" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc5" } tokio = { version = "1", features = ["sync"] } [dev-dependencies] diff --git a/pow/Cargo.toml b/pow/Cargo.toml index 2f0fa79655..a728d93a3b 100644 --- a/pow/Cargo.toml +++ b/pow/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-pow" -version = "0.111.0-rc4" +version = "0.111.0-rc5" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,8 +10,8 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc4"} +ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc5"} serde = { version = "1.0", features = ["derive"] } eaglesong = "0.1" log = "0.4" diff --git a/resource/Cargo.toml b/resource/Cargo.toml index b5ac5153c6..b4f62a7ecb 100644 --- a/resource/Cargo.toml +++ b/resource/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-resource" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,13 +13,13 @@ repository = "https://github.com/nervosnetwork/ckb" phf = "0.8.0" includedir = "0.6.0" serde = { version = "1.0", features = ["derive"] } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } ckb-system-scripts = { version = "= 0.5.4" } [build-dependencies] includedir_codegen = "0.6.0" walkdir = "2.1.4" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } ckb-system-scripts = { version = "= 0.5.4" } [dev-dependencies] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 8efac40750..e87a487a81 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-rpc" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,19 +9,19 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc4" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } -ckb-network = { path = "../network", version = "= 0.111.0-rc4" } -ckb-notify = { path = "../notify", version = "= 0.111.0-rc4" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc4" } -ckb-store = { path = "../store", version = "= 0.111.0-rc4" } -ckb-sync = { path = "../sync", version = "= 0.111.0-rc4" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc4" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc4"} -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc4"} -ckb-network-alert = { path = "../util/network-alert", version = "= 0.111.0-rc4" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc4" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc4" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc5" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } +ckb-network = { path = "../network", version = "= 0.111.0-rc5" } +ckb-notify = { path = "../notify", version = "= 0.111.0-rc5" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc5" } +ckb-store = { path = "../store", version = "= 0.111.0-rc5" } +ckb-sync = { path = "../sync", version = "= 0.111.0-rc5" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc5" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc5"} +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc5"} +ckb-network-alert = { path = "../util/network-alert", version = "= 0.111.0-rc5" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc5" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc5" } jsonrpc-core = "18.0" jsonrpc-derive = "18.0" jsonrpc-http-server = "18.0" @@ -30,27 +30,27 @@ jsonrpc-ws-server = "18.0" jsonrpc-server-utils = "18.0" jsonrpc-pubsub = "18.0" serde_json = "1.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc4" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc4" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc4" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc4" } -ckb-util = { path = "../util", version = "= 0.111.0-rc4" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc4" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc4" } -ckb-error = { path = "../error", version = "= 0.111.0-rc4" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc4" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc4" } -ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc4" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc4" } -ckb-indexer = { path = "../util/indexer", version = "= 0.111.0-rc4" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc5" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc5" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc5" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc5" } +ckb-util = { path = "../util", version = "= 0.111.0-rc5" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc5" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc5" } +ckb-error = { path = "../error", version = "= 0.111.0-rc5" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc5" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc5" } +ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc5" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc5" } +ckb-indexer = { path = "../util/indexer", version = "= 0.111.0-rc5" } itertools = "0.10.5" tokio = "1" [dev-dependencies] reqwest = { version = "0.11.4", features = ["blocking", "json"] } serde = { version = "1.0", features = ["derive"] } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc4" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc4" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc5" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc5" } tempfile.workspace = true pretty_assertions = "1.3.0" -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc4" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc5" } diff --git a/script/Cargo.toml b/script/Cargo.toml index 161ab9487e..a2dfd40c06 100644 --- a/script/Cargo.toml +++ b/script/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-script" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -18,24 +18,24 @@ logging = ["ckb-logger"] flatmemory = [] [dependencies] -ckb-traits = { path = "../traits", version = "= 0.111.0-rc4" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc5" } byteorder = "1.3.1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc4" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc5" } ckb-vm = { version = "=0.24.0", default-features = false } faster-hex = "0.6" -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc4", optional = true } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc5", optional = true } serde = { version = "1.0", features = ["derive"] } -ckb-error = { path = "../error", version = "= 0.111.0-rc4" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc4" } +ckb-error = { path = "../error", version = "= 0.111.0-rc5" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc5" } [dev-dependencies] proptest = "1.0" -ckb-db = { path = "../db", version = "= 0.111.0-rc4" } -ckb-store = { path = "../store", version = "= 0.111.0-rc4" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc4" } +ckb-db = { path = "../db", version = "= 0.111.0-rc5" } +ckb-store = { path = "../store", version = "= 0.111.0-rc5" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc5" } tiny-keccak = { version = "2.0", features = ["sha3"] } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc4" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc4" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc5" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc5" } tempfile.workspace = true rand = "0.8.4" diff --git a/script/fuzz/Cargo.toml b/script/fuzz/Cargo.toml index f50770061b..1c0a25fa89 100644 --- a/script/fuzz/Cargo.toml +++ b/script/fuzz/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-script-fuzz" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -15,10 +15,10 @@ cargo-fuzz = true [dependencies] arbitrary = { version = "1", features = ["derive"] } libfuzzer-sys = { version="0.4.0", features=["arbitrary-derive"] } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc4" } -ckb-types = { path = "../../util/types", version = "= 0.111.0-rc4" } -ckb-script = { path = "../../script", version = "= 0.111.0-rc4" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc4" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc5" } +ckb-types = { path = "../../util/types", version = "= 0.111.0-rc5" } +ckb-script = { path = "../../script", version = "= 0.111.0-rc5" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc5" } # Prevent this from interfering with workspaces [workspace] diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 62c4a73507..4e91eb61a6 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-shared" -version = "0.111.0-rc4" +version = "0.111.0-rc5" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,27 +9,27 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc4" } -ckb-store = { path = "../store", version = "= 0.111.0-rc4" } -ckb-db = { path = "../db", version = "= 0.111.0-rc4" } -ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc4" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc5" } +ckb-store = { path = "../store", version = "= 0.111.0-rc5" } +ckb-db = { path = "../db", version = "= 0.111.0-rc5" } +ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc5" } arc-swap = "1.3" -ckb-error = { path = "../error", version = "= 0.111.0-rc4" } -ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc4" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc4" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc4" } -ckb-notify = { path = "../notify", version = "= 0.111.0-rc4" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc4" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc4" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc4" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc4" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc4" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc4" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc4" } +ckb-error = { path = "../error", version = "= 0.111.0-rc5" } +ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc5" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc5" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc5" } +ckb-notify = { path = "../notify", version = "= 0.111.0-rc5" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc5" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc5" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc5" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc5" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc5" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc5" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc5" } [dev-dependencies] -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc4", features = ["enable_faketime"] } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc5", features = ["enable_faketime"] } [features] portable = ["ckb-db/portable", "ckb-store/portable", "ckb-tx-pool/portable"] diff --git a/spec/Cargo.toml b/spec/Cargo.toml index 771952bbbb..3b5844739a 100644 --- a/spec/Cargo.toml +++ b/spec/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain-spec" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,15 +11,15 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] serde = { version = "1.0", features = ["derive"] } toml = "0.5" -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc4" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc4" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc4" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc4" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc4" } -ckb-rational = { path = "../util/rational", version = "= 0.111.0-rc4" } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc4"} -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc4"} -ckb-error = { path = "../error", version = "= 0.111.0-rc4" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc4" } -ckb-util = { path = "../util", version = "= 0.111.0-rc4" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc5" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc5" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc5" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc5" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc5" } +ckb-rational = { path = "../util/rational", version = "= 0.111.0-rc5" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc5"} +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc5"} +ckb-error = { path = "../error", version = "= 0.111.0-rc5" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc5" } +ckb-util = { path = "../util", version = "= 0.111.0-rc5" } diff --git a/store/Cargo.toml b/store/Cargo.toml index 49d26fb3e0..5f907063f9 100644 --- a/store/Cargo.toml +++ b/store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-store" -version = "0.111.0-rc4" +version = "0.111.0-rc5" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,16 +9,16 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } -ckb-db = { path = "../db", version = "= 0.111.0-rc4" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc4" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } +ckb-db = { path = "../db", version = "= 0.111.0-rc5" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc5" } lru = "0.7.1" -ckb-traits = { path = "../traits", version = "= 0.111.0-rc4" } -ckb-util = { path = "../util", version = "= 0.111.0-rc4" } -ckb-error = { path = "../error", version = "= 0.111.0-rc4" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc4" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc4" } -ckb-freezer = { path = "../freezer", version = "= 0.111.0-rc4" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc5" } +ckb-util = { path = "../util", version = "= 0.111.0-rc5" } +ckb-error = { path = "../error", version = "= 0.111.0-rc5" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc5" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc5" } +ckb-freezer = { path = "../freezer", version = "= 0.111.0-rc5" } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] diff --git a/sync/Cargo.toml b/sync/Cargo.toml index f392fdf638..3c35b38c97 100644 --- a/sync/Cargo.toml +++ b/sync/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-sync" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,48 +9,48 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-chain = { path = "../chain", version = "= 0.111.0-rc4" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc4" } -ckb-store = { path = "../store", version = "= 0.111.0-rc4" } -ckb-app-config = {path = "../util/app-config", version = "= 0.111.0-rc4"} -ckb-types = {path = "../util/types", version = "= 0.111.0-rc4"} -ckb-network = { path = "../network", version = "= 0.111.0-rc4" } -ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc4"} -ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc4"} -ckb-util = { path = "../util", version = "= 0.111.0-rc4" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc4" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc4" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc4" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc4" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc4" } -ckb-error = {path = "../error", version = "= 0.111.0-rc4"} -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc4" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc5" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc5" } +ckb-store = { path = "../store", version = "= 0.111.0-rc5" } +ckb-app-config = {path = "../util/app-config", version = "= 0.111.0-rc5"} +ckb-types = {path = "../util/types", version = "= 0.111.0-rc5"} +ckb-network = { path = "../network", version = "= 0.111.0-rc5" } +ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc5"} +ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc5"} +ckb-util = { path = "../util", version = "= 0.111.0-rc5" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc5" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc5" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc5" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc5" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc5" } +ckb-error = {path = "../error", version = "= 0.111.0-rc5"} +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc5" } sentry = { version = "0.26.0", optional = true } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc4" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc4" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc4" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc5" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc5" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc5" } tokio = { version = "1", features = ["sync"] } lru = "0.7.1" futures = "0.3" governor = "0.3.1" tempfile.workspace = true -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc4" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc5" } bitflags = "1.0" dashmap = "4.0" keyed_priority_queue = "0.3" sled = "0.34.7" [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc4" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc5" } rand = "0.7" -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc4" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc4" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc4" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc4", features = ["mock"] } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc4" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc5" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc5" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc5" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc5", features = ["mock"] } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc5" } faux = "^0.1" once_cell = "1.8.0" -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc4" , features = ["enable_faketime"]} +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc5" , features = ["enable_faketime"]} [features] default = [] diff --git a/test/Cargo.toml b/test/Cargo.toml index 3945971cd5..238bfbf24e 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-test" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,28 +11,28 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] clap = { version = "=3.2.21" } toml = "0.5.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc4" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc4" } -ckb-network = { path = "../network", version = "= 0.111.0-rc4" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc4" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc4" } -ckb-util = { path = "../util", version = "= 0.111.0-rc4" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc4" } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc4" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc4" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc4" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc4" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc4" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc4" } -ckb-logger-config = { path = "../util/logger-config", version = "= 0.111.0-rc4" } -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc4" } -ckb-error = { path = "../error", version = "= 0.111.0-rc4" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc4" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc5" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc5" } +ckb-network = { path = "../network", version = "= 0.111.0-rc5" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc5" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc5" } +ckb-util = { path = "../util", version = "= 0.111.0-rc5" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc5" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc5" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc5" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc5" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc5" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc5" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc5" } +ckb-logger-config = { path = "../util/logger-config", version = "= 0.111.0-rc5" } +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc5" } +ckb-error = { path = "../error", version = "= 0.111.0-rc5" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc5" } tempfile = "3" reqwest = { version = "0.11.4", features = ["blocking", "json"] } rand = "0.7" -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc4" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc5" } serde_json = "1.0" lazy_static = "1.4.0" byteorder = "1.3.1" diff --git a/traits/Cargo.toml b/traits/Cargo.toml index 2618fc1561..8180b564c1 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-traits" -version = "0.111.0-rc4" +version = "0.111.0-rc5" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc4" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } diff --git a/tx-pool/Cargo.toml b/tx-pool/Cargo.toml index e2bbba61f8..774abd3f53 100644 --- a/tx-pool/Cargo.toml +++ b/tx-pool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-tx-pool" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,27 +11,27 @@ 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.111.0-rc4" } -ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc4"} -ckb-verification = { path = "../verification", version = "= 0.111.0-rc4" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc4"} +ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } +ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc5"} +ckb-verification = { path = "../verification", version = "= 0.111.0-rc5" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc5"} lru = "0.7.1" -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc4" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc4" } -ckb-store = { path = "../store", version = "= 0.111.0-rc4" } -ckb-util = { path = "../util", version = "= 0.111.0-rc4" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc4" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc4" } -ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc4" } -ckb-error = { path = "../error", version = "= 0.111.0-rc4" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc5" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc5" } +ckb-store = { path = "../store", version = "= 0.111.0-rc5" } +ckb-util = { path = "../util", version = "= 0.111.0-rc5" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc5" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc5" } +ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc5" } +ckb-error = { path = "../error", version = "= 0.111.0-rc5" } tokio = { version = "1", features = ["sync", "process"] } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc4" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc4" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc4" } -ckb-network = { path = "../network", version = "= 0.111.0-rc4" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc4" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc4" } -ckb-db = { path = "../db", version = "= 0.111.0-rc4" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc5" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc5" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc5" } +ckb-network = { path = "../network", version = "= 0.111.0-rc5" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc5" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc5" } +ckb-db = { path = "../db", version = "= 0.111.0-rc5" } sentry = { version = "0.26.0", optional = true } serde_json = "1.0" rand = "0.8.4" @@ -42,8 +42,8 @@ rustc-hash = "1.1" [dev-dependencies] tempfile.workspace = true -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc4" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc4", features = ["enable_faketime"]} +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc5" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc5", features = ["enable_faketime"]} [features] default = [] diff --git a/util/Cargo.toml b/util/Cargo.toml index 0c880c411c..a11caa415e 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-util" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -15,7 +15,7 @@ regex = "1.1.6" once_cell = "1.8.0" [dev-dependencies] -ckb-fixed-hash = { path = "fixed-hash", version = "= 0.111.0-rc4" } +ckb-fixed-hash = { path = "fixed-hash", version = "= 0.111.0-rc5" } [features] deadlock_detection = ["parking_lot/deadlock_detection"] diff --git a/util/app-config/Cargo.toml b/util/app-config/Cargo.toml index e75547ea66..31ca7b06f9 100644 --- a/util/app-config/Cargo.toml +++ b/util/app-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-app-config" -version = "0.111.0-rc4" +version = "0.111.0-rc5" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -15,20 +15,20 @@ serde_plain = "0.3.0" serde_json = "1.0" toml = "0.5" path-clean = "0.1.0" -ckb-logger = { path = "../../util/logger", version = "= 0.111.0-rc4" } -ckb-logger-config = { path = "../../util/logger-config", version = "= 0.111.0-rc4" } -ckb-metrics-config = { path = "../../util/metrics-config", version = "= 0.111.0-rc4" } -ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc4"} -ckb-jsonrpc-types = {path = "../jsonrpc-types", version = "= 0.111.0-rc4"} -ckb-pow = { path = "../../pow", version = "= 0.111.0-rc4" } -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc4"} -ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc4" } -ckb-types = { path = "../types", version = "= 0.111.0-rc4" } +ckb-logger = { path = "../../util/logger", version = "= 0.111.0-rc5" } +ckb-logger-config = { path = "../../util/logger-config", version = "= 0.111.0-rc5" } +ckb-metrics-config = { path = "../../util/metrics-config", version = "= 0.111.0-rc5" } +ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc5"} +ckb-jsonrpc-types = {path = "../jsonrpc-types", version = "= 0.111.0-rc5"} +ckb-pow = { path = "../../pow", version = "= 0.111.0-rc5" } +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc5"} +ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc5" } +ckb-types = { path = "../types", version = "= 0.111.0-rc5" } secio = { version="0.5.7", package="tentacle-secio" } multiaddr = { version="0.3.0", package="tentacle-multiaddr" } rand = "0.7" sentry = { version = "0.26.0", optional = true } -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc4" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc5" } url = { version = "2.2.2", features = ["serde"] } ubyte = { version = "0.10", features = ["serde"] } @@ -37,4 +37,4 @@ with_sentry = ["sentry"] [dev-dependencies] tempfile.workspace = true -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc4" ,features = ["enable_faketime"]} +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc5" ,features = ["enable_faketime"]} diff --git a/util/build-info/Cargo.toml b/util/build-info/Cargo.toml index c212a36280..6966dd377c 100644 --- a/util/build-info/Cargo.toml +++ b/util/build-info/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-build-info" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/chain-iter/Cargo.toml b/util/chain-iter/Cargo.toml index 01f6c279d7..db29f52ea1 100644 --- a/util/chain-iter/Cargo.toml +++ b/util/chain-iter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain-iter" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc4" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc4" } +ckb-types = { path = "../types", version = "= 0.111.0-rc5" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc5" } diff --git a/util/channel/Cargo.toml b/util/channel/Cargo.toml index 5b0ba8c482..e490102213 100644 --- a/util/channel/Cargo.toml +++ b/util/channel/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-channel" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/constant/Cargo.toml b/util/constant/Cargo.toml index 1aff964436..5823231aa1 100644 --- a/util/constant/Cargo.toml +++ b/util/constant/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-constant" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/crypto/Cargo.toml b/util/crypto/Cargo.toml index 3d365c3da3..2a5519c751 100644 --- a/util/crypto/Cargo.toml +++ b/util/crypto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-crypto" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc4" } +ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc5" } lazy_static = "1.3" secp256k1 = { version = "0.24", features = ["recovery"], optional = true } thiserror = "1.0.22" diff --git a/util/dao/Cargo.toml b/util/dao/Cargo.toml index 7919cb0f47..863ede0c05 100644 --- a/util/dao/Cargo.toml +++ b/util/dao/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-dao" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,13 +10,13 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../types", version = "= 0.111.0-rc4" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc4" } -ckb-dao-utils = { path = "./utils", version = "= 0.111.0-rc4" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc4" } +ckb-types = { path = "../types", version = "= 0.111.0-rc5" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc5" } +ckb-dao-utils = { path = "./utils", version = "= 0.111.0-rc5" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc5" } [dev-dependencies] -ckb-db = { path = "../../db", version = "= 0.111.0-rc4" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc4" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc4" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc5" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc5" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc5" } tempfile.workspace = true diff --git a/util/dao/utils/Cargo.toml b/util/dao/utils/Cargo.toml index 8a7bb6c531..ade1f79d4a 100644 --- a/util/dao/utils/Cargo.toml +++ b/util/dao/utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-dao-utils" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,5 +10,5 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../../types", version = "= 0.111.0-rc4" } -ckb-error = { path = "../../../error", version = "= 0.111.0-rc4" } +ckb-types = { path = "../../types", version = "= 0.111.0-rc5" } +ckb-error = { path = "../../../error", version = "= 0.111.0-rc5" } diff --git a/util/fixed-hash/Cargo.toml b/util/fixed-hash/Cargo.toml index 07527da018..7709b9d26f 100644 --- a/util/fixed-hash/Cargo.toml +++ b/util/fixed-hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-fixed-hash" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -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.111.0-rc4" } -ckb-fixed-hash-macros = { path = "macros", version = "= 0.111.0-rc4" } +ckb-fixed-hash-core = { path = "core", version = "= 0.111.0-rc5" } +ckb-fixed-hash-macros = { path = "macros", version = "= 0.111.0-rc5" } diff --git a/util/fixed-hash/core/Cargo.toml b/util/fixed-hash/core/Cargo.toml index 78bd34c1ae..532ce9ca6f 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.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/fixed-hash/macros/Cargo.toml b/util/fixed-hash/macros/Cargo.toml index b669b285d8..950295b6b1 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.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -12,7 +12,7 @@ repository = "https://github.com/nervosnetwork/ckb" proc-macro = true [dependencies] -ckb-fixed-hash-core = { path = "../core", version = "= 0.111.0-rc4" } +ckb-fixed-hash-core = { path = "../core", version = "= 0.111.0-rc5" } quote = "1.0" syn = "1.0" proc-macro2 = "1.0" diff --git a/util/hash/Cargo.toml b/util/hash/Cargo.toml index 3763d20a95..df94aac115 100644 --- a/util/hash/Cargo.toml +++ b/util/hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-hash" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/indexer/Cargo.toml b/util/indexer/Cargo.toml index ab02166107..0585130866 100644 --- a/util/indexer/Cargo.toml +++ b/util/indexer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-indexer" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,15 +13,15 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] thiserror = "1.0" rocksdb = { package = "ckb-rocksdb", version ="=0.20.0", features = ["snappy"], default-features = false } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc4" } -ckb-types = { path = "../types", version = "= 0.111.0-rc4" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc4" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc4" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc4" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc4" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc4" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc4" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc4" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc5" } +ckb-types = { path = "../types", version = "= 0.111.0-rc5" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc5" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc5" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc5" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc5" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc5" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc5" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc5" } rhai = { version = "1.10.0", features = ["no_function", "no_float", "no_module", "sync"]} serde_json = "1.0" numext-fixed-uint = "0.1" diff --git a/util/instrument/Cargo.toml b/util/instrument/Cargo.toml index ea835d86e4..0339869c7a 100644 --- a/util/instrument/Cargo.toml +++ b/util/instrument/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-instrument" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc4" } -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc4" } -ckb-chain-iter = { path = "../chain-iter", version = "= 0.111.0-rc4" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc4" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc4" } +ckb-types = { path = "../types", version = "= 0.111.0-rc5" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc5" } +ckb-chain-iter = { path = "../chain-iter", version = "= 0.111.0-rc5" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc5" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc5" } serde_json = "1.0" indicatif = { version = "0.16", optional = true } diff --git a/util/jsonrpc-types/Cargo.toml b/util/jsonrpc-types/Cargo.toml index bd7e7f008a..4420c5b4ef 100644 --- a/util/jsonrpc-types/Cargo.toml +++ b/util/jsonrpc-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-jsonrpc-types" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,7 +9,7 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc4" } +ckb-types = { path = "../types", version = "= 0.111.0-rc5" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" faster-hex = "0.6" diff --git a/util/launcher/Cargo.toml b/util/launcher/Cargo.toml index d3a1c11178..084ce5dc62 100644 --- a/util/launcher/Cargo.toml +++ b/util/launcher/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-launcher" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,44 +11,44 @@ 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.111.0-rc4" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc4" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc4" } -ckb-migration-template = { path = "migration-template", version = "= 0.111.0-rc4" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc4" } -ckb-db-migration = { path = "../../db-migration", version = "= 0.111.0-rc4" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc4" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc4" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc4" } -ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc4" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc4" } -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc4" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc4" } -ckb-network = { path = "../../network", version = "= 0.111.0-rc4"} -ckb-rpc = { path = "../../rpc", version = "= 0.111.0-rc4"} -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc4"} -ckb-network-alert = { path = "../network-alert", version = "= 0.111.0-rc4" } -ckb-sync = { path = "../../sync", version = "= 0.111.0-rc4"} -ckb-verification = { path = "../../verification", version = "= 0.111.0-rc4" } -ckb-verification-traits = { path = "../../verification/traits", version = "= 0.111.0-rc4" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc4" } -ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc4" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc4" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc4" } -ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc4" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc4" } -ckb-snapshot = { path = "../snapshot", version = "= 0.111.0-rc4" } -ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc4" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc4" } -ckb-light-client-protocol-server = { path = "../light-client-protocol-server", version = "= 0.111.0-rc4" } -ckb-block-filter = { path = "../../block-filter", version = "= 0.111.0-rc4" } -ckb-hash = { path = "../hash", version = "= 0.111.0-rc4" } +ckb-types = { path = "../types", version = "= 0.111.0-rc5" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc5" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc5" } +ckb-migration-template = { path = "migration-template", version = "= 0.111.0-rc5" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc5" } +ckb-db-migration = { path = "../../db-migration", version = "= 0.111.0-rc5" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc5" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc5" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc5" } +ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc5" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc5" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc5" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc5" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc5"} +ckb-rpc = { path = "../../rpc", version = "= 0.111.0-rc5"} +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc5"} +ckb-network-alert = { path = "../network-alert", version = "= 0.111.0-rc5" } +ckb-sync = { path = "../../sync", version = "= 0.111.0-rc5"} +ckb-verification = { path = "../../verification", version = "= 0.111.0-rc5" } +ckb-verification-traits = { path = "../../verification/traits", version = "= 0.111.0-rc5" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc5" } +ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc5" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc5" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc5" } +ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc5" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc5" } +ckb-snapshot = { path = "../snapshot", version = "= 0.111.0-rc5" } +ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc5" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc5" } +ckb-light-client-protocol-server = { path = "../light-client-protocol-server", version = "= 0.111.0-rc5" } +ckb-block-filter = { path = "../../block-filter", version = "= 0.111.0-rc5" } +ckb-hash = { path = "../hash", version = "= 0.111.0-rc5" } num_cpus = "1.10" once_cell = "1.8.0" tempfile.workspace = true [dev-dependencies] -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc4", features = ["enable_faketime"] } +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc5", features = ["enable_faketime"] } [features] with_sentry = [ "ckb-sync/with_sentry", "ckb-network/with_sentry", "ckb-app-config/with_sentry" ] diff --git a/util/launcher/migration-template/Cargo.toml b/util/launcher/migration-template/Cargo.toml index fe77e5c1de..753333b391 100644 --- a/util/launcher/migration-template/Cargo.toml +++ b/util/launcher/migration-template/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-migration-template" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/light-client-protocol-server/Cargo.toml b/util/light-client-protocol-server/Cargo.toml index e20a7ec967..94c2709221 100644 --- a/util/light-client-protocol-server/Cargo.toml +++ b/util/light-client-protocol-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-light-client-protocol-server" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,23 +9,23 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-network = { path = "../../network", version = "= 0.111.0-rc4" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc4" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc4" } -ckb-types = { path = "../types", version = "= 0.111.0-rc4" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc4" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc5" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc5" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc5" } +ckb-types = { path = "../types", version = "= 0.111.0-rc5" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc5" } ckb-merkle-mountain-range = "0.5.2" -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc4"} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc5"} [dev-dependencies] -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc4" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc4" } -ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc4" } -ckb-launcher = { path = "../launcher", version = "= 0.111.0-rc4" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc4" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc4" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc4" } -ckb-test-chain-utils = { path = "../test-chain-utils", version = "= 0.111.0-rc4" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc5" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc5" } +ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc5" } +ckb-launcher = { path = "../launcher", version = "= 0.111.0-rc5" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc5" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc5" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc5" } +ckb-test-chain-utils = { path = "../test-chain-utils", version = "= 0.111.0-rc5" } tempfile.workspace = true -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc4", features = ["enable_faketime"]} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc5", features = ["enable_faketime"]} tokio = "1.20" diff --git a/util/logger-config/Cargo.toml b/util/logger-config/Cargo.toml index 3aa83e615c..2cdaf5b2cb 100644 --- a/util/logger-config/Cargo.toml +++ b/util/logger-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger-config" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/logger-service/Cargo.toml b/util/logger-service/Cargo.toml index a4c117fe04..47c946c95d 100644 --- a/util/logger-service/Cargo.toml +++ b/util/logger-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger-service" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -9,9 +9,9 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-util = { path = "..", version = "= 0.111.0-rc4" } -ckb-logger-config = { path = "../logger-config", version = "= 0.111.0-rc4" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc4" } +ckb-util = { path = "..", version = "= 0.111.0-rc5" } +ckb-logger-config = { path = "../logger-config", version = "= 0.111.0-rc5" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc5" } yansi = "0.5" log = "0.4" env_logger = "0.6" @@ -22,7 +22,7 @@ sentry = { version = "0.26.0", optional = true, features = ["log"] } time = { version = "0.3.11", features = ["formatting"] } [dev-dependencies] -ckb-logger = { path = "../logger", version = "= 0.111.0-rc4" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc5" } tempfile.workspace = true [features] diff --git a/util/logger/Cargo.toml b/util/logger/Cargo.toml index 9f19d85938..34050dc641 100644 --- a/util/logger/Cargo.toml +++ b/util/logger/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/memory-tracker/Cargo.toml b/util/memory-tracker/Cargo.toml index 61397c49e8..b331ad3ec3 100644 --- a/util/memory-tracker/Cargo.toml +++ b/util/memory-tracker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-memory-tracker" -version = "0.111.0-rc4" +version = "0.111.0-rc5" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc4" } -ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc4" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc4" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc5" } +ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc5" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc5" } [target.'cfg(all(not(target_env = "msvc"), not(target_os="macos")))'.dependencies] jemalloc-ctl = { package = "tikv-jemalloc-ctl", version = "0.5.0" } diff --git a/util/metrics-config/Cargo.toml b/util/metrics-config/Cargo.toml index 20ca7dea04..4a2958e2e5 100644 --- a/util/metrics-config/Cargo.toml +++ b/util/metrics-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics-config" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/metrics-service/Cargo.toml b/util/metrics-service/Cargo.toml index 9bd6b34ad9..c9ffe73442 100644 --- a/util/metrics-service/Cargo.toml +++ b/util/metrics-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics-service" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -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.111.0-rc4" } -ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc4" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc4" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc4" } -ckb-util = { path = "..", version = "= 0.111.0-rc4" } +ckb-metrics-config = { path = "../metrics-config", version = "= 0.111.0-rc5" } +ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc5" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc5" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc5" } +ckb-util = { path = "..", version = "= 0.111.0-rc5" } prometheus = "0.13.3" hyper = { version = "0.14", features = ["http1", "tcp", "server"] } diff --git a/util/metrics/Cargo.toml b/util/metrics/Cargo.toml index fdf51a1bff..c6f5d5c4a4 100644 --- a/util/metrics/Cargo.toml +++ b/util/metrics/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/multisig/Cargo.toml b/util/multisig/Cargo.toml index 0a5c95740b..a78ea63ace 100644 --- a/util/multisig/Cargo.toml +++ b/util/multisig/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-multisig" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,9 +9,9 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-error = { path = "../../error", version = "= 0.111.0-rc4" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc4" } -ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc4" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc5" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc5" } +ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc5" } [dev-dependencies] rand = "0.7" diff --git a/util/network-alert/Cargo.toml b/util/network-alert/Cargo.toml index 41dac2e87c..788e697316 100644 --- a/util/network-alert/Cargo.toml +++ b/util/network-alert/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-network-alert" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,24 +9,24 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-multisig = { path = "../multisig", version = "= 0.111.0-rc4" } -ckb-types = { path = "../types", version = "= 0.111.0-rc4" } -ckb-util = { path = "..", version = "= 0.111.0-rc4" } -ckb-network = { path = "../../network", version = "= 0.111.0-rc4" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc4"} -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc4" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc4"} -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc4" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc4" } -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc4" } +ckb-multisig = { path = "../multisig", version = "= 0.111.0-rc5" } +ckb-types = { path = "../types", version = "= 0.111.0-rc5" } +ckb-util = { path = "..", version = "= 0.111.0-rc5" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc5" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc5"} +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc5" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc5"} +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc5" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc5" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc5" } lru = "0.7.1" semver = "1.0" [dev-dependencies] -ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc4" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc4" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc4" } +ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc5" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc5" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc5" } once_cell = "1.8.0" -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc4", features = ["enable_faketime"]} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc5", features = ["enable_faketime"]} faster-hex = "0.6" serde_json = "1.0" diff --git a/util/occupied-capacity/Cargo.toml b/util/occupied-capacity/Cargo.toml index a0282a5273..c639deda17 100644 --- a/util/occupied-capacity/Cargo.toml +++ b/util/occupied-capacity/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-occupied-capacity" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc4" } -ckb-occupied-capacity-core = { path = "core", version = "= 0.111.0-rc4" } +ckb-occupied-capacity-macros = { path = "macros", version = "= 0.111.0-rc5" } +ckb-occupied-capacity-core = { path = "core", version = "= 0.111.0-rc5" } diff --git a/util/occupied-capacity/core/Cargo.toml b/util/occupied-capacity/core/Cargo.toml index aa86b12d37..f7d1f5e966 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.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/occupied-capacity/macros/Cargo.toml b/util/occupied-capacity/macros/Cargo.toml index a394ae0333..b4731ad320 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.111.0-rc4" +version = "0.111.0-rc5" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -14,4 +14,4 @@ proc-macro = true [dependencies] quote = "1.0" syn = "1.0" -ckb-occupied-capacity-core = { path = "../core", version = "= 0.111.0-rc4" } +ckb-occupied-capacity-core = { path = "../core", version = "= 0.111.0-rc5" } diff --git a/util/proposal-table/Cargo.toml b/util/proposal-table/Cargo.toml index 75493b27eb..bbc28c9041 100644 --- a/util/proposal-table/Cargo.toml +++ b/util/proposal-table/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-proposal-table" -version = "0.111.0-rc4" +version = "0.111.0-rc5" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc4" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc4" } -ckb-types = { path = "../types", version = "= 0.111.0-rc4" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc5" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc5" } +ckb-types = { path = "../types", version = "= 0.111.0-rc5" } diff --git a/util/rational/Cargo.toml b/util/rational/Cargo.toml index 8a6bc18e78..f653db724b 100644 --- a/util/rational/Cargo.toml +++ b/util/rational/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-rational" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/reward-calculator/Cargo.toml b/util/reward-calculator/Cargo.toml index b34f51b3ee..4b6a514c76 100644 --- a/util/reward-calculator/Cargo.toml +++ b/util/reward-calculator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-reward-calculator" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,15 +9,15 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc4" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc4" } -ckb-dao = { path = "../dao", version = "= 0.111.0-rc4" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc4" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc4" } -ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc4"} +ckb-types = { path = "../types", version = "= 0.111.0-rc5" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc5" } +ckb-dao = { path = "../dao", version = "= 0.111.0-rc5" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc5" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc5" } +ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc5"} [dev-dependencies] -ckb-db = { path = "../../db", version = "= 0.111.0-rc4" } -ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc4" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc4" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc5" } +ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc5" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc5" } tempfile.workspace = true diff --git a/util/runtime/Cargo.toml b/util/runtime/Cargo.toml index 506b522cb9..7b628d2fa6 100644 --- a/util/runtime/Cargo.toml +++ b/util/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-async-runtime" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,6 +10,6 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] tokio = { version = "1", features = ["full"] } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc4" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc4" } -ckb-spawn = { path = "../spawn", version = "= 0.111.0-rc4" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc5" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc5" } +ckb-spawn = { path = "../spawn", version = "= 0.111.0-rc5" } diff --git a/util/rust-unstable-port/Cargo.toml b/util/rust-unstable-port/Cargo.toml index ac5806c6c3..40ceac997b 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.111.0-rc4" +version = "0.111.0-rc5" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" diff --git a/util/snapshot/Cargo.toml b/util/snapshot/Cargo.toml index 65cb216797..f8441d7bc1 100644 --- a/util/snapshot/Cargo.toml +++ b/util/snapshot/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-snapshot" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,15 +11,15 @@ 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.111.0-rc4" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc4" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc4" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc4" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc4" } -ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc4" } +ckb-types = { path = "../types", version = "= 0.111.0-rc5" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc5" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc5" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc5" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc5" } +ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc5" } arc-swap = "1.3" -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc4" } -ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc4" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc5" } +ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc5" } ckb-merkle-mountain-range = "0.5.2" [features] diff --git a/util/spawn/Cargo.toml b/util/spawn/Cargo.toml index 3e92471db0..9fb5c665c5 100644 --- a/util/spawn/Cargo.toml +++ b/util/spawn/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-spawn" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/stop-handler/Cargo.toml b/util/stop-handler/Cargo.toml index ab7bbdedd0..1ba0e9d70c 100644 --- a/util/stop-handler/Cargo.toml +++ b/util/stop-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-stop-handler" -version = "0.111.0-rc4" +version = "0.111.0-rc5" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,6 +10,6 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] parking_lot = "0.12" -ckb-logger = { path = "../logger", version = "= 0.111.0-rc4" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc5" } tokio = { version = "1", features = ["sync", "rt-multi-thread"] } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc4" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc5" } diff --git a/util/systemtime/Cargo.toml b/util/systemtime/Cargo.toml index c07c770001..11dd39a9a0 100644 --- a/util/systemtime/Cargo.toml +++ b/util/systemtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-systemtime" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/test-chain-utils/Cargo.toml b/util/test-chain-utils/Cargo.toml index 7b59d01652..f24f825e93 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.111.0-rc4" +version = "0.111.0-rc5" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,18 +9,18 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = {path = "../types", version = "= 0.111.0-rc4"} -ckb-db = { path = "../../db", version = "= 0.111.0-rc4" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc4" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc4" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc4" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc4" } +ckb-types = {path = "../types", version = "= 0.111.0-rc5"} +ckb-db = { path = "../../db", version = "= 0.111.0-rc5" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc5" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc5" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc5" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc5" } lazy_static = "1.3.0" -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc4" } -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc4" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc4" } -ckb-util = { path = "..", version = "= 0.111.0-rc4" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc5" } +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc5" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc5" } +ckb-util = { path = "..", version = "= 0.111.0-rc5" } tempfile.workspace = true [dev-dependencies] -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc4", features = ["enable_faketime"] } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc5", features = ["enable_faketime"] } diff --git a/util/types/Cargo.toml b/util/types/Cargo.toml index 3a41ed4fe1..5c909c5524 100644 --- a/util/types/Cargo.toml +++ b/util/types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-types" -version = "0.111.0-rc4" +version = "0.111.0-rc5" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,17 +10,17 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] molecule = "=0.7.5" -ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc4" } +ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc5" } numext-fixed-uint = { version = "0.1", features = ["support_rand", "support_heapsize", "support_serde"] } bytes = { version="1", features = ["serde"] } merkle-cbt = "0.3" -ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc4" } -ckb-hash = { path = "../hash", version = "= 0.111.0-rc4" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc4" } -ckb-constant = { path = "../constant", version = "= 0.111.0-rc4" } +ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc5" } +ckb-hash = { path = "../hash", version = "= 0.111.0-rc5" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc5" } +ckb-constant = { path = "../constant", version = "= 0.111.0-rc5" } bit-vec = "0.6.3" -ckb-error = { path = "../../error", version = "= 0.111.0-rc4" } -ckb-rational = { path = "../rational", version = "= 0.111.0-rc4" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc5" } +ckb-rational = { path = "../rational", version = "= 0.111.0-rc5" } once_cell = "1.8.0" derive_more = { version = "0.99.0", default-features=false, features = ["display"] } ckb-merkle-mountain-range = "0.5.2" diff --git a/verification/Cargo.toml b/verification/Cargo.toml index f2bb5a19f1..f7a0ed21fe 100644 --- a/verification/Cargo.toml +++ b/verification/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,20 +9,20 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } -ckb-script = { path = "../script", version = "= 0.111.0-rc4" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc4" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc4" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } +ckb-script = { path = "../script", version = "= 0.111.0-rc5" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc5" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc5" } lru = "0.7.1" -ckb-traits = { path = "../traits", version = "= 0.111.0-rc4" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc4" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc4" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc4" } -ckb-error = { path = "../error", version = "= 0.111.0-rc4" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc5" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc5" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc5" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc5" } +ckb-error = { path = "../error", version = "= 0.111.0-rc5" } derive_more = { version = "0.99.0", default-features=false, features = ["display"] } -ckb-verification-traits = { path = "./traits", version = "= 0.111.0-rc4" } +ckb-verification-traits = { path = "./traits", version = "= 0.111.0-rc5" } [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc4" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc4" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc4", features=["enable_faketime"]} +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc5" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc5" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc5", features=["enable_faketime"]} diff --git a/verification/contextual/Cargo.toml b/verification/contextual/Cargo.toml index dabecab216..136f04b694 100644 --- a/verification/contextual/Cargo.toml +++ b/verification/contextual/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification-contextual" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,27 +9,27 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../../util/types", version = "= 0.111.0-rc4" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc4" } -ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc4" } +ckb-types = { path = "../../util/types", version = "= 0.111.0-rc5" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc5" } +ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc5" } rayon = "1.0" -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc4" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc4" } -ckb-dao = { path = "../../util/dao", version = "= 0.111.0-rc4" } -ckb-dao-utils = { path = "../../util/dao/utils", version = "= 0.111.0-rc4" } -ckb-logger = {path = "../../util/logger", version = "= 0.111.0-rc4"} -ckb-reward-calculator= { path = "../../util/reward-calculator", version = "= 0.111.0-rc4" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc4" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc5" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc5" } +ckb-dao = { path = "../../util/dao", version = "= 0.111.0-rc5" } +ckb-dao-utils = { path = "../../util/dao/utils", version = "= 0.111.0-rc5" } +ckb-logger = {path = "../../util/logger", version = "= 0.111.0-rc5"} +ckb-reward-calculator= { path = "../../util/reward-calculator", version = "= 0.111.0-rc5" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc5" } tokio = { version = "1", features = ["sync", "rt-multi-thread"] } -ckb-async-runtime = { path = "../../util/runtime", version = "= 0.111.0-rc4" } -ckb-verification-traits = { path = "../traits", version = "= 0.111.0-rc4" } -ckb-verification = { path = "..", version = "= 0.111.0-rc4" } +ckb-async-runtime = { path = "../../util/runtime", version = "= 0.111.0-rc5" } +ckb-verification-traits = { path = "../traits", version = "= 0.111.0-rc5" } +ckb-verification = { path = "..", version = "= 0.111.0-rc5" } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc4" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc4" } -ckb-launcher = { path = "../../util/launcher", version = "= 0.111.0-rc4" } -ckb-test-chain-utils = { path = "../../util/test-chain-utils", version = "= 0.111.0-rc4" } -ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc4", features = ["enable_faketime"]} +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc5" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc5" } +ckb-launcher = { path = "../../util/launcher", version = "= 0.111.0-rc5" } +ckb-test-chain-utils = { path = "../../util/test-chain-utils", version = "= 0.111.0-rc5" } +ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc5", features = ["enable_faketime"]} rand = "0.7" diff --git a/verification/traits/Cargo.toml b/verification/traits/Cargo.toml index 8122129a73..7b1dd1cc63 100644 --- a/verification/traits/Cargo.toml +++ b/verification/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification-traits" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,4 +10,4 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] bitflags = "1.0" -ckb-error = { path = "../../error", version = "= 0.111.0-rc4" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc5" } diff --git a/wasm-build-test/Cargo.toml b/wasm-build-test/Cargo.toml index 5e2c5294a1..d815e738d1 100644 --- a/wasm-build-test/Cargo.toml +++ b/wasm-build-test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-wasm-test" -version = "0.111.0-rc4" +version = "0.111.0-rc5" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,8 +9,8 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc4" } -ckb-script = { path = "../script", version = "= 0.111.0-rc4", default-features = false, features = [] } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } +ckb-script = { path = "../script", version = "= 0.111.0-rc5", default-features = false, features = [] } # Prevent this from interfering with workspaces [workspace] From 01af58e8282b74aa36ae8657bb996da1bfc3030c Mon Sep 17 00:00:00 2001 From: zhangsoledad <787953403@qq.com> Date: Fri, 23 Jun 2023 13:26:44 +0800 Subject: [PATCH 016/125] chore: delay 2023 testnet launch --- util/constant/src/hardfork/testnet.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/constant/src/hardfork/testnet.rs b/util/constant/src/hardfork/testnet.rs index 6de8bc7bbe..362df34df3 100644 --- a/util/constant/src/hardfork/testnet.rs +++ b/util/constant/src/hardfork/testnet.rs @@ -7,5 +7,5 @@ pub const RFC0028_START_EPOCH: u64 = 3113; // pub const CKB2021_START_EPOCH: u64 = 3113; pub const CKB2021_START_EPOCH: u64 = 0; -/// hardcode ckb2023 epoch, about 2023/06/30 6:50 UTC -pub const CKB2023_START_EPOCH: u64 = 6795; +/// hardcode ckb2023 epoch +pub const CKB2023_START_EPOCH: u64 = u64::MAX; From 755cfd1ece56fd8ca4ab2b9885bcc6e432690ac1 Mon Sep 17 00:00:00 2001 From: ian Date: Sun, 25 Jun 2023 15:19:59 +0200 Subject: [PATCH 017/125] chore: bump to v0.111.0-rc6 --- Cargo.lock | 136 +++++++++---------- Cargo.toml | 8 +- README.md | 2 +- benches/Cargo.toml | 36 ++--- block-filter/Cargo.toml | 14 +- chain/Cargo.toml | 52 +++---- ckb-bin/Cargo.toml | 46 +++---- db-migration/Cargo.toml | 12 +- db-schema/Cargo.toml | 2 +- db/Cargo.toml | 10 +- error/Cargo.toml | 4 +- freezer/Cargo.toml | 12 +- miner/Cargo.toml | 20 +-- network/Cargo.toml | 22 +-- notify/Cargo.toml | 12 +- pow/Cargo.toml | 6 +- resource/Cargo.toml | 6 +- rpc/Cargo.toml | 60 ++++---- script/Cargo.toml | 24 ++-- script/fuzz/Cargo.toml | 10 +- shared/Cargo.toml | 38 +++--- spec/Cargo.toml | 26 ++-- store/Cargo.toml | 20 +-- sync/Cargo.toml | 56 ++++---- test/Cargo.toml | 40 +++--- traits/Cargo.toml | 4 +- tx-pool/Cargo.toml | 44 +++--- util/Cargo.toml | 4 +- util/app-config/Cargo.toml | 24 ++-- util/build-info/Cargo.toml | 2 +- util/chain-iter/Cargo.toml | 6 +- util/channel/Cargo.toml | 2 +- util/constant/Cargo.toml | 2 +- util/crypto/Cargo.toml | 4 +- util/dao/Cargo.toml | 16 +-- util/dao/utils/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/indexer/Cargo.toml | 20 +-- util/instrument/Cargo.toml | 12 +- util/jsonrpc-types/Cargo.toml | 4 +- util/launcher/Cargo.toml | 68 +++++----- util/launcher/migration-template/Cargo.toml | 2 +- util/light-client-protocol-server/Cargo.toml | 32 ++--- util/logger-config/Cargo.toml | 2 +- util/logger-service/Cargo.toml | 10 +- util/logger/Cargo.toml | 2 +- util/memory-tracker/Cargo.toml | 8 +- util/metrics-config/Cargo.toml | 2 +- util/metrics-service/Cargo.toml | 12 +- util/metrics/Cargo.toml | 2 +- util/multisig/Cargo.toml | 8 +- util/network-alert/Cargo.toml | 30 ++-- 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 | 20 +-- util/runtime/Cargo.toml | 8 +- util/rust-unstable-port/Cargo.toml | 2 +- util/snapshot/Cargo.toml | 18 +-- util/spawn/Cargo.toml | 2 +- util/stop-handler/Cargo.toml | 6 +- util/systemtime/Cargo.toml | 2 +- util/test-chain-utils/Cargo.toml | 24 ++-- util/types/Cargo.toml | 16 +-- verification/Cargo.toml | 28 ++-- verification/contextual/Cargo.toml | 38 +++--- verification/traits/Cargo.toml | 4 +- wasm-build-test/Cargo.toml | 6 +- 73 files changed, 606 insertions(+), 606 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d15358a516..aeb39fe3e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -395,7 +395,7 @@ dependencies = [ [[package]] name = "ckb" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-bin", "ckb-build-info", @@ -404,7 +404,7 @@ dependencies = [ [[package]] name = "ckb-app-config" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-build-info", "ckb-chain-spec", @@ -433,7 +433,7 @@ dependencies = [ [[package]] name = "ckb-async-runtime" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-logger", "ckb-spawn", @@ -443,7 +443,7 @@ dependencies = [ [[package]] name = "ckb-benches" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-app-config", "ckb-chain", @@ -471,7 +471,7 @@ dependencies = [ [[package]] name = "ckb-bin" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "base64", "ckb-app-config", @@ -511,7 +511,7 @@ dependencies = [ [[package]] name = "ckb-block-filter" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-async-runtime", "ckb-logger", @@ -523,11 +523,11 @@ dependencies = [ [[package]] name = "ckb-build-info" -version = "0.111.0-rc5" +version = "0.111.0-rc6" [[package]] name = "ckb-chain" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -561,7 +561,7 @@ dependencies = [ [[package]] name = "ckb-chain-iter" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-store", "ckb-types", @@ -569,7 +569,7 @@ dependencies = [ [[package]] name = "ckb-chain-spec" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-constant", "ckb-crypto", @@ -589,18 +589,18 @@ dependencies = [ [[package]] name = "ckb-channel" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "crossbeam-channel", ] [[package]] name = "ckb-constant" -version = "0.111.0-rc5" +version = "0.111.0-rc6" [[package]] name = "ckb-crypto" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-fixed-hash", "faster-hex", @@ -612,7 +612,7 @@ dependencies = [ [[package]] name = "ckb-dao" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "byteorder", "ckb-chain-spec", @@ -627,7 +627,7 @@ dependencies = [ [[package]] name = "ckb-dao-utils" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "byteorder", "ckb-error", @@ -636,7 +636,7 @@ dependencies = [ [[package]] name = "ckb-db" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-app-config", "ckb-db-schema", @@ -649,7 +649,7 @@ dependencies = [ [[package]] name = "ckb-db-migration" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-app-config", "ckb-db", @@ -663,11 +663,11 @@ dependencies = [ [[package]] name = "ckb-db-schema" -version = "0.111.0-rc5" +version = "0.111.0-rc6" [[package]] name = "ckb-error" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "anyhow", "ckb-occupied-capacity", @@ -677,7 +677,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-fixed-hash-core", "ckb-fixed-hash-macros", @@ -685,7 +685,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-core" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "faster-hex", "serde", @@ -695,7 +695,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-macros" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-fixed-hash-core", "proc-macro2", @@ -705,7 +705,7 @@ dependencies = [ [[package]] name = "ckb-freezer" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-error", "ckb-logger", @@ -721,7 +721,7 @@ dependencies = [ [[package]] name = "ckb-hash" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "blake2b-ref", "blake2b-rs", @@ -729,7 +729,7 @@ dependencies = [ [[package]] name = "ckb-indexer" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -751,7 +751,7 @@ dependencies = [ [[package]] name = "ckb-instrument" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-chain", "ckb-chain-iter", @@ -764,7 +764,7 @@ dependencies = [ [[package]] name = "ckb-jsonrpc-types" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-types", "faster-hex", @@ -777,7 +777,7 @@ dependencies = [ [[package]] name = "ckb-launcher" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -833,7 +833,7 @@ dependencies = [ [[package]] name = "ckb-light-client-protocol-server" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-app-config", "ckb-chain", @@ -856,14 +856,14 @@ dependencies = [ [[package]] name = "ckb-logger" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "log", ] [[package]] name = "ckb-logger-config" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "serde", "toml", @@ -871,7 +871,7 @@ dependencies = [ [[package]] name = "ckb-logger-service" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "backtrace", "ckb-channel", @@ -890,7 +890,7 @@ dependencies = [ [[package]] name = "ckb-memory-tracker" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-db", "ckb-logger", @@ -912,7 +912,7 @@ dependencies = [ [[package]] name = "ckb-metrics" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "once_cell", "prometheus", @@ -921,14 +921,14 @@ dependencies = [ [[package]] name = "ckb-metrics-config" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "serde", ] [[package]] name = "ckb-metrics-service" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-async-runtime", "ckb-logger", @@ -941,7 +941,7 @@ dependencies = [ [[package]] name = "ckb-migration-template" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "quote", "syn", @@ -949,7 +949,7 @@ dependencies = [ [[package]] name = "ckb-miner" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "base64", "ckb-app-config", @@ -978,7 +978,7 @@ dependencies = [ [[package]] name = "ckb-multisig" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-crypto", "ckb-error", @@ -988,7 +988,7 @@ dependencies = [ [[package]] name = "ckb-network" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "bitflags", "bloom-filters", @@ -1026,7 +1026,7 @@ dependencies = [ [[package]] name = "ckb-network-alert" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1050,7 +1050,7 @@ dependencies = [ [[package]] name = "ckb-notify" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1062,7 +1062,7 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-occupied-capacity-core", "ckb-occupied-capacity-macros", @@ -1070,14 +1070,14 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity-core" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "serde", ] [[package]] name = "ckb-occupied-capacity-macros" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-occupied-capacity-core", "quote", @@ -1086,7 +1086,7 @@ dependencies = [ [[package]] name = "ckb-pow" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "byteorder", "ckb-hash", @@ -1098,7 +1098,7 @@ dependencies = [ [[package]] name = "ckb-proposal-table" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-chain-spec", "ckb-logger", @@ -1107,7 +1107,7 @@ dependencies = [ [[package]] name = "ckb-rational" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "numext-fixed-uint", "proptest", @@ -1116,7 +1116,7 @@ dependencies = [ [[package]] name = "ckb-resource" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-system-scripts", "ckb-types", @@ -1130,7 +1130,7 @@ dependencies = [ [[package]] name = "ckb-reward-calculator" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-chain-spec", "ckb-dao", @@ -1157,7 +1157,7 @@ dependencies = [ [[package]] name = "ckb-rpc" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-app-config", "ckb-chain", @@ -1206,14 +1206,14 @@ dependencies = [ [[package]] name = "ckb-rust-unstable-port" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "is_sorted", ] [[package]] name = "ckb-script" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "byteorder", "ckb-chain-spec", @@ -1238,7 +1238,7 @@ dependencies = [ [[package]] name = "ckb-shared" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "arc-swap", "ckb-async-runtime", @@ -1262,7 +1262,7 @@ dependencies = [ [[package]] name = "ckb-snapshot" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "arc-swap", "ckb-chain-spec", @@ -1278,11 +1278,11 @@ dependencies = [ [[package]] name = "ckb-spawn" -version = "0.111.0-rc5" +version = "0.111.0-rc6" [[package]] name = "ckb-stop-handler" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-channel", "ckb-logger", @@ -1292,7 +1292,7 @@ dependencies = [ [[package]] name = "ckb-store" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -1310,7 +1310,7 @@ dependencies = [ [[package]] name = "ckb-sync" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "bitflags", "ckb-app-config", @@ -1367,11 +1367,11 @@ dependencies = [ [[package]] name = "ckb-systemtime" -version = "0.111.0-rc5" +version = "0.111.0-rc6" [[package]] name = "ckb-test-chain-utils" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-chain-spec", "ckb-dao-utils", @@ -1389,14 +1389,14 @@ dependencies = [ [[package]] name = "ckb-traits" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-types", ] [[package]] name = "ckb-tx-pool" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1432,7 +1432,7 @@ dependencies = [ [[package]] name = "ckb-types" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "bit-vec", "bytes 1.4.0", @@ -1456,7 +1456,7 @@ dependencies = [ [[package]] name = "ckb-util" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-fixed-hash", "linked-hash-map", @@ -1467,7 +1467,7 @@ dependencies = [ [[package]] name = "ckb-verification" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-chain-spec", "ckb-dao", @@ -1487,7 +1487,7 @@ dependencies = [ [[package]] name = "ckb-verification-contextual" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "ckb-async-runtime", "ckb-chain", @@ -1514,7 +1514,7 @@ dependencies = [ [[package]] name = "ckb-verification-traits" -version = "0.111.0-rc5" +version = "0.111.0-rc6" dependencies = [ "bitflags", "ckb-error", diff --git a/Cargo.toml b/Cargo.toml index 9d027e1b1e..fa3a18256f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,11 +11,11 @@ repository = "https://github.com/nervosnetwork/ckb" rust-version = "1.67.1" [build-dependencies] -ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc5" } +ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc6" } [dependencies] -ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc5" } -ckb-bin = { path = "ckb-bin", version = "= 0.111.0-rc5" } +ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc6" } +ckb-bin = { path = "ckb-bin", version = "= 0.111.0-rc6" } [dev-dependencies] diff --git a/README.md b/README.md index 1ee8f951bb..18089b92f7 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.111.0--rc5-orange.svg)](https://github.com/nervosnetwork/ckb/releases) +[![Version](https://img.shields.io/badge/version-0.111.0--rc6-orange.svg)](https://github.com/nervosnetwork/ckb/releases) [![Nervos Talk](https://img.shields.io/badge/discuss-on%20Nervos%20Talk-3CC68A.svg)](https://talk.nervos.org/t/where-to-discuss-ckb-and-how-to-ask-for-support/6024) master | develop diff --git a/benches/Cargo.toml b/benches/Cargo.toml index 83758147f8..39b087eb35 100644 --- a/benches/Cargo.toml +++ b/benches/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-benches" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,26 +13,26 @@ repository = "https://github.com/nervosnetwork/ckb" [dev-dependencies] criterion = "0.4" -ckb-chain = { path = "../chain", version = "= 0.111.0-rc5" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc5" } -ckb-store = { path = "../store", version = "= 0.111.0-rc5" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc5" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc6" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc6" } +ckb-store = { path = "../store", version = "= 0.111.0-rc6" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc6" } rand = "0.7" -ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc5"} -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc5" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc5" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc5" } +ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc6"} +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc6" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc6" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc6" } ckb-system-scripts = { version = "= 0.5.4" } lazy_static = "1.3.0" -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc5" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc5" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc5" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc5" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc5" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc5" } -ckb-network = { path = "../network", version = "= 0.111.0-rc5" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc5" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc6" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc6" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc6" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc6" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc6" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc6" } +ckb-network = { path = "../network", version = "= 0.111.0-rc6" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc6" } tempfile.workspace = true [[bench]] diff --git a/block-filter/Cargo.toml b/block-filter/Cargo.toml index e7beae79f8..d2e63738e3 100644 --- a/block-filter/Cargo.toml +++ b/block-filter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-block-filter" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,9 +11,9 @@ repository = "https://github.com/nervosnetwork/ckb" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ckb-store = { path = "../store", version = "= 0.111.0-rc5" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc5" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc5" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc5" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc5" } +ckb-store = { path = "../store", version = "= 0.111.0-rc6" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc6" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc6" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc6" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc6" } diff --git a/chain/Cargo.toml b/chain/Cargo.toml index 7927d40bad..c99b4f1082 100644 --- a/chain/Cargo.toml +++ b/chain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,37 +9,37 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc5" } -ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc5" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc5" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc5" } -ckb-store = { path = "../store", version = "= 0.111.0-rc5" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc5" } -ckb-verification-contextual = { path = "../verification/contextual", version = "= 0.111.0-rc5" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc5" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc5" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc5" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc5" } -ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc5" } -ckb-error = { path = "../error", version = "= 0.111.0-rc5" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc5" } -ckb-rust-unstable-port = { path = "../util/rust-unstable-port", version = "= 0.111.0-rc5" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc5" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc6" } +ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc6" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc6" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc6" } +ckb-store = { path = "../store", version = "= 0.111.0-rc6" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc6" } +ckb-verification-contextual = { path = "../verification/contextual", version = "= 0.111.0-rc6" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc6" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc6" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc6" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc6" } +ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc6" } +ckb-error = { path = "../error", version = "= 0.111.0-rc6" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc6" } +ckb-rust-unstable-port = { path = "../util/rust-unstable-port", version = "= 0.111.0-rc6" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc6" } faux = { version = "^0.1", optional = true } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc5" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc5" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc5" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc5", features = ["internal"] } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc5" } -ckb-network = { path = "../network", version = "= 0.111.0-rc5" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc5" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc6" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc6" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc6" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc6", features = ["internal"] } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc6" } +ckb-network = { path = "../network", version = "= 0.111.0-rc6" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc6" } lazy_static = "1.4" tempfile.workspace = true -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc5" ,features = ["enable_faketime"]} +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc6" ,features = ["enable_faketime"]} [features] default = [] diff --git a/ckb-bin/Cargo.toml b/ckb-bin/Cargo.toml index c804b7f495..54f42cc7b5 100644 --- a/ckb-bin/Cargo.toml +++ b/ckb-bin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-bin" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -14,29 +14,29 @@ serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0" } serde_plain = "0.3.0" toml = "0.5" -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc5" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc5" } -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc5" } -ckb-metrics-service = { path = "../util/metrics-service", version = "= 0.111.0-rc5" } -ckb-util = { path = "../util", version = "= 0.111.0-rc5" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc5" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc5" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc5" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc5" } -ckb-store = { path = "../store", version = "= 0.111.0-rc5" } -ckb-chain-spec = {path = "../spec", version = "= 0.111.0-rc5"} -ckb-miner = { path = "../miner", version = "= 0.111.0-rc5" } -ckb-network = { path = "../network", version = "= 0.111.0-rc5"} -ckb-resource = { path = "../resource", version = "= 0.111.0-rc5"} +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc6" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc6" } +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc6" } +ckb-metrics-service = { path = "../util/metrics-service", version = "= 0.111.0-rc6" } +ckb-util = { path = "../util", version = "= 0.111.0-rc6" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc6" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc6" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc6" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc6" } +ckb-store = { path = "../store", version = "= 0.111.0-rc6" } +ckb-chain-spec = {path = "../spec", version = "= 0.111.0-rc6"} +ckb-miner = { path = "../miner", version = "= 0.111.0-rc6" } +ckb-network = { path = "../network", version = "= 0.111.0-rc6"} +ckb-resource = { path = "../resource", version = "= 0.111.0-rc6"} ctrlc = { version = "3.1", features = ["termination"] } -ckb-instrument = { path = "../util/instrument", version = "= 0.111.0-rc5", features = ["progress_bar"] } -ckb-build-info = { path = "../util/build-info", version = "= 0.111.0-rc5" } -ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc5" } -ckb-chain-iter = { path = "../util/chain-iter", version = "= 0.111.0-rc5" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc5" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc5" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc5" } +ckb-instrument = { path = "../util/instrument", version = "= 0.111.0-rc6", features = ["progress_bar"] } +ckb-build-info = { path = "../util/build-info", version = "= 0.111.0-rc6" } +ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc6" } +ckb-chain-iter = { path = "../util/chain-iter", version = "= 0.111.0-rc6" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc6" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc6" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc6" } base64 = "0.21.0" tempfile.workspace = true rayon = "1.0" diff --git a/db-migration/Cargo.toml b/db-migration/Cargo.toml index 46c9d31367..85464fbab3 100644 --- a/db-migration/Cargo.toml +++ b/db-migration/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db-migration" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,16 +11,16 @@ 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.111.0-rc5" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc5" } -ckb-error = { path = "../error", version = "= 0.111.0-rc5" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc5" } +ckb-db = { path = "../db", version = "= 0.111.0-rc6" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc6" } +ckb-error = { path = "../error", version = "= 0.111.0-rc6" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc6" } indicatif = "0.16" console = ">=0.9.1, <1.0.0" [dev-dependencies] tempfile.workspace = true -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc5" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc6" } [features] portable = ["ckb-db/portable"] diff --git a/db-schema/Cargo.toml b/db-schema/Cargo.toml index e97236b543..6e23ff95c6 100644 --- a/db-schema/Cargo.toml +++ b/db-schema/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db-schema" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/db/Cargo.toml b/db/Cargo.toml index 7a50be2231..30e39252e3 100644 --- a/db/Cargo.toml +++ b/db/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,12 +9,12 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc5" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc5" } -ckb-error = { path = "../error", version = "= 0.111.0-rc5" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc6" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc6" } +ckb-error = { path = "../error", version = "= 0.111.0-rc6" } libc = "0.2" rocksdb = { package = "ckb-rocksdb", version ="=0.20.0", features = ["snappy"], default-features = false } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc5" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc6" } [dev-dependencies] tempfile.workspace = true diff --git a/error/Cargo.toml b/error/Cargo.toml index fe57a82ea3..aa62c850d1 100644 --- a/error/Cargo.toml +++ b/error/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-error" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,5 +11,5 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] thiserror = "1.0.22" anyhow = "1.0.34" -ckb-occupied-capacity = { path = "../util/occupied-capacity", version = "= 0.111.0-rc5" } +ckb-occupied-capacity = { path = "../util/occupied-capacity", version = "= 0.111.0-rc6" } derive_more = { version = "0.99.0", default-features = false, features = ["display"] } diff --git a/freezer/Cargo.toml b/freezer/Cargo.toml index ce1539c375..5254360d0d 100644 --- a/freezer/Cargo.toml +++ b/freezer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-freezer" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,11 +10,11 @@ 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.111.0-rc5" } -ckb-error = { path = "../error", version = "= 0.111.0-rc5" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc5" } -ckb-util = { path = "../util", version = "= 0.111.0-rc5" } -ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc5" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } +ckb-error = { path = "../error", version = "= 0.111.0-rc6" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc6" } +ckb-util = { path = "../util", version = "= 0.111.0-rc6" } +ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc6" } fs2 = "0.4.3" fail = "0.4" snap = "1" diff --git a/miner/Cargo.toml b/miner/Cargo.toml index 869d2d78aa..ab65b9d679 100644 --- a/miner/Cargo.toml +++ b/miner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-miner" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,23 +9,23 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc5" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc5" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc5" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc5" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc5" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc6" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc6" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc6" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc6" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc6" } rand = "0.7" rand_distr = "0.3" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc5" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc6" } hyper = { version = "0.14", features = ["client", "http2", "http1", "server"] } hyper-tls = "0.5" futures = "0.3" lru = "0.7.1" -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc5" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc5" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc6" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc6" } indicatif = "0.16" console = ">=0.9.1, <1.0.0" eaglesong = "0.1" diff --git a/network/Cargo.toml b/network/Cargo.toml index 20dac3f281..56e6489735 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-network" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,28 +11,28 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] rand = "0.7" serde = { version = "1.0", features = ["derive"] } -ckb-util = { path = "../util", version = "= 0.111.0-rc5" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc5" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc5" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc5" } -ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc5"} +ckb-util = { path = "../util", version = "= 0.111.0-rc6" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc6" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc6" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc6" } +ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc6"} tokio = { version = "1", features = ["sync", "macros"] } tokio-util = { version = "0.7", features = ["codec"] } futures = "0.3" -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc5"} +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc6"} lazy_static = { version = "1.3.0", optional = true } bs58 = { version = "0.4.0", optional = true } sentry = { version = "0.26.0", optional = true } faster-hex = { version = "0.6", optional = true } -ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc5"} +ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc6"} secp256k1 = {version = "0.24", features = ["recovery"], optional = true } trust-dns-resolver = { version = "0.20", optional = true } snap = "1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } ipnetwork = "0.18" serde_json = "1.0" bloom-filters = "0.1" -ckb-spawn = { path = "../util/spawn", version = "= 0.111.0-rc5" } +ckb-spawn = { path = "../util/spawn", version = "= 0.111.0-rc6" } socket2 = "0.4" bitflags = "1.0" @@ -48,7 +48,7 @@ criterion = "0.4" proptest = "1.0" num_cpus = "1.10" once_cell = "1.8.0" -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc5", features = ["enable_faketime"]} +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc6", features = ["enable_faketime"]} [[bench]] name = "peer_store" diff --git a/notify/Cargo.toml b/notify/Cargo.toml index 9dd0723e19..0662b22fc8 100644 --- a/notify/Cargo.toml +++ b/notify/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-notify" -version = "0.111.0-rc5" +version = "0.111.0-rc6" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc5" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc5" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc5" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc5" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc6" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc6" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc6" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc6" } tokio = { version = "1", features = ["sync"] } [dev-dependencies] diff --git a/pow/Cargo.toml b/pow/Cargo.toml index a728d93a3b..40a4275664 100644 --- a/pow/Cargo.toml +++ b/pow/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-pow" -version = "0.111.0-rc5" +version = "0.111.0-rc6" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,8 +10,8 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc5"} +ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc6"} serde = { version = "1.0", features = ["derive"] } eaglesong = "0.1" log = "0.4" diff --git a/resource/Cargo.toml b/resource/Cargo.toml index b4f62a7ecb..5e54f4570e 100644 --- a/resource/Cargo.toml +++ b/resource/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-resource" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,13 +13,13 @@ repository = "https://github.com/nervosnetwork/ckb" phf = "0.8.0" includedir = "0.6.0" serde = { version = "1.0", features = ["derive"] } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } ckb-system-scripts = { version = "= 0.5.4" } [build-dependencies] includedir_codegen = "0.6.0" walkdir = "2.1.4" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } ckb-system-scripts = { version = "= 0.5.4" } [dev-dependencies] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index e87a487a81..de8fe0f50f 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-rpc" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,19 +9,19 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc5" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } -ckb-network = { path = "../network", version = "= 0.111.0-rc5" } -ckb-notify = { path = "../notify", version = "= 0.111.0-rc5" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc5" } -ckb-store = { path = "../store", version = "= 0.111.0-rc5" } -ckb-sync = { path = "../sync", version = "= 0.111.0-rc5" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc5" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc5"} -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc5"} -ckb-network-alert = { path = "../util/network-alert", version = "= 0.111.0-rc5" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc5" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc5" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc6" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } +ckb-network = { path = "../network", version = "= 0.111.0-rc6" } +ckb-notify = { path = "../notify", version = "= 0.111.0-rc6" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc6" } +ckb-store = { path = "../store", version = "= 0.111.0-rc6" } +ckb-sync = { path = "../sync", version = "= 0.111.0-rc6" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc6" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc6"} +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc6"} +ckb-network-alert = { path = "../util/network-alert", version = "= 0.111.0-rc6" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc6" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc6" } jsonrpc-core = "18.0" jsonrpc-derive = "18.0" jsonrpc-http-server = "18.0" @@ -30,27 +30,27 @@ jsonrpc-ws-server = "18.0" jsonrpc-server-utils = "18.0" jsonrpc-pubsub = "18.0" serde_json = "1.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc5" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc5" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc5" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc5" } -ckb-util = { path = "../util", version = "= 0.111.0-rc5" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc5" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc5" } -ckb-error = { path = "../error", version = "= 0.111.0-rc5" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc5" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc5" } -ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc5" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc5" } -ckb-indexer = { path = "../util/indexer", version = "= 0.111.0-rc5" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc6" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc6" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc6" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc6" } +ckb-util = { path = "../util", version = "= 0.111.0-rc6" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc6" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc6" } +ckb-error = { path = "../error", version = "= 0.111.0-rc6" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc6" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc6" } +ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc6" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc6" } +ckb-indexer = { path = "../util/indexer", version = "= 0.111.0-rc6" } itertools = "0.10.5" tokio = "1" [dev-dependencies] reqwest = { version = "0.11.4", features = ["blocking", "json"] } serde = { version = "1.0", features = ["derive"] } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc5" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc5" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc6" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc6" } tempfile.workspace = true pretty_assertions = "1.3.0" -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc5" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc6" } diff --git a/script/Cargo.toml b/script/Cargo.toml index a2dfd40c06..f53cfd4b87 100644 --- a/script/Cargo.toml +++ b/script/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-script" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -18,24 +18,24 @@ logging = ["ckb-logger"] flatmemory = [] [dependencies] -ckb-traits = { path = "../traits", version = "= 0.111.0-rc5" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc6" } byteorder = "1.3.1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc5" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc6" } ckb-vm = { version = "=0.24.0", default-features = false } faster-hex = "0.6" -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc5", optional = true } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc6", optional = true } serde = { version = "1.0", features = ["derive"] } -ckb-error = { path = "../error", version = "= 0.111.0-rc5" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc5" } +ckb-error = { path = "../error", version = "= 0.111.0-rc6" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc6" } [dev-dependencies] proptest = "1.0" -ckb-db = { path = "../db", version = "= 0.111.0-rc5" } -ckb-store = { path = "../store", version = "= 0.111.0-rc5" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc5" } +ckb-db = { path = "../db", version = "= 0.111.0-rc6" } +ckb-store = { path = "../store", version = "= 0.111.0-rc6" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc6" } tiny-keccak = { version = "2.0", features = ["sha3"] } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc5" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc5" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc6" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc6" } tempfile.workspace = true rand = "0.8.4" diff --git a/script/fuzz/Cargo.toml b/script/fuzz/Cargo.toml index 1c0a25fa89..47a8baf0cc 100644 --- a/script/fuzz/Cargo.toml +++ b/script/fuzz/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-script-fuzz" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -15,10 +15,10 @@ cargo-fuzz = true [dependencies] arbitrary = { version = "1", features = ["derive"] } libfuzzer-sys = { version="0.4.0", features=["arbitrary-derive"] } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc5" } -ckb-types = { path = "../../util/types", version = "= 0.111.0-rc5" } -ckb-script = { path = "../../script", version = "= 0.111.0-rc5" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc5" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc6" } +ckb-types = { path = "../../util/types", version = "= 0.111.0-rc6" } +ckb-script = { path = "../../script", version = "= 0.111.0-rc6" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc6" } # Prevent this from interfering with workspaces [workspace] diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 4e91eb61a6..92f40a43e7 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-shared" -version = "0.111.0-rc5" +version = "0.111.0-rc6" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,27 +9,27 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc5" } -ckb-store = { path = "../store", version = "= 0.111.0-rc5" } -ckb-db = { path = "../db", version = "= 0.111.0-rc5" } -ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc5" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc6" } +ckb-store = { path = "../store", version = "= 0.111.0-rc6" } +ckb-db = { path = "../db", version = "= 0.111.0-rc6" } +ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc6" } arc-swap = "1.3" -ckb-error = { path = "../error", version = "= 0.111.0-rc5" } -ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc5" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc5" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc5" } -ckb-notify = { path = "../notify", version = "= 0.111.0-rc5" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc5" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc5" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc5" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc5" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc5" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc5" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc5" } +ckb-error = { path = "../error", version = "= 0.111.0-rc6" } +ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc6" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc6" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc6" } +ckb-notify = { path = "../notify", version = "= 0.111.0-rc6" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc6" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc6" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc6" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc6" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc6" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc6" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc6" } [dev-dependencies] -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc5", features = ["enable_faketime"] } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc6", features = ["enable_faketime"] } [features] portable = ["ckb-db/portable", "ckb-store/portable", "ckb-tx-pool/portable"] diff --git a/spec/Cargo.toml b/spec/Cargo.toml index 3b5844739a..085ba7593b 100644 --- a/spec/Cargo.toml +++ b/spec/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain-spec" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,15 +11,15 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] serde = { version = "1.0", features = ["derive"] } toml = "0.5" -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc5" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc5" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc5" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc5" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc5" } -ckb-rational = { path = "../util/rational", version = "= 0.111.0-rc5" } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc5"} -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc5"} -ckb-error = { path = "../error", version = "= 0.111.0-rc5" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc5" } -ckb-util = { path = "../util", version = "= 0.111.0-rc5" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc6" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc6" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc6" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc6" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc6" } +ckb-rational = { path = "../util/rational", version = "= 0.111.0-rc6" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc6"} +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc6"} +ckb-error = { path = "../error", version = "= 0.111.0-rc6" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc6" } +ckb-util = { path = "../util", version = "= 0.111.0-rc6" } diff --git a/store/Cargo.toml b/store/Cargo.toml index 5f907063f9..3cf4417ade 100644 --- a/store/Cargo.toml +++ b/store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-store" -version = "0.111.0-rc5" +version = "0.111.0-rc6" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,16 +9,16 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } -ckb-db = { path = "../db", version = "= 0.111.0-rc5" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc5" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } +ckb-db = { path = "../db", version = "= 0.111.0-rc6" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc6" } lru = "0.7.1" -ckb-traits = { path = "../traits", version = "= 0.111.0-rc5" } -ckb-util = { path = "../util", version = "= 0.111.0-rc5" } -ckb-error = { path = "../error", version = "= 0.111.0-rc5" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc5" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc5" } -ckb-freezer = { path = "../freezer", version = "= 0.111.0-rc5" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc6" } +ckb-util = { path = "../util", version = "= 0.111.0-rc6" } +ckb-error = { path = "../error", version = "= 0.111.0-rc6" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc6" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc6" } +ckb-freezer = { path = "../freezer", version = "= 0.111.0-rc6" } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] diff --git a/sync/Cargo.toml b/sync/Cargo.toml index 3c35b38c97..41843abd5d 100644 --- a/sync/Cargo.toml +++ b/sync/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-sync" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,48 +9,48 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-chain = { path = "../chain", version = "= 0.111.0-rc5" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc5" } -ckb-store = { path = "../store", version = "= 0.111.0-rc5" } -ckb-app-config = {path = "../util/app-config", version = "= 0.111.0-rc5"} -ckb-types = {path = "../util/types", version = "= 0.111.0-rc5"} -ckb-network = { path = "../network", version = "= 0.111.0-rc5" } -ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc5"} -ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc5"} -ckb-util = { path = "../util", version = "= 0.111.0-rc5" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc5" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc5" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc5" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc5" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc5" } -ckb-error = {path = "../error", version = "= 0.111.0-rc5"} -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc5" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc6" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc6" } +ckb-store = { path = "../store", version = "= 0.111.0-rc6" } +ckb-app-config = {path = "../util/app-config", version = "= 0.111.0-rc6"} +ckb-types = {path = "../util/types", version = "= 0.111.0-rc6"} +ckb-network = { path = "../network", version = "= 0.111.0-rc6" } +ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc6"} +ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc6"} +ckb-util = { path = "../util", version = "= 0.111.0-rc6" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc6" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc6" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc6" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc6" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc6" } +ckb-error = {path = "../error", version = "= 0.111.0-rc6"} +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc6" } sentry = { version = "0.26.0", optional = true } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc5" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc5" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc5" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc6" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc6" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc6" } tokio = { version = "1", features = ["sync"] } lru = "0.7.1" futures = "0.3" governor = "0.3.1" tempfile.workspace = true -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc5" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc6" } bitflags = "1.0" dashmap = "4.0" keyed_priority_queue = "0.3" sled = "0.34.7" [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc5" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc6" } rand = "0.7" -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc5" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc5" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc5" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc5", features = ["mock"] } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc5" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc6" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc6" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc6" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc6", features = ["mock"] } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc6" } faux = "^0.1" once_cell = "1.8.0" -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc5" , features = ["enable_faketime"]} +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc6" , features = ["enable_faketime"]} [features] default = [] diff --git a/test/Cargo.toml b/test/Cargo.toml index 238bfbf24e..2c020f3997 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-test" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,28 +11,28 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] clap = { version = "=3.2.21" } toml = "0.5.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc5" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc5" } -ckb-network = { path = "../network", version = "= 0.111.0-rc5" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc5" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc5" } -ckb-util = { path = "../util", version = "= 0.111.0-rc5" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc5" } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc5" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc5" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc5" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc5" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc5" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc5" } -ckb-logger-config = { path = "../util/logger-config", version = "= 0.111.0-rc5" } -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc5" } -ckb-error = { path = "../error", version = "= 0.111.0-rc5" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc5" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc6" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc6" } +ckb-network = { path = "../network", version = "= 0.111.0-rc6" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc6" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc6" } +ckb-util = { path = "../util", version = "= 0.111.0-rc6" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc6" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc6" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc6" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc6" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc6" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc6" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc6" } +ckb-logger-config = { path = "../util/logger-config", version = "= 0.111.0-rc6" } +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc6" } +ckb-error = { path = "../error", version = "= 0.111.0-rc6" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc6" } tempfile = "3" reqwest = { version = "0.11.4", features = ["blocking", "json"] } rand = "0.7" -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc5" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc6" } serde_json = "1.0" lazy_static = "1.4.0" byteorder = "1.3.1" diff --git a/traits/Cargo.toml b/traits/Cargo.toml index 8180b564c1..cdcc72f7be 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-traits" -version = "0.111.0-rc5" +version = "0.111.0-rc6" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc5" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } diff --git a/tx-pool/Cargo.toml b/tx-pool/Cargo.toml index 774abd3f53..e117c82c60 100644 --- a/tx-pool/Cargo.toml +++ b/tx-pool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-tx-pool" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,27 +11,27 @@ 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.111.0-rc5" } -ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc5"} -ckb-verification = { path = "../verification", version = "= 0.111.0-rc5" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc5"} +ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } +ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc6"} +ckb-verification = { path = "../verification", version = "= 0.111.0-rc6" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc6"} lru = "0.7.1" -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc5" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc5" } -ckb-store = { path = "../store", version = "= 0.111.0-rc5" } -ckb-util = { path = "../util", version = "= 0.111.0-rc5" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc5" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc5" } -ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc5" } -ckb-error = { path = "../error", version = "= 0.111.0-rc5" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc6" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc6" } +ckb-store = { path = "../store", version = "= 0.111.0-rc6" } +ckb-util = { path = "../util", version = "= 0.111.0-rc6" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc6" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc6" } +ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc6" } +ckb-error = { path = "../error", version = "= 0.111.0-rc6" } tokio = { version = "1", features = ["sync", "process"] } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc5" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc5" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc5" } -ckb-network = { path = "../network", version = "= 0.111.0-rc5" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc5" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc5" } -ckb-db = { path = "../db", version = "= 0.111.0-rc5" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc6" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc6" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc6" } +ckb-network = { path = "../network", version = "= 0.111.0-rc6" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc6" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc6" } +ckb-db = { path = "../db", version = "= 0.111.0-rc6" } sentry = { version = "0.26.0", optional = true } serde_json = "1.0" rand = "0.8.4" @@ -42,8 +42,8 @@ rustc-hash = "1.1" [dev-dependencies] tempfile.workspace = true -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc5" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc5", features = ["enable_faketime"]} +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc6" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc6", features = ["enable_faketime"]} [features] default = [] diff --git a/util/Cargo.toml b/util/Cargo.toml index a11caa415e..7bc8cf9856 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-util" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -15,7 +15,7 @@ regex = "1.1.6" once_cell = "1.8.0" [dev-dependencies] -ckb-fixed-hash = { path = "fixed-hash", version = "= 0.111.0-rc5" } +ckb-fixed-hash = { path = "fixed-hash", version = "= 0.111.0-rc6" } [features] deadlock_detection = ["parking_lot/deadlock_detection"] diff --git a/util/app-config/Cargo.toml b/util/app-config/Cargo.toml index 31ca7b06f9..ba4f6dbd80 100644 --- a/util/app-config/Cargo.toml +++ b/util/app-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-app-config" -version = "0.111.0-rc5" +version = "0.111.0-rc6" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -15,20 +15,20 @@ serde_plain = "0.3.0" serde_json = "1.0" toml = "0.5" path-clean = "0.1.0" -ckb-logger = { path = "../../util/logger", version = "= 0.111.0-rc5" } -ckb-logger-config = { path = "../../util/logger-config", version = "= 0.111.0-rc5" } -ckb-metrics-config = { path = "../../util/metrics-config", version = "= 0.111.0-rc5" } -ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc5"} -ckb-jsonrpc-types = {path = "../jsonrpc-types", version = "= 0.111.0-rc5"} -ckb-pow = { path = "../../pow", version = "= 0.111.0-rc5" } -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc5"} -ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc5" } -ckb-types = { path = "../types", version = "= 0.111.0-rc5" } +ckb-logger = { path = "../../util/logger", version = "= 0.111.0-rc6" } +ckb-logger-config = { path = "../../util/logger-config", version = "= 0.111.0-rc6" } +ckb-metrics-config = { path = "../../util/metrics-config", version = "= 0.111.0-rc6" } +ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc6"} +ckb-jsonrpc-types = {path = "../jsonrpc-types", version = "= 0.111.0-rc6"} +ckb-pow = { path = "../../pow", version = "= 0.111.0-rc6" } +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc6"} +ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc6" } +ckb-types = { path = "../types", version = "= 0.111.0-rc6" } secio = { version="0.5.7", package="tentacle-secio" } multiaddr = { version="0.3.0", package="tentacle-multiaddr" } rand = "0.7" sentry = { version = "0.26.0", optional = true } -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc5" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc6" } url = { version = "2.2.2", features = ["serde"] } ubyte = { version = "0.10", features = ["serde"] } @@ -37,4 +37,4 @@ with_sentry = ["sentry"] [dev-dependencies] tempfile.workspace = true -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc5" ,features = ["enable_faketime"]} +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc6" ,features = ["enable_faketime"]} diff --git a/util/build-info/Cargo.toml b/util/build-info/Cargo.toml index 6966dd377c..9e5a4c3993 100644 --- a/util/build-info/Cargo.toml +++ b/util/build-info/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-build-info" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/chain-iter/Cargo.toml b/util/chain-iter/Cargo.toml index db29f52ea1..8f288045e3 100644 --- a/util/chain-iter/Cargo.toml +++ b/util/chain-iter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain-iter" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc5" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc5" } +ckb-types = { path = "../types", version = "= 0.111.0-rc6" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc6" } diff --git a/util/channel/Cargo.toml b/util/channel/Cargo.toml index e490102213..39f58110f9 100644 --- a/util/channel/Cargo.toml +++ b/util/channel/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-channel" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/constant/Cargo.toml b/util/constant/Cargo.toml index 5823231aa1..2c7343774f 100644 --- a/util/constant/Cargo.toml +++ b/util/constant/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-constant" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/crypto/Cargo.toml b/util/crypto/Cargo.toml index 2a5519c751..b7f6164e5f 100644 --- a/util/crypto/Cargo.toml +++ b/util/crypto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-crypto" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc5" } +ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc6" } lazy_static = "1.3" secp256k1 = { version = "0.24", features = ["recovery"], optional = true } thiserror = "1.0.22" diff --git a/util/dao/Cargo.toml b/util/dao/Cargo.toml index 863ede0c05..65f436ce73 100644 --- a/util/dao/Cargo.toml +++ b/util/dao/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-dao" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,13 +10,13 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../types", version = "= 0.111.0-rc5" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc5" } -ckb-dao-utils = { path = "./utils", version = "= 0.111.0-rc5" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc5" } +ckb-types = { path = "../types", version = "= 0.111.0-rc6" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc6" } +ckb-dao-utils = { path = "./utils", version = "= 0.111.0-rc6" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc6" } [dev-dependencies] -ckb-db = { path = "../../db", version = "= 0.111.0-rc5" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc5" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc5" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc6" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc6" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc6" } tempfile.workspace = true diff --git a/util/dao/utils/Cargo.toml b/util/dao/utils/Cargo.toml index ade1f79d4a..c5da781d16 100644 --- a/util/dao/utils/Cargo.toml +++ b/util/dao/utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-dao-utils" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,5 +10,5 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../../types", version = "= 0.111.0-rc5" } -ckb-error = { path = "../../../error", version = "= 0.111.0-rc5" } +ckb-types = { path = "../../types", version = "= 0.111.0-rc6" } +ckb-error = { path = "../../../error", version = "= 0.111.0-rc6" } diff --git a/util/fixed-hash/Cargo.toml b/util/fixed-hash/Cargo.toml index 7709b9d26f..c4ae560160 100644 --- a/util/fixed-hash/Cargo.toml +++ b/util/fixed-hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-fixed-hash" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -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.111.0-rc5" } -ckb-fixed-hash-macros = { path = "macros", version = "= 0.111.0-rc5" } +ckb-fixed-hash-core = { path = "core", version = "= 0.111.0-rc6" } +ckb-fixed-hash-macros = { path = "macros", version = "= 0.111.0-rc6" } diff --git a/util/fixed-hash/core/Cargo.toml b/util/fixed-hash/core/Cargo.toml index 532ce9ca6f..382f5e16b0 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.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/fixed-hash/macros/Cargo.toml b/util/fixed-hash/macros/Cargo.toml index 950295b6b1..e8c0e88c27 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.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -12,7 +12,7 @@ repository = "https://github.com/nervosnetwork/ckb" proc-macro = true [dependencies] -ckb-fixed-hash-core = { path = "../core", version = "= 0.111.0-rc5" } +ckb-fixed-hash-core = { path = "../core", version = "= 0.111.0-rc6" } quote = "1.0" syn = "1.0" proc-macro2 = "1.0" diff --git a/util/hash/Cargo.toml b/util/hash/Cargo.toml index df94aac115..4c1a452bb7 100644 --- a/util/hash/Cargo.toml +++ b/util/hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-hash" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/indexer/Cargo.toml b/util/indexer/Cargo.toml index 0585130866..efdc34064b 100644 --- a/util/indexer/Cargo.toml +++ b/util/indexer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-indexer" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,15 +13,15 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] thiserror = "1.0" rocksdb = { package = "ckb-rocksdb", version ="=0.20.0", features = ["snappy"], default-features = false } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc5" } -ckb-types = { path = "../types", version = "= 0.111.0-rc5" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc5" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc5" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc5" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc5" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc5" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc5" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc5" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc6" } +ckb-types = { path = "../types", version = "= 0.111.0-rc6" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc6" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc6" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc6" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc6" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc6" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc6" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc6" } rhai = { version = "1.10.0", features = ["no_function", "no_float", "no_module", "sync"]} serde_json = "1.0" numext-fixed-uint = "0.1" diff --git a/util/instrument/Cargo.toml b/util/instrument/Cargo.toml index 0339869c7a..63ddd9acea 100644 --- a/util/instrument/Cargo.toml +++ b/util/instrument/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-instrument" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc5" } -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc5" } -ckb-chain-iter = { path = "../chain-iter", version = "= 0.111.0-rc5" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc5" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc5" } +ckb-types = { path = "../types", version = "= 0.111.0-rc6" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc6" } +ckb-chain-iter = { path = "../chain-iter", version = "= 0.111.0-rc6" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc6" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc6" } serde_json = "1.0" indicatif = { version = "0.16", optional = true } diff --git a/util/jsonrpc-types/Cargo.toml b/util/jsonrpc-types/Cargo.toml index 4420c5b4ef..6c586cc13d 100644 --- a/util/jsonrpc-types/Cargo.toml +++ b/util/jsonrpc-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-jsonrpc-types" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,7 +9,7 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc5" } +ckb-types = { path = "../types", version = "= 0.111.0-rc6" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" faster-hex = "0.6" diff --git a/util/launcher/Cargo.toml b/util/launcher/Cargo.toml index 084ce5dc62..9c9c1db4f6 100644 --- a/util/launcher/Cargo.toml +++ b/util/launcher/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-launcher" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,44 +11,44 @@ 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.111.0-rc5" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc5" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc5" } -ckb-migration-template = { path = "migration-template", version = "= 0.111.0-rc5" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc5" } -ckb-db-migration = { path = "../../db-migration", version = "= 0.111.0-rc5" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc5" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc5" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc5" } -ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc5" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc5" } -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc5" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc5" } -ckb-network = { path = "../../network", version = "= 0.111.0-rc5"} -ckb-rpc = { path = "../../rpc", version = "= 0.111.0-rc5"} -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc5"} -ckb-network-alert = { path = "../network-alert", version = "= 0.111.0-rc5" } -ckb-sync = { path = "../../sync", version = "= 0.111.0-rc5"} -ckb-verification = { path = "../../verification", version = "= 0.111.0-rc5" } -ckb-verification-traits = { path = "../../verification/traits", version = "= 0.111.0-rc5" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc5" } -ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc5" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc5" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc5" } -ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc5" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc5" } -ckb-snapshot = { path = "../snapshot", version = "= 0.111.0-rc5" } -ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc5" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc5" } -ckb-light-client-protocol-server = { path = "../light-client-protocol-server", version = "= 0.111.0-rc5" } -ckb-block-filter = { path = "../../block-filter", version = "= 0.111.0-rc5" } -ckb-hash = { path = "../hash", version = "= 0.111.0-rc5" } +ckb-types = { path = "../types", version = "= 0.111.0-rc6" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc6" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc6" } +ckb-migration-template = { path = "migration-template", version = "= 0.111.0-rc6" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc6" } +ckb-db-migration = { path = "../../db-migration", version = "= 0.111.0-rc6" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc6" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc6" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc6" } +ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc6" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc6" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc6" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc6" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc6"} +ckb-rpc = { path = "../../rpc", version = "= 0.111.0-rc6"} +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc6"} +ckb-network-alert = { path = "../network-alert", version = "= 0.111.0-rc6" } +ckb-sync = { path = "../../sync", version = "= 0.111.0-rc6"} +ckb-verification = { path = "../../verification", version = "= 0.111.0-rc6" } +ckb-verification-traits = { path = "../../verification/traits", version = "= 0.111.0-rc6" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc6" } +ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc6" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc6" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc6" } +ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc6" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc6" } +ckb-snapshot = { path = "../snapshot", version = "= 0.111.0-rc6" } +ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc6" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc6" } +ckb-light-client-protocol-server = { path = "../light-client-protocol-server", version = "= 0.111.0-rc6" } +ckb-block-filter = { path = "../../block-filter", version = "= 0.111.0-rc6" } +ckb-hash = { path = "../hash", version = "= 0.111.0-rc6" } num_cpus = "1.10" once_cell = "1.8.0" tempfile.workspace = true [dev-dependencies] -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc5", features = ["enable_faketime"] } +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc6", features = ["enable_faketime"] } [features] with_sentry = [ "ckb-sync/with_sentry", "ckb-network/with_sentry", "ckb-app-config/with_sentry" ] diff --git a/util/launcher/migration-template/Cargo.toml b/util/launcher/migration-template/Cargo.toml index 753333b391..17efb59f8a 100644 --- a/util/launcher/migration-template/Cargo.toml +++ b/util/launcher/migration-template/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-migration-template" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/light-client-protocol-server/Cargo.toml b/util/light-client-protocol-server/Cargo.toml index 94c2709221..4a0c4800f3 100644 --- a/util/light-client-protocol-server/Cargo.toml +++ b/util/light-client-protocol-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-light-client-protocol-server" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,23 +9,23 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-network = { path = "../../network", version = "= 0.111.0-rc5" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc5" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc5" } -ckb-types = { path = "../types", version = "= 0.111.0-rc5" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc5" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc6" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc6" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc6" } +ckb-types = { path = "../types", version = "= 0.111.0-rc6" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc6" } ckb-merkle-mountain-range = "0.5.2" -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc5"} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc6"} [dev-dependencies] -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc5" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc5" } -ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc5" } -ckb-launcher = { path = "../launcher", version = "= 0.111.0-rc5" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc5" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc5" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc5" } -ckb-test-chain-utils = { path = "../test-chain-utils", version = "= 0.111.0-rc5" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc6" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc6" } +ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc6" } +ckb-launcher = { path = "../launcher", version = "= 0.111.0-rc6" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc6" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc6" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc6" } +ckb-test-chain-utils = { path = "../test-chain-utils", version = "= 0.111.0-rc6" } tempfile.workspace = true -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc5", features = ["enable_faketime"]} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc6", features = ["enable_faketime"]} tokio = "1.20" diff --git a/util/logger-config/Cargo.toml b/util/logger-config/Cargo.toml index 2cdaf5b2cb..ff995791e2 100644 --- a/util/logger-config/Cargo.toml +++ b/util/logger-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger-config" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/logger-service/Cargo.toml b/util/logger-service/Cargo.toml index 47c946c95d..a78932461e 100644 --- a/util/logger-service/Cargo.toml +++ b/util/logger-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger-service" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -9,9 +9,9 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-util = { path = "..", version = "= 0.111.0-rc5" } -ckb-logger-config = { path = "../logger-config", version = "= 0.111.0-rc5" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc5" } +ckb-util = { path = "..", version = "= 0.111.0-rc6" } +ckb-logger-config = { path = "../logger-config", version = "= 0.111.0-rc6" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc6" } yansi = "0.5" log = "0.4" env_logger = "0.6" @@ -22,7 +22,7 @@ sentry = { version = "0.26.0", optional = true, features = ["log"] } time = { version = "0.3.11", features = ["formatting"] } [dev-dependencies] -ckb-logger = { path = "../logger", version = "= 0.111.0-rc5" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc6" } tempfile.workspace = true [features] diff --git a/util/logger/Cargo.toml b/util/logger/Cargo.toml index 34050dc641..c80e0917c9 100644 --- a/util/logger/Cargo.toml +++ b/util/logger/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/memory-tracker/Cargo.toml b/util/memory-tracker/Cargo.toml index b331ad3ec3..b4bc18c774 100644 --- a/util/memory-tracker/Cargo.toml +++ b/util/memory-tracker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-memory-tracker" -version = "0.111.0-rc5" +version = "0.111.0-rc6" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc5" } -ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc5" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc5" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc6" } +ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc6" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc6" } [target.'cfg(all(not(target_env = "msvc"), not(target_os="macos")))'.dependencies] jemalloc-ctl = { package = "tikv-jemalloc-ctl", version = "0.5.0" } diff --git a/util/metrics-config/Cargo.toml b/util/metrics-config/Cargo.toml index 4a2958e2e5..78d66ca6ce 100644 --- a/util/metrics-config/Cargo.toml +++ b/util/metrics-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics-config" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/metrics-service/Cargo.toml b/util/metrics-service/Cargo.toml index c9ffe73442..34396f6674 100644 --- a/util/metrics-service/Cargo.toml +++ b/util/metrics-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics-service" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -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.111.0-rc5" } -ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc5" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc5" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc5" } -ckb-util = { path = "..", version = "= 0.111.0-rc5" } +ckb-metrics-config = { path = "../metrics-config", version = "= 0.111.0-rc6" } +ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc6" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc6" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc6" } +ckb-util = { path = "..", version = "= 0.111.0-rc6" } prometheus = "0.13.3" hyper = { version = "0.14", features = ["http1", "tcp", "server"] } diff --git a/util/metrics/Cargo.toml b/util/metrics/Cargo.toml index c6f5d5c4a4..9b484920e6 100644 --- a/util/metrics/Cargo.toml +++ b/util/metrics/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/multisig/Cargo.toml b/util/multisig/Cargo.toml index a78ea63ace..384f15f274 100644 --- a/util/multisig/Cargo.toml +++ b/util/multisig/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-multisig" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,9 +9,9 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-error = { path = "../../error", version = "= 0.111.0-rc5" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc5" } -ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc5" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc6" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc6" } +ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc6" } [dev-dependencies] rand = "0.7" diff --git a/util/network-alert/Cargo.toml b/util/network-alert/Cargo.toml index 788e697316..31131ed538 100644 --- a/util/network-alert/Cargo.toml +++ b/util/network-alert/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-network-alert" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,24 +9,24 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-multisig = { path = "../multisig", version = "= 0.111.0-rc5" } -ckb-types = { path = "../types", version = "= 0.111.0-rc5" } -ckb-util = { path = "..", version = "= 0.111.0-rc5" } -ckb-network = { path = "../../network", version = "= 0.111.0-rc5" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc5"} -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc5" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc5"} -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc5" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc5" } -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc5" } +ckb-multisig = { path = "../multisig", version = "= 0.111.0-rc6" } +ckb-types = { path = "../types", version = "= 0.111.0-rc6" } +ckb-util = { path = "..", version = "= 0.111.0-rc6" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc6" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc6"} +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc6" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc6"} +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc6" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc6" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc6" } lru = "0.7.1" semver = "1.0" [dev-dependencies] -ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc5" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc5" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc5" } +ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc6" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc6" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc6" } once_cell = "1.8.0" -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc5", features = ["enable_faketime"]} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc6", features = ["enable_faketime"]} faster-hex = "0.6" serde_json = "1.0" diff --git a/util/occupied-capacity/Cargo.toml b/util/occupied-capacity/Cargo.toml index c639deda17..642228ae74 100644 --- a/util/occupied-capacity/Cargo.toml +++ b/util/occupied-capacity/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-occupied-capacity" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc5" } -ckb-occupied-capacity-core = { path = "core", version = "= 0.111.0-rc5" } +ckb-occupied-capacity-macros = { path = "macros", version = "= 0.111.0-rc6" } +ckb-occupied-capacity-core = { path = "core", version = "= 0.111.0-rc6" } diff --git a/util/occupied-capacity/core/Cargo.toml b/util/occupied-capacity/core/Cargo.toml index f7d1f5e966..ceaccf4192 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.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/occupied-capacity/macros/Cargo.toml b/util/occupied-capacity/macros/Cargo.toml index b4731ad320..f883a7e468 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.111.0-rc5" +version = "0.111.0-rc6" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -14,4 +14,4 @@ proc-macro = true [dependencies] quote = "1.0" syn = "1.0" -ckb-occupied-capacity-core = { path = "../core", version = "= 0.111.0-rc5" } +ckb-occupied-capacity-core = { path = "../core", version = "= 0.111.0-rc6" } diff --git a/util/proposal-table/Cargo.toml b/util/proposal-table/Cargo.toml index bbc28c9041..8924d10e09 100644 --- a/util/proposal-table/Cargo.toml +++ b/util/proposal-table/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-proposal-table" -version = "0.111.0-rc5" +version = "0.111.0-rc6" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc5" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc5" } -ckb-types = { path = "../types", version = "= 0.111.0-rc5" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc6" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc6" } +ckb-types = { path = "../types", version = "= 0.111.0-rc6" } diff --git a/util/rational/Cargo.toml b/util/rational/Cargo.toml index f653db724b..f2b641ed5d 100644 --- a/util/rational/Cargo.toml +++ b/util/rational/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-rational" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/reward-calculator/Cargo.toml b/util/reward-calculator/Cargo.toml index 4b6a514c76..5e36f5d6cd 100644 --- a/util/reward-calculator/Cargo.toml +++ b/util/reward-calculator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-reward-calculator" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,15 +9,15 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc5" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc5" } -ckb-dao = { path = "../dao", version = "= 0.111.0-rc5" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc5" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc5" } -ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc5"} +ckb-types = { path = "../types", version = "= 0.111.0-rc6" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc6" } +ckb-dao = { path = "../dao", version = "= 0.111.0-rc6" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc6" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc6" } +ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc6"} [dev-dependencies] -ckb-db = { path = "../../db", version = "= 0.111.0-rc5" } -ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc5" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc5" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc6" } +ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc6" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc6" } tempfile.workspace = true diff --git a/util/runtime/Cargo.toml b/util/runtime/Cargo.toml index 7b628d2fa6..2eebc595b1 100644 --- a/util/runtime/Cargo.toml +++ b/util/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-async-runtime" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,6 +10,6 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] tokio = { version = "1", features = ["full"] } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc5" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc5" } -ckb-spawn = { path = "../spawn", version = "= 0.111.0-rc5" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc6" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc6" } +ckb-spawn = { path = "../spawn", version = "= 0.111.0-rc6" } diff --git a/util/rust-unstable-port/Cargo.toml b/util/rust-unstable-port/Cargo.toml index 40ceac997b..45144bb2f3 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.111.0-rc5" +version = "0.111.0-rc6" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" diff --git a/util/snapshot/Cargo.toml b/util/snapshot/Cargo.toml index f8441d7bc1..06be11906c 100644 --- a/util/snapshot/Cargo.toml +++ b/util/snapshot/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-snapshot" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,15 +11,15 @@ 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.111.0-rc5" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc5" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc5" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc5" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc5" } -ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc5" } +ckb-types = { path = "../types", version = "= 0.111.0-rc6" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc6" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc6" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc6" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc6" } +ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc6" } arc-swap = "1.3" -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc5" } -ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc5" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc6" } +ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc6" } ckb-merkle-mountain-range = "0.5.2" [features] diff --git a/util/spawn/Cargo.toml b/util/spawn/Cargo.toml index 9fb5c665c5..ba5a65d7f7 100644 --- a/util/spawn/Cargo.toml +++ b/util/spawn/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-spawn" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/stop-handler/Cargo.toml b/util/stop-handler/Cargo.toml index 1ba0e9d70c..d6cadcef06 100644 --- a/util/stop-handler/Cargo.toml +++ b/util/stop-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-stop-handler" -version = "0.111.0-rc5" +version = "0.111.0-rc6" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,6 +10,6 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] parking_lot = "0.12" -ckb-logger = { path = "../logger", version = "= 0.111.0-rc5" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc6" } tokio = { version = "1", features = ["sync", "rt-multi-thread"] } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc5" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc6" } diff --git a/util/systemtime/Cargo.toml b/util/systemtime/Cargo.toml index 11dd39a9a0..c146cce184 100644 --- a/util/systemtime/Cargo.toml +++ b/util/systemtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-systemtime" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/test-chain-utils/Cargo.toml b/util/test-chain-utils/Cargo.toml index f24f825e93..3c3c0086ab 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.111.0-rc5" +version = "0.111.0-rc6" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,18 +9,18 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = {path = "../types", version = "= 0.111.0-rc5"} -ckb-db = { path = "../../db", version = "= 0.111.0-rc5" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc5" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc5" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc5" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc5" } +ckb-types = {path = "../types", version = "= 0.111.0-rc6"} +ckb-db = { path = "../../db", version = "= 0.111.0-rc6" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc6" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc6" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc6" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc6" } lazy_static = "1.3.0" -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc5" } -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc5" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc5" } -ckb-util = { path = "..", version = "= 0.111.0-rc5" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc6" } +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc6" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc6" } +ckb-util = { path = "..", version = "= 0.111.0-rc6" } tempfile.workspace = true [dev-dependencies] -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc5", features = ["enable_faketime"] } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc6", features = ["enable_faketime"] } diff --git a/util/types/Cargo.toml b/util/types/Cargo.toml index 5c909c5524..fff7e851b4 100644 --- a/util/types/Cargo.toml +++ b/util/types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-types" -version = "0.111.0-rc5" +version = "0.111.0-rc6" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,17 +10,17 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] molecule = "=0.7.5" -ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc5" } +ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc6" } numext-fixed-uint = { version = "0.1", features = ["support_rand", "support_heapsize", "support_serde"] } bytes = { version="1", features = ["serde"] } merkle-cbt = "0.3" -ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc5" } -ckb-hash = { path = "../hash", version = "= 0.111.0-rc5" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc5" } -ckb-constant = { path = "../constant", version = "= 0.111.0-rc5" } +ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc6" } +ckb-hash = { path = "../hash", version = "= 0.111.0-rc6" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc6" } +ckb-constant = { path = "../constant", version = "= 0.111.0-rc6" } bit-vec = "0.6.3" -ckb-error = { path = "../../error", version = "= 0.111.0-rc5" } -ckb-rational = { path = "../rational", version = "= 0.111.0-rc5" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc6" } +ckb-rational = { path = "../rational", version = "= 0.111.0-rc6" } once_cell = "1.8.0" derive_more = { version = "0.99.0", default-features=false, features = ["display"] } ckb-merkle-mountain-range = "0.5.2" diff --git a/verification/Cargo.toml b/verification/Cargo.toml index f7a0ed21fe..4352509615 100644 --- a/verification/Cargo.toml +++ b/verification/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,20 +9,20 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } -ckb-script = { path = "../script", version = "= 0.111.0-rc5" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc5" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc5" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } +ckb-script = { path = "../script", version = "= 0.111.0-rc6" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc6" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc6" } lru = "0.7.1" -ckb-traits = { path = "../traits", version = "= 0.111.0-rc5" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc5" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc5" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc5" } -ckb-error = { path = "../error", version = "= 0.111.0-rc5" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc6" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc6" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc6" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc6" } +ckb-error = { path = "../error", version = "= 0.111.0-rc6" } derive_more = { version = "0.99.0", default-features=false, features = ["display"] } -ckb-verification-traits = { path = "./traits", version = "= 0.111.0-rc5" } +ckb-verification-traits = { path = "./traits", version = "= 0.111.0-rc6" } [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc5" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc5" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc5", features=["enable_faketime"]} +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc6" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc6" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc6", features=["enable_faketime"]} diff --git a/verification/contextual/Cargo.toml b/verification/contextual/Cargo.toml index 136f04b694..b370323423 100644 --- a/verification/contextual/Cargo.toml +++ b/verification/contextual/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification-contextual" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,27 +9,27 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../../util/types", version = "= 0.111.0-rc5" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc5" } -ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc5" } +ckb-types = { path = "../../util/types", version = "= 0.111.0-rc6" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc6" } +ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc6" } rayon = "1.0" -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc5" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc5" } -ckb-dao = { path = "../../util/dao", version = "= 0.111.0-rc5" } -ckb-dao-utils = { path = "../../util/dao/utils", version = "= 0.111.0-rc5" } -ckb-logger = {path = "../../util/logger", version = "= 0.111.0-rc5"} -ckb-reward-calculator= { path = "../../util/reward-calculator", version = "= 0.111.0-rc5" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc5" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc6" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc6" } +ckb-dao = { path = "../../util/dao", version = "= 0.111.0-rc6" } +ckb-dao-utils = { path = "../../util/dao/utils", version = "= 0.111.0-rc6" } +ckb-logger = {path = "../../util/logger", version = "= 0.111.0-rc6"} +ckb-reward-calculator= { path = "../../util/reward-calculator", version = "= 0.111.0-rc6" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc6" } tokio = { version = "1", features = ["sync", "rt-multi-thread"] } -ckb-async-runtime = { path = "../../util/runtime", version = "= 0.111.0-rc5" } -ckb-verification-traits = { path = "../traits", version = "= 0.111.0-rc5" } -ckb-verification = { path = "..", version = "= 0.111.0-rc5" } +ckb-async-runtime = { path = "../../util/runtime", version = "= 0.111.0-rc6" } +ckb-verification-traits = { path = "../traits", version = "= 0.111.0-rc6" } +ckb-verification = { path = "..", version = "= 0.111.0-rc6" } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc5" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc5" } -ckb-launcher = { path = "../../util/launcher", version = "= 0.111.0-rc5" } -ckb-test-chain-utils = { path = "../../util/test-chain-utils", version = "= 0.111.0-rc5" } -ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc5", features = ["enable_faketime"]} +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc6" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc6" } +ckb-launcher = { path = "../../util/launcher", version = "= 0.111.0-rc6" } +ckb-test-chain-utils = { path = "../../util/test-chain-utils", version = "= 0.111.0-rc6" } +ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc6", features = ["enable_faketime"]} rand = "0.7" diff --git a/verification/traits/Cargo.toml b/verification/traits/Cargo.toml index 7b1dd1cc63..4f28e9d79d 100644 --- a/verification/traits/Cargo.toml +++ b/verification/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification-traits" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,4 +10,4 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] bitflags = "1.0" -ckb-error = { path = "../../error", version = "= 0.111.0-rc5" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc6" } diff --git a/wasm-build-test/Cargo.toml b/wasm-build-test/Cargo.toml index d815e738d1..67ea7f2415 100644 --- a/wasm-build-test/Cargo.toml +++ b/wasm-build-test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-wasm-test" -version = "0.111.0-rc5" +version = "0.111.0-rc6" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,8 +9,8 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc5" } -ckb-script = { path = "../script", version = "= 0.111.0-rc5", default-features = false, features = [] } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } +ckb-script = { path = "../script", version = "= 0.111.0-rc6", default-features = false, features = [] } # Prevent this from interfering with workspaces [workspace] From 66a8c13aea10e6ba2178e90cb26a4a5d09c92f21 Mon Sep 17 00:00:00 2001 From: mohanson Date: Tue, 27 Jun 2023 17:54:08 +0800 Subject: [PATCH 018/125] chore(script): make ResumableMachine type public --- script/src/lib.rs | 4 ++-- script/src/types.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/script/src/lib.rs b/script/src/lib.rs index 5adfd1fc9c..8b2d128039 100644 --- a/script/src/lib.rs +++ b/script/src/lib.rs @@ -9,8 +9,8 @@ mod verify_env; pub use crate::error::{ScriptError, TransactionScriptError}; pub use crate::types::{ - CoreMachine, ScriptGroup, ScriptGroupType, ScriptVersion, TransactionSnapshot, - TransactionState, VerifyResult, VmIsa, VmVersion, + CoreMachine, MachineContext, ResumableMachine, ScriptGroup, ScriptGroupType, ScriptVersion, + TransactionSnapshot, TransactionState, VerifyResult, VmIsa, VmVersion, }; pub use crate::verify::{TransactionScriptsSyscallsGenerator, TransactionScriptsVerifier}; pub use crate::verify_env::TxVerifyEnv; diff --git a/script/src/types.rs b/script/src/types.rs index 055c3c0f7e..45c36ea337 100644 --- a/script/src/types.rs +++ b/script/src/types.rs @@ -117,7 +117,7 @@ pub(crate) type Machine = TraceMachine; /// a chain of spawned machines. #[derive(Default)] pub struct MachineContext { - pub(crate) suspended_machines: Vec, + pub suspended_machines: Vec, } /// Data structure captured all environment data for a suspended machine From f0fc7d668c87db8f9439f057e5cdb33fc65ad669 Mon Sep 17 00:00:00 2001 From: mohanson Date: Wed, 28 Jun 2023 10:14:48 +0800 Subject: [PATCH 019/125] Fix ci --- script/src/types.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/script/src/types.rs b/script/src/types.rs index 45c36ea337..1fdab303c1 100644 --- a/script/src/types.rs +++ b/script/src/types.rs @@ -117,6 +117,7 @@ pub(crate) type Machine = TraceMachine; /// a chain of spawned machines. #[derive(Default)] pub struct MachineContext { + /// A stack of ResumableMachines. pub suspended_machines: Vec, } @@ -175,8 +176,11 @@ impl TryFrom<&SpawnData> for ResumePoint { } } +/// An enumerated type indicating the type of the Machine. pub enum ResumableMachine { + /// Root machine instance. Initial(Machine), + /// A machine which created by spawn syscall. Spawn(Machine, SpawnData), } @@ -211,10 +215,12 @@ impl ResumableMachine { set_vm_max_cycles(self.machine_mut(), cycles) } + /// Add cycles to current machine. pub fn add_cycles(&mut self, cycles: Cycle) -> Result<(), VMInternalError> { self.machine_mut().machine.add_cycles(cycles) } + /// Run machine. pub fn run(&mut self) -> Result { self.machine_mut().run() } From 1bc2adc0ca8a7543d69a70f9545e1c1a1dd690a2 Mon Sep 17 00:00:00 2001 From: ian Date: Fri, 30 Jun 2023 03:54:12 +0200 Subject: [PATCH 020/125] chore: bump to v0.111.0-rc7 --- Cargo.lock | 136 +++++++++---------- Cargo.toml | 8 +- README.md | 2 +- benches/Cargo.toml | 36 ++--- block-filter/Cargo.toml | 14 +- chain/Cargo.toml | 52 +++---- ckb-bin/Cargo.toml | 46 +++---- db-migration/Cargo.toml | 12 +- db-schema/Cargo.toml | 2 +- db/Cargo.toml | 10 +- error/Cargo.toml | 4 +- freezer/Cargo.toml | 12 +- miner/Cargo.toml | 20 +-- network/Cargo.toml | 22 +-- notify/Cargo.toml | 12 +- pow/Cargo.toml | 6 +- resource/Cargo.toml | 6 +- rpc/Cargo.toml | 60 ++++---- script/Cargo.toml | 24 ++-- script/fuzz/Cargo.toml | 10 +- shared/Cargo.toml | 38 +++--- spec/Cargo.toml | 26 ++-- store/Cargo.toml | 20 +-- sync/Cargo.toml | 56 ++++---- test/Cargo.toml | 40 +++--- traits/Cargo.toml | 4 +- tx-pool/Cargo.toml | 44 +++--- util/Cargo.toml | 4 +- util/app-config/Cargo.toml | 24 ++-- util/build-info/Cargo.toml | 2 +- util/chain-iter/Cargo.toml | 6 +- util/channel/Cargo.toml | 2 +- util/constant/Cargo.toml | 2 +- util/crypto/Cargo.toml | 4 +- util/dao/Cargo.toml | 16 +-- util/dao/utils/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/indexer/Cargo.toml | 20 +-- util/instrument/Cargo.toml | 12 +- util/jsonrpc-types/Cargo.toml | 4 +- util/launcher/Cargo.toml | 68 +++++----- util/launcher/migration-template/Cargo.toml | 2 +- util/light-client-protocol-server/Cargo.toml | 32 ++--- util/logger-config/Cargo.toml | 2 +- util/logger-service/Cargo.toml | 10 +- util/logger/Cargo.toml | 2 +- util/memory-tracker/Cargo.toml | 8 +- util/metrics-config/Cargo.toml | 2 +- util/metrics-service/Cargo.toml | 12 +- util/metrics/Cargo.toml | 2 +- util/multisig/Cargo.toml | 8 +- util/network-alert/Cargo.toml | 30 ++-- 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 | 20 +-- util/runtime/Cargo.toml | 8 +- util/rust-unstable-port/Cargo.toml | 2 +- util/snapshot/Cargo.toml | 18 +-- util/spawn/Cargo.toml | 2 +- util/stop-handler/Cargo.toml | 6 +- util/systemtime/Cargo.toml | 2 +- util/test-chain-utils/Cargo.toml | 24 ++-- util/types/Cargo.toml | 16 +-- verification/Cargo.toml | 28 ++-- verification/contextual/Cargo.toml | 38 +++--- verification/traits/Cargo.toml | 4 +- wasm-build-test/Cargo.toml | 6 +- 73 files changed, 606 insertions(+), 606 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index aeb39fe3e1..c567732bc8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -395,7 +395,7 @@ dependencies = [ [[package]] name = "ckb" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-bin", "ckb-build-info", @@ -404,7 +404,7 @@ dependencies = [ [[package]] name = "ckb-app-config" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-build-info", "ckb-chain-spec", @@ -433,7 +433,7 @@ dependencies = [ [[package]] name = "ckb-async-runtime" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-logger", "ckb-spawn", @@ -443,7 +443,7 @@ dependencies = [ [[package]] name = "ckb-benches" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-app-config", "ckb-chain", @@ -471,7 +471,7 @@ dependencies = [ [[package]] name = "ckb-bin" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "base64", "ckb-app-config", @@ -511,7 +511,7 @@ dependencies = [ [[package]] name = "ckb-block-filter" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-async-runtime", "ckb-logger", @@ -523,11 +523,11 @@ dependencies = [ [[package]] name = "ckb-build-info" -version = "0.111.0-rc6" +version = "0.111.0-rc7" [[package]] name = "ckb-chain" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -561,7 +561,7 @@ dependencies = [ [[package]] name = "ckb-chain-iter" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-store", "ckb-types", @@ -569,7 +569,7 @@ dependencies = [ [[package]] name = "ckb-chain-spec" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-constant", "ckb-crypto", @@ -589,18 +589,18 @@ dependencies = [ [[package]] name = "ckb-channel" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "crossbeam-channel", ] [[package]] name = "ckb-constant" -version = "0.111.0-rc6" +version = "0.111.0-rc7" [[package]] name = "ckb-crypto" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-fixed-hash", "faster-hex", @@ -612,7 +612,7 @@ dependencies = [ [[package]] name = "ckb-dao" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "byteorder", "ckb-chain-spec", @@ -627,7 +627,7 @@ dependencies = [ [[package]] name = "ckb-dao-utils" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "byteorder", "ckb-error", @@ -636,7 +636,7 @@ dependencies = [ [[package]] name = "ckb-db" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-app-config", "ckb-db-schema", @@ -649,7 +649,7 @@ dependencies = [ [[package]] name = "ckb-db-migration" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-app-config", "ckb-db", @@ -663,11 +663,11 @@ dependencies = [ [[package]] name = "ckb-db-schema" -version = "0.111.0-rc6" +version = "0.111.0-rc7" [[package]] name = "ckb-error" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "anyhow", "ckb-occupied-capacity", @@ -677,7 +677,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-fixed-hash-core", "ckb-fixed-hash-macros", @@ -685,7 +685,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-core" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "faster-hex", "serde", @@ -695,7 +695,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-macros" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-fixed-hash-core", "proc-macro2", @@ -705,7 +705,7 @@ dependencies = [ [[package]] name = "ckb-freezer" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-error", "ckb-logger", @@ -721,7 +721,7 @@ dependencies = [ [[package]] name = "ckb-hash" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "blake2b-ref", "blake2b-rs", @@ -729,7 +729,7 @@ dependencies = [ [[package]] name = "ckb-indexer" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -751,7 +751,7 @@ dependencies = [ [[package]] name = "ckb-instrument" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-chain", "ckb-chain-iter", @@ -764,7 +764,7 @@ dependencies = [ [[package]] name = "ckb-jsonrpc-types" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-types", "faster-hex", @@ -777,7 +777,7 @@ dependencies = [ [[package]] name = "ckb-launcher" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -833,7 +833,7 @@ dependencies = [ [[package]] name = "ckb-light-client-protocol-server" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-app-config", "ckb-chain", @@ -856,14 +856,14 @@ dependencies = [ [[package]] name = "ckb-logger" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "log", ] [[package]] name = "ckb-logger-config" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "serde", "toml", @@ -871,7 +871,7 @@ dependencies = [ [[package]] name = "ckb-logger-service" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "backtrace", "ckb-channel", @@ -890,7 +890,7 @@ dependencies = [ [[package]] name = "ckb-memory-tracker" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-db", "ckb-logger", @@ -912,7 +912,7 @@ dependencies = [ [[package]] name = "ckb-metrics" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "once_cell", "prometheus", @@ -921,14 +921,14 @@ dependencies = [ [[package]] name = "ckb-metrics-config" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "serde", ] [[package]] name = "ckb-metrics-service" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-async-runtime", "ckb-logger", @@ -941,7 +941,7 @@ dependencies = [ [[package]] name = "ckb-migration-template" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "quote", "syn", @@ -949,7 +949,7 @@ dependencies = [ [[package]] name = "ckb-miner" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "base64", "ckb-app-config", @@ -978,7 +978,7 @@ dependencies = [ [[package]] name = "ckb-multisig" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-crypto", "ckb-error", @@ -988,7 +988,7 @@ dependencies = [ [[package]] name = "ckb-network" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "bitflags", "bloom-filters", @@ -1026,7 +1026,7 @@ dependencies = [ [[package]] name = "ckb-network-alert" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1050,7 +1050,7 @@ dependencies = [ [[package]] name = "ckb-notify" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1062,7 +1062,7 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-occupied-capacity-core", "ckb-occupied-capacity-macros", @@ -1070,14 +1070,14 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity-core" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "serde", ] [[package]] name = "ckb-occupied-capacity-macros" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-occupied-capacity-core", "quote", @@ -1086,7 +1086,7 @@ dependencies = [ [[package]] name = "ckb-pow" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "byteorder", "ckb-hash", @@ -1098,7 +1098,7 @@ dependencies = [ [[package]] name = "ckb-proposal-table" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-chain-spec", "ckb-logger", @@ -1107,7 +1107,7 @@ dependencies = [ [[package]] name = "ckb-rational" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "numext-fixed-uint", "proptest", @@ -1116,7 +1116,7 @@ dependencies = [ [[package]] name = "ckb-resource" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-system-scripts", "ckb-types", @@ -1130,7 +1130,7 @@ dependencies = [ [[package]] name = "ckb-reward-calculator" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-chain-spec", "ckb-dao", @@ -1157,7 +1157,7 @@ dependencies = [ [[package]] name = "ckb-rpc" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-app-config", "ckb-chain", @@ -1206,14 +1206,14 @@ dependencies = [ [[package]] name = "ckb-rust-unstable-port" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "is_sorted", ] [[package]] name = "ckb-script" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "byteorder", "ckb-chain-spec", @@ -1238,7 +1238,7 @@ dependencies = [ [[package]] name = "ckb-shared" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "arc-swap", "ckb-async-runtime", @@ -1262,7 +1262,7 @@ dependencies = [ [[package]] name = "ckb-snapshot" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "arc-swap", "ckb-chain-spec", @@ -1278,11 +1278,11 @@ dependencies = [ [[package]] name = "ckb-spawn" -version = "0.111.0-rc6" +version = "0.111.0-rc7" [[package]] name = "ckb-stop-handler" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-channel", "ckb-logger", @@ -1292,7 +1292,7 @@ dependencies = [ [[package]] name = "ckb-store" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -1310,7 +1310,7 @@ dependencies = [ [[package]] name = "ckb-sync" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "bitflags", "ckb-app-config", @@ -1367,11 +1367,11 @@ dependencies = [ [[package]] name = "ckb-systemtime" -version = "0.111.0-rc6" +version = "0.111.0-rc7" [[package]] name = "ckb-test-chain-utils" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-chain-spec", "ckb-dao-utils", @@ -1389,14 +1389,14 @@ dependencies = [ [[package]] name = "ckb-traits" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-types", ] [[package]] name = "ckb-tx-pool" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1432,7 +1432,7 @@ dependencies = [ [[package]] name = "ckb-types" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "bit-vec", "bytes 1.4.0", @@ -1456,7 +1456,7 @@ dependencies = [ [[package]] name = "ckb-util" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-fixed-hash", "linked-hash-map", @@ -1467,7 +1467,7 @@ dependencies = [ [[package]] name = "ckb-verification" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-chain-spec", "ckb-dao", @@ -1487,7 +1487,7 @@ dependencies = [ [[package]] name = "ckb-verification-contextual" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "ckb-async-runtime", "ckb-chain", @@ -1514,7 +1514,7 @@ dependencies = [ [[package]] name = "ckb-verification-traits" -version = "0.111.0-rc6" +version = "0.111.0-rc7" dependencies = [ "bitflags", "ckb-error", diff --git a/Cargo.toml b/Cargo.toml index fa3a18256f..6cb0d4da1b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,11 +11,11 @@ repository = "https://github.com/nervosnetwork/ckb" rust-version = "1.67.1" [build-dependencies] -ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc6" } +ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc7" } [dependencies] -ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc6" } -ckb-bin = { path = "ckb-bin", version = "= 0.111.0-rc6" } +ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc7" } +ckb-bin = { path = "ckb-bin", version = "= 0.111.0-rc7" } [dev-dependencies] diff --git a/README.md b/README.md index 18089b92f7..8278bb7d0f 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.111.0--rc6-orange.svg)](https://github.com/nervosnetwork/ckb/releases) +[![Version](https://img.shields.io/badge/version-0.111.0--rc7-orange.svg)](https://github.com/nervosnetwork/ckb/releases) [![Nervos Talk](https://img.shields.io/badge/discuss-on%20Nervos%20Talk-3CC68A.svg)](https://talk.nervos.org/t/where-to-discuss-ckb-and-how-to-ask-for-support/6024) master | develop diff --git a/benches/Cargo.toml b/benches/Cargo.toml index 39b087eb35..4da3236968 100644 --- a/benches/Cargo.toml +++ b/benches/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-benches" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,26 +13,26 @@ repository = "https://github.com/nervosnetwork/ckb" [dev-dependencies] criterion = "0.4" -ckb-chain = { path = "../chain", version = "= 0.111.0-rc6" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc6" } -ckb-store = { path = "../store", version = "= 0.111.0-rc6" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc6" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc7" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc7" } +ckb-store = { path = "../store", version = "= 0.111.0-rc7" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc7" } rand = "0.7" -ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc6"} -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc6" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc6" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc6" } +ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc7"} +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc7" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc7" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc7" } ckb-system-scripts = { version = "= 0.5.4" } lazy_static = "1.3.0" -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc6" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc6" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc6" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc6" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc6" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc6" } -ckb-network = { path = "../network", version = "= 0.111.0-rc6" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc6" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc7" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc7" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc7" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc7" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc7" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc7" } +ckb-network = { path = "../network", version = "= 0.111.0-rc7" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc7" } tempfile.workspace = true [[bench]] diff --git a/block-filter/Cargo.toml b/block-filter/Cargo.toml index d2e63738e3..9f6c3fc02e 100644 --- a/block-filter/Cargo.toml +++ b/block-filter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-block-filter" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,9 +11,9 @@ repository = "https://github.com/nervosnetwork/ckb" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ckb-store = { path = "../store", version = "= 0.111.0-rc6" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc6" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc6" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc6" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc6" } +ckb-store = { path = "../store", version = "= 0.111.0-rc7" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc7" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc7" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc7" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc7" } diff --git a/chain/Cargo.toml b/chain/Cargo.toml index c99b4f1082..f84213bc0c 100644 --- a/chain/Cargo.toml +++ b/chain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,37 +9,37 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc6" } -ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc6" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc6" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc6" } -ckb-store = { path = "../store", version = "= 0.111.0-rc6" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc6" } -ckb-verification-contextual = { path = "../verification/contextual", version = "= 0.111.0-rc6" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc6" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc6" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc6" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc6" } -ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc6" } -ckb-error = { path = "../error", version = "= 0.111.0-rc6" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc6" } -ckb-rust-unstable-port = { path = "../util/rust-unstable-port", version = "= 0.111.0-rc6" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc6" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc7" } +ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc7" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc7" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc7" } +ckb-store = { path = "../store", version = "= 0.111.0-rc7" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc7" } +ckb-verification-contextual = { path = "../verification/contextual", version = "= 0.111.0-rc7" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc7" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc7" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc7" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc7" } +ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc7" } +ckb-error = { path = "../error", version = "= 0.111.0-rc7" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc7" } +ckb-rust-unstable-port = { path = "../util/rust-unstable-port", version = "= 0.111.0-rc7" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc7" } faux = { version = "^0.1", optional = true } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc6" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc6" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc6" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc6", features = ["internal"] } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc6" } -ckb-network = { path = "../network", version = "= 0.111.0-rc6" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc6" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc7" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc7" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc7" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc7", features = ["internal"] } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc7" } +ckb-network = { path = "../network", version = "= 0.111.0-rc7" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc7" } lazy_static = "1.4" tempfile.workspace = true -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc6" ,features = ["enable_faketime"]} +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc7" ,features = ["enable_faketime"]} [features] default = [] diff --git a/ckb-bin/Cargo.toml b/ckb-bin/Cargo.toml index 54f42cc7b5..d68969d890 100644 --- a/ckb-bin/Cargo.toml +++ b/ckb-bin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-bin" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -14,29 +14,29 @@ serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0" } serde_plain = "0.3.0" toml = "0.5" -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc6" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc6" } -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc6" } -ckb-metrics-service = { path = "../util/metrics-service", version = "= 0.111.0-rc6" } -ckb-util = { path = "../util", version = "= 0.111.0-rc6" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc6" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc6" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc6" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc6" } -ckb-store = { path = "../store", version = "= 0.111.0-rc6" } -ckb-chain-spec = {path = "../spec", version = "= 0.111.0-rc6"} -ckb-miner = { path = "../miner", version = "= 0.111.0-rc6" } -ckb-network = { path = "../network", version = "= 0.111.0-rc6"} -ckb-resource = { path = "../resource", version = "= 0.111.0-rc6"} +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc7" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc7" } +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc7" } +ckb-metrics-service = { path = "../util/metrics-service", version = "= 0.111.0-rc7" } +ckb-util = { path = "../util", version = "= 0.111.0-rc7" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc7" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc7" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc7" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc7" } +ckb-store = { path = "../store", version = "= 0.111.0-rc7" } +ckb-chain-spec = {path = "../spec", version = "= 0.111.0-rc7"} +ckb-miner = { path = "../miner", version = "= 0.111.0-rc7" } +ckb-network = { path = "../network", version = "= 0.111.0-rc7"} +ckb-resource = { path = "../resource", version = "= 0.111.0-rc7"} ctrlc = { version = "3.1", features = ["termination"] } -ckb-instrument = { path = "../util/instrument", version = "= 0.111.0-rc6", features = ["progress_bar"] } -ckb-build-info = { path = "../util/build-info", version = "= 0.111.0-rc6" } -ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc6" } -ckb-chain-iter = { path = "../util/chain-iter", version = "= 0.111.0-rc6" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc6" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc6" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc6" } +ckb-instrument = { path = "../util/instrument", version = "= 0.111.0-rc7", features = ["progress_bar"] } +ckb-build-info = { path = "../util/build-info", version = "= 0.111.0-rc7" } +ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc7" } +ckb-chain-iter = { path = "../util/chain-iter", version = "= 0.111.0-rc7" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc7" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc7" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc7" } base64 = "0.21.0" tempfile.workspace = true rayon = "1.0" diff --git a/db-migration/Cargo.toml b/db-migration/Cargo.toml index 85464fbab3..fbf20491a8 100644 --- a/db-migration/Cargo.toml +++ b/db-migration/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db-migration" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,16 +11,16 @@ 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.111.0-rc6" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc6" } -ckb-error = { path = "../error", version = "= 0.111.0-rc6" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc6" } +ckb-db = { path = "../db", version = "= 0.111.0-rc7" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc7" } +ckb-error = { path = "../error", version = "= 0.111.0-rc7" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc7" } indicatif = "0.16" console = ">=0.9.1, <1.0.0" [dev-dependencies] tempfile.workspace = true -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc6" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc7" } [features] portable = ["ckb-db/portable"] diff --git a/db-schema/Cargo.toml b/db-schema/Cargo.toml index 6e23ff95c6..88e5d0ed82 100644 --- a/db-schema/Cargo.toml +++ b/db-schema/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db-schema" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/db/Cargo.toml b/db/Cargo.toml index 30e39252e3..51041a264c 100644 --- a/db/Cargo.toml +++ b/db/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,12 +9,12 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc6" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc6" } -ckb-error = { path = "../error", version = "= 0.111.0-rc6" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc7" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc7" } +ckb-error = { path = "../error", version = "= 0.111.0-rc7" } libc = "0.2" rocksdb = { package = "ckb-rocksdb", version ="=0.20.0", features = ["snappy"], default-features = false } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc6" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc7" } [dev-dependencies] tempfile.workspace = true diff --git a/error/Cargo.toml b/error/Cargo.toml index aa62c850d1..755cae5d2c 100644 --- a/error/Cargo.toml +++ b/error/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-error" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,5 +11,5 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] thiserror = "1.0.22" anyhow = "1.0.34" -ckb-occupied-capacity = { path = "../util/occupied-capacity", version = "= 0.111.0-rc6" } +ckb-occupied-capacity = { path = "../util/occupied-capacity", version = "= 0.111.0-rc7" } derive_more = { version = "0.99.0", default-features = false, features = ["display"] } diff --git a/freezer/Cargo.toml b/freezer/Cargo.toml index 5254360d0d..6684fbcae3 100644 --- a/freezer/Cargo.toml +++ b/freezer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-freezer" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,11 +10,11 @@ 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.111.0-rc6" } -ckb-error = { path = "../error", version = "= 0.111.0-rc6" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc6" } -ckb-util = { path = "../util", version = "= 0.111.0-rc6" } -ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc6" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } +ckb-error = { path = "../error", version = "= 0.111.0-rc7" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc7" } +ckb-util = { path = "../util", version = "= 0.111.0-rc7" } +ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc7" } fs2 = "0.4.3" fail = "0.4" snap = "1" diff --git a/miner/Cargo.toml b/miner/Cargo.toml index ab65b9d679..02b6762325 100644 --- a/miner/Cargo.toml +++ b/miner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-miner" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,23 +9,23 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc6" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc6" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc6" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc6" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc6" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc7" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc7" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc7" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc7" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc7" } rand = "0.7" rand_distr = "0.3" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc6" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc7" } hyper = { version = "0.14", features = ["client", "http2", "http1", "server"] } hyper-tls = "0.5" futures = "0.3" lru = "0.7.1" -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc6" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc6" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc7" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc7" } indicatif = "0.16" console = ">=0.9.1, <1.0.0" eaglesong = "0.1" diff --git a/network/Cargo.toml b/network/Cargo.toml index 56e6489735..d081200ae5 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-network" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,28 +11,28 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] rand = "0.7" serde = { version = "1.0", features = ["derive"] } -ckb-util = { path = "../util", version = "= 0.111.0-rc6" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc6" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc6" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc6" } -ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc6"} +ckb-util = { path = "../util", version = "= 0.111.0-rc7" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc7" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc7" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc7" } +ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc7"} tokio = { version = "1", features = ["sync", "macros"] } tokio-util = { version = "0.7", features = ["codec"] } futures = "0.3" -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc6"} +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc7"} lazy_static = { version = "1.3.0", optional = true } bs58 = { version = "0.4.0", optional = true } sentry = { version = "0.26.0", optional = true } faster-hex = { version = "0.6", optional = true } -ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc6"} +ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc7"} secp256k1 = {version = "0.24", features = ["recovery"], optional = true } trust-dns-resolver = { version = "0.20", optional = true } snap = "1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } ipnetwork = "0.18" serde_json = "1.0" bloom-filters = "0.1" -ckb-spawn = { path = "../util/spawn", version = "= 0.111.0-rc6" } +ckb-spawn = { path = "../util/spawn", version = "= 0.111.0-rc7" } socket2 = "0.4" bitflags = "1.0" @@ -48,7 +48,7 @@ criterion = "0.4" proptest = "1.0" num_cpus = "1.10" once_cell = "1.8.0" -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc6", features = ["enable_faketime"]} +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc7", features = ["enable_faketime"]} [[bench]] name = "peer_store" diff --git a/notify/Cargo.toml b/notify/Cargo.toml index 0662b22fc8..979c99bc8a 100644 --- a/notify/Cargo.toml +++ b/notify/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-notify" -version = "0.111.0-rc6" +version = "0.111.0-rc7" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc6" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc6" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc6" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc6" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc7" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc7" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc7" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc7" } tokio = { version = "1", features = ["sync"] } [dev-dependencies] diff --git a/pow/Cargo.toml b/pow/Cargo.toml index 40a4275664..b5980535f8 100644 --- a/pow/Cargo.toml +++ b/pow/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-pow" -version = "0.111.0-rc6" +version = "0.111.0-rc7" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,8 +10,8 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc6"} +ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc7"} serde = { version = "1.0", features = ["derive"] } eaglesong = "0.1" log = "0.4" diff --git a/resource/Cargo.toml b/resource/Cargo.toml index 5e54f4570e..18a9784df8 100644 --- a/resource/Cargo.toml +++ b/resource/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-resource" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,13 +13,13 @@ repository = "https://github.com/nervosnetwork/ckb" phf = "0.8.0" includedir = "0.6.0" serde = { version = "1.0", features = ["derive"] } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } ckb-system-scripts = { version = "= 0.5.4" } [build-dependencies] includedir_codegen = "0.6.0" walkdir = "2.1.4" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } ckb-system-scripts = { version = "= 0.5.4" } [dev-dependencies] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index de8fe0f50f..6b3ed98458 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-rpc" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,19 +9,19 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc6" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } -ckb-network = { path = "../network", version = "= 0.111.0-rc6" } -ckb-notify = { path = "../notify", version = "= 0.111.0-rc6" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc6" } -ckb-store = { path = "../store", version = "= 0.111.0-rc6" } -ckb-sync = { path = "../sync", version = "= 0.111.0-rc6" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc6" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc6"} -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc6"} -ckb-network-alert = { path = "../util/network-alert", version = "= 0.111.0-rc6" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc6" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc6" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc7" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } +ckb-network = { path = "../network", version = "= 0.111.0-rc7" } +ckb-notify = { path = "../notify", version = "= 0.111.0-rc7" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc7" } +ckb-store = { path = "../store", version = "= 0.111.0-rc7" } +ckb-sync = { path = "../sync", version = "= 0.111.0-rc7" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc7" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc7"} +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc7"} +ckb-network-alert = { path = "../util/network-alert", version = "= 0.111.0-rc7" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc7" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc7" } jsonrpc-core = "18.0" jsonrpc-derive = "18.0" jsonrpc-http-server = "18.0" @@ -30,27 +30,27 @@ jsonrpc-ws-server = "18.0" jsonrpc-server-utils = "18.0" jsonrpc-pubsub = "18.0" serde_json = "1.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc6" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc6" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc6" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc6" } -ckb-util = { path = "../util", version = "= 0.111.0-rc6" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc6" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc6" } -ckb-error = { path = "../error", version = "= 0.111.0-rc6" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc6" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc6" } -ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc6" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc6" } -ckb-indexer = { path = "../util/indexer", version = "= 0.111.0-rc6" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc7" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc7" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc7" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc7" } +ckb-util = { path = "../util", version = "= 0.111.0-rc7" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc7" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc7" } +ckb-error = { path = "../error", version = "= 0.111.0-rc7" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc7" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc7" } +ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc7" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc7" } +ckb-indexer = { path = "../util/indexer", version = "= 0.111.0-rc7" } itertools = "0.10.5" tokio = "1" [dev-dependencies] reqwest = { version = "0.11.4", features = ["blocking", "json"] } serde = { version = "1.0", features = ["derive"] } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc6" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc6" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc7" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc7" } tempfile.workspace = true pretty_assertions = "1.3.0" -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc6" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc7" } diff --git a/script/Cargo.toml b/script/Cargo.toml index f53cfd4b87..c972a5696b 100644 --- a/script/Cargo.toml +++ b/script/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-script" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -18,24 +18,24 @@ logging = ["ckb-logger"] flatmemory = [] [dependencies] -ckb-traits = { path = "../traits", version = "= 0.111.0-rc6" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc7" } byteorder = "1.3.1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc6" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc7" } ckb-vm = { version = "=0.24.0", default-features = false } faster-hex = "0.6" -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc6", optional = true } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc7", optional = true } serde = { version = "1.0", features = ["derive"] } -ckb-error = { path = "../error", version = "= 0.111.0-rc6" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc6" } +ckb-error = { path = "../error", version = "= 0.111.0-rc7" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc7" } [dev-dependencies] proptest = "1.0" -ckb-db = { path = "../db", version = "= 0.111.0-rc6" } -ckb-store = { path = "../store", version = "= 0.111.0-rc6" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc6" } +ckb-db = { path = "../db", version = "= 0.111.0-rc7" } +ckb-store = { path = "../store", version = "= 0.111.0-rc7" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc7" } tiny-keccak = { version = "2.0", features = ["sha3"] } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc6" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc6" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc7" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc7" } tempfile.workspace = true rand = "0.8.4" diff --git a/script/fuzz/Cargo.toml b/script/fuzz/Cargo.toml index 47a8baf0cc..a876d22c4e 100644 --- a/script/fuzz/Cargo.toml +++ b/script/fuzz/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-script-fuzz" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -15,10 +15,10 @@ cargo-fuzz = true [dependencies] arbitrary = { version = "1", features = ["derive"] } libfuzzer-sys = { version="0.4.0", features=["arbitrary-derive"] } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc6" } -ckb-types = { path = "../../util/types", version = "= 0.111.0-rc6" } -ckb-script = { path = "../../script", version = "= 0.111.0-rc6" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc6" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc7" } +ckb-types = { path = "../../util/types", version = "= 0.111.0-rc7" } +ckb-script = { path = "../../script", version = "= 0.111.0-rc7" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc7" } # Prevent this from interfering with workspaces [workspace] diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 92f40a43e7..acbba92530 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-shared" -version = "0.111.0-rc6" +version = "0.111.0-rc7" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,27 +9,27 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc6" } -ckb-store = { path = "../store", version = "= 0.111.0-rc6" } -ckb-db = { path = "../db", version = "= 0.111.0-rc6" } -ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc6" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc7" } +ckb-store = { path = "../store", version = "= 0.111.0-rc7" } +ckb-db = { path = "../db", version = "= 0.111.0-rc7" } +ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc7" } arc-swap = "1.3" -ckb-error = { path = "../error", version = "= 0.111.0-rc6" } -ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc6" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc6" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc6" } -ckb-notify = { path = "../notify", version = "= 0.111.0-rc6" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc6" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc6" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc6" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc6" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc6" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc6" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc6" } +ckb-error = { path = "../error", version = "= 0.111.0-rc7" } +ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc7" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc7" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc7" } +ckb-notify = { path = "../notify", version = "= 0.111.0-rc7" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc7" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc7" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc7" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc7" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc7" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc7" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc7" } [dev-dependencies] -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc6", features = ["enable_faketime"] } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc7", features = ["enable_faketime"] } [features] portable = ["ckb-db/portable", "ckb-store/portable", "ckb-tx-pool/portable"] diff --git a/spec/Cargo.toml b/spec/Cargo.toml index 085ba7593b..ee4432c4af 100644 --- a/spec/Cargo.toml +++ b/spec/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain-spec" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,15 +11,15 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] serde = { version = "1.0", features = ["derive"] } toml = "0.5" -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc6" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc6" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc6" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc6" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc6" } -ckb-rational = { path = "../util/rational", version = "= 0.111.0-rc6" } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc6"} -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc6"} -ckb-error = { path = "../error", version = "= 0.111.0-rc6" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc6" } -ckb-util = { path = "../util", version = "= 0.111.0-rc6" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc7" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc7" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc7" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc7" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc7" } +ckb-rational = { path = "../util/rational", version = "= 0.111.0-rc7" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc7"} +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc7"} +ckb-error = { path = "../error", version = "= 0.111.0-rc7" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc7" } +ckb-util = { path = "../util", version = "= 0.111.0-rc7" } diff --git a/store/Cargo.toml b/store/Cargo.toml index 3cf4417ade..16304ff502 100644 --- a/store/Cargo.toml +++ b/store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-store" -version = "0.111.0-rc6" +version = "0.111.0-rc7" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,16 +9,16 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } -ckb-db = { path = "../db", version = "= 0.111.0-rc6" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc6" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } +ckb-db = { path = "../db", version = "= 0.111.0-rc7" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc7" } lru = "0.7.1" -ckb-traits = { path = "../traits", version = "= 0.111.0-rc6" } -ckb-util = { path = "../util", version = "= 0.111.0-rc6" } -ckb-error = { path = "../error", version = "= 0.111.0-rc6" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc6" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc6" } -ckb-freezer = { path = "../freezer", version = "= 0.111.0-rc6" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc7" } +ckb-util = { path = "../util", version = "= 0.111.0-rc7" } +ckb-error = { path = "../error", version = "= 0.111.0-rc7" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc7" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc7" } +ckb-freezer = { path = "../freezer", version = "= 0.111.0-rc7" } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] diff --git a/sync/Cargo.toml b/sync/Cargo.toml index 41843abd5d..4b57e84355 100644 --- a/sync/Cargo.toml +++ b/sync/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-sync" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,48 +9,48 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-chain = { path = "../chain", version = "= 0.111.0-rc6" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc6" } -ckb-store = { path = "../store", version = "= 0.111.0-rc6" } -ckb-app-config = {path = "../util/app-config", version = "= 0.111.0-rc6"} -ckb-types = {path = "../util/types", version = "= 0.111.0-rc6"} -ckb-network = { path = "../network", version = "= 0.111.0-rc6" } -ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc6"} -ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc6"} -ckb-util = { path = "../util", version = "= 0.111.0-rc6" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc6" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc6" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc6" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc6" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc6" } -ckb-error = {path = "../error", version = "= 0.111.0-rc6"} -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc6" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc7" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc7" } +ckb-store = { path = "../store", version = "= 0.111.0-rc7" } +ckb-app-config = {path = "../util/app-config", version = "= 0.111.0-rc7"} +ckb-types = {path = "../util/types", version = "= 0.111.0-rc7"} +ckb-network = { path = "../network", version = "= 0.111.0-rc7" } +ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc7"} +ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc7"} +ckb-util = { path = "../util", version = "= 0.111.0-rc7" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc7" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc7" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc7" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc7" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc7" } +ckb-error = {path = "../error", version = "= 0.111.0-rc7"} +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc7" } sentry = { version = "0.26.0", optional = true } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc6" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc6" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc6" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc7" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc7" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc7" } tokio = { version = "1", features = ["sync"] } lru = "0.7.1" futures = "0.3" governor = "0.3.1" tempfile.workspace = true -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc6" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc7" } bitflags = "1.0" dashmap = "4.0" keyed_priority_queue = "0.3" sled = "0.34.7" [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc6" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc7" } rand = "0.7" -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc6" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc6" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc6" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc6", features = ["mock"] } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc6" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc7" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc7" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc7" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc7", features = ["mock"] } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc7" } faux = "^0.1" once_cell = "1.8.0" -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc6" , features = ["enable_faketime"]} +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc7" , features = ["enable_faketime"]} [features] default = [] diff --git a/test/Cargo.toml b/test/Cargo.toml index 2c020f3997..a9be74e2e0 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-test" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,28 +11,28 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] clap = { version = "=3.2.21" } toml = "0.5.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc6" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc6" } -ckb-network = { path = "../network", version = "= 0.111.0-rc6" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc6" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc6" } -ckb-util = { path = "../util", version = "= 0.111.0-rc6" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc6" } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc6" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc6" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc6" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc6" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc6" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc6" } -ckb-logger-config = { path = "../util/logger-config", version = "= 0.111.0-rc6" } -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc6" } -ckb-error = { path = "../error", version = "= 0.111.0-rc6" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc6" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc7" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc7" } +ckb-network = { path = "../network", version = "= 0.111.0-rc7" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc7" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc7" } +ckb-util = { path = "../util", version = "= 0.111.0-rc7" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc7" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc7" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc7" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc7" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc7" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc7" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc7" } +ckb-logger-config = { path = "../util/logger-config", version = "= 0.111.0-rc7" } +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc7" } +ckb-error = { path = "../error", version = "= 0.111.0-rc7" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc7" } tempfile = "3" reqwest = { version = "0.11.4", features = ["blocking", "json"] } rand = "0.7" -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc6" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc7" } serde_json = "1.0" lazy_static = "1.4.0" byteorder = "1.3.1" diff --git a/traits/Cargo.toml b/traits/Cargo.toml index cdcc72f7be..90d2dee95c 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-traits" -version = "0.111.0-rc6" +version = "0.111.0-rc7" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc6" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } diff --git a/tx-pool/Cargo.toml b/tx-pool/Cargo.toml index e117c82c60..c2a665ef01 100644 --- a/tx-pool/Cargo.toml +++ b/tx-pool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-tx-pool" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,27 +11,27 @@ 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.111.0-rc6" } -ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc6"} -ckb-verification = { path = "../verification", version = "= 0.111.0-rc6" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc6"} +ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } +ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc7"} +ckb-verification = { path = "../verification", version = "= 0.111.0-rc7" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc7"} lru = "0.7.1" -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc6" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc6" } -ckb-store = { path = "../store", version = "= 0.111.0-rc6" } -ckb-util = { path = "../util", version = "= 0.111.0-rc6" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc6" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc6" } -ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc6" } -ckb-error = { path = "../error", version = "= 0.111.0-rc6" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc7" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc7" } +ckb-store = { path = "../store", version = "= 0.111.0-rc7" } +ckb-util = { path = "../util", version = "= 0.111.0-rc7" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc7" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc7" } +ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc7" } +ckb-error = { path = "../error", version = "= 0.111.0-rc7" } tokio = { version = "1", features = ["sync", "process"] } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc6" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc6" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc6" } -ckb-network = { path = "../network", version = "= 0.111.0-rc6" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc6" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc6" } -ckb-db = { path = "../db", version = "= 0.111.0-rc6" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc7" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc7" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc7" } +ckb-network = { path = "../network", version = "= 0.111.0-rc7" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc7" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc7" } +ckb-db = { path = "../db", version = "= 0.111.0-rc7" } sentry = { version = "0.26.0", optional = true } serde_json = "1.0" rand = "0.8.4" @@ -42,8 +42,8 @@ rustc-hash = "1.1" [dev-dependencies] tempfile.workspace = true -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc6" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc6", features = ["enable_faketime"]} +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc7" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc7", features = ["enable_faketime"]} [features] default = [] diff --git a/util/Cargo.toml b/util/Cargo.toml index 7bc8cf9856..4b5948cbf5 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-util" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -15,7 +15,7 @@ regex = "1.1.6" once_cell = "1.8.0" [dev-dependencies] -ckb-fixed-hash = { path = "fixed-hash", version = "= 0.111.0-rc6" } +ckb-fixed-hash = { path = "fixed-hash", version = "= 0.111.0-rc7" } [features] deadlock_detection = ["parking_lot/deadlock_detection"] diff --git a/util/app-config/Cargo.toml b/util/app-config/Cargo.toml index ba4f6dbd80..4876c3755b 100644 --- a/util/app-config/Cargo.toml +++ b/util/app-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-app-config" -version = "0.111.0-rc6" +version = "0.111.0-rc7" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -15,20 +15,20 @@ serde_plain = "0.3.0" serde_json = "1.0" toml = "0.5" path-clean = "0.1.0" -ckb-logger = { path = "../../util/logger", version = "= 0.111.0-rc6" } -ckb-logger-config = { path = "../../util/logger-config", version = "= 0.111.0-rc6" } -ckb-metrics-config = { path = "../../util/metrics-config", version = "= 0.111.0-rc6" } -ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc6"} -ckb-jsonrpc-types = {path = "../jsonrpc-types", version = "= 0.111.0-rc6"} -ckb-pow = { path = "../../pow", version = "= 0.111.0-rc6" } -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc6"} -ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc6" } -ckb-types = { path = "../types", version = "= 0.111.0-rc6" } +ckb-logger = { path = "../../util/logger", version = "= 0.111.0-rc7" } +ckb-logger-config = { path = "../../util/logger-config", version = "= 0.111.0-rc7" } +ckb-metrics-config = { path = "../../util/metrics-config", version = "= 0.111.0-rc7" } +ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc7"} +ckb-jsonrpc-types = {path = "../jsonrpc-types", version = "= 0.111.0-rc7"} +ckb-pow = { path = "../../pow", version = "= 0.111.0-rc7" } +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc7"} +ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc7" } +ckb-types = { path = "../types", version = "= 0.111.0-rc7" } secio = { version="0.5.7", package="tentacle-secio" } multiaddr = { version="0.3.0", package="tentacle-multiaddr" } rand = "0.7" sentry = { version = "0.26.0", optional = true } -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc6" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc7" } url = { version = "2.2.2", features = ["serde"] } ubyte = { version = "0.10", features = ["serde"] } @@ -37,4 +37,4 @@ with_sentry = ["sentry"] [dev-dependencies] tempfile.workspace = true -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc6" ,features = ["enable_faketime"]} +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc7" ,features = ["enable_faketime"]} diff --git a/util/build-info/Cargo.toml b/util/build-info/Cargo.toml index 9e5a4c3993..ca7e8978fc 100644 --- a/util/build-info/Cargo.toml +++ b/util/build-info/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-build-info" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/chain-iter/Cargo.toml b/util/chain-iter/Cargo.toml index 8f288045e3..f4e0d0b495 100644 --- a/util/chain-iter/Cargo.toml +++ b/util/chain-iter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain-iter" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc6" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc6" } +ckb-types = { path = "../types", version = "= 0.111.0-rc7" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc7" } diff --git a/util/channel/Cargo.toml b/util/channel/Cargo.toml index 39f58110f9..94e1d1839a 100644 --- a/util/channel/Cargo.toml +++ b/util/channel/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-channel" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/constant/Cargo.toml b/util/constant/Cargo.toml index 2c7343774f..09eadbad89 100644 --- a/util/constant/Cargo.toml +++ b/util/constant/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-constant" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/crypto/Cargo.toml b/util/crypto/Cargo.toml index b7f6164e5f..8c7838f925 100644 --- a/util/crypto/Cargo.toml +++ b/util/crypto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-crypto" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc6" } +ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc7" } lazy_static = "1.3" secp256k1 = { version = "0.24", features = ["recovery"], optional = true } thiserror = "1.0.22" diff --git a/util/dao/Cargo.toml b/util/dao/Cargo.toml index 65f436ce73..a951c09c99 100644 --- a/util/dao/Cargo.toml +++ b/util/dao/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-dao" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,13 +10,13 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../types", version = "= 0.111.0-rc6" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc6" } -ckb-dao-utils = { path = "./utils", version = "= 0.111.0-rc6" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc6" } +ckb-types = { path = "../types", version = "= 0.111.0-rc7" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc7" } +ckb-dao-utils = { path = "./utils", version = "= 0.111.0-rc7" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc7" } [dev-dependencies] -ckb-db = { path = "../../db", version = "= 0.111.0-rc6" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc6" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc6" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc7" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc7" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc7" } tempfile.workspace = true diff --git a/util/dao/utils/Cargo.toml b/util/dao/utils/Cargo.toml index c5da781d16..8c2b633c7d 100644 --- a/util/dao/utils/Cargo.toml +++ b/util/dao/utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-dao-utils" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,5 +10,5 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../../types", version = "= 0.111.0-rc6" } -ckb-error = { path = "../../../error", version = "= 0.111.0-rc6" } +ckb-types = { path = "../../types", version = "= 0.111.0-rc7" } +ckb-error = { path = "../../../error", version = "= 0.111.0-rc7" } diff --git a/util/fixed-hash/Cargo.toml b/util/fixed-hash/Cargo.toml index c4ae560160..045116bade 100644 --- a/util/fixed-hash/Cargo.toml +++ b/util/fixed-hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-fixed-hash" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -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.111.0-rc6" } -ckb-fixed-hash-macros = { path = "macros", version = "= 0.111.0-rc6" } +ckb-fixed-hash-core = { path = "core", version = "= 0.111.0-rc7" } +ckb-fixed-hash-macros = { path = "macros", version = "= 0.111.0-rc7" } diff --git a/util/fixed-hash/core/Cargo.toml b/util/fixed-hash/core/Cargo.toml index 382f5e16b0..a77a86d24e 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.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/fixed-hash/macros/Cargo.toml b/util/fixed-hash/macros/Cargo.toml index e8c0e88c27..fbdb95a8d3 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.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -12,7 +12,7 @@ repository = "https://github.com/nervosnetwork/ckb" proc-macro = true [dependencies] -ckb-fixed-hash-core = { path = "../core", version = "= 0.111.0-rc6" } +ckb-fixed-hash-core = { path = "../core", version = "= 0.111.0-rc7" } quote = "1.0" syn = "1.0" proc-macro2 = "1.0" diff --git a/util/hash/Cargo.toml b/util/hash/Cargo.toml index 4c1a452bb7..2f494300b8 100644 --- a/util/hash/Cargo.toml +++ b/util/hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-hash" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/indexer/Cargo.toml b/util/indexer/Cargo.toml index efdc34064b..a2c72958ab 100644 --- a/util/indexer/Cargo.toml +++ b/util/indexer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-indexer" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,15 +13,15 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] thiserror = "1.0" rocksdb = { package = "ckb-rocksdb", version ="=0.20.0", features = ["snappy"], default-features = false } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc6" } -ckb-types = { path = "../types", version = "= 0.111.0-rc6" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc6" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc6" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc6" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc6" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc6" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc6" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc6" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc7" } +ckb-types = { path = "../types", version = "= 0.111.0-rc7" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc7" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc7" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc7" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc7" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc7" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc7" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc7" } rhai = { version = "1.10.0", features = ["no_function", "no_float", "no_module", "sync"]} serde_json = "1.0" numext-fixed-uint = "0.1" diff --git a/util/instrument/Cargo.toml b/util/instrument/Cargo.toml index 63ddd9acea..c2ec31c770 100644 --- a/util/instrument/Cargo.toml +++ b/util/instrument/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-instrument" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc6" } -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc6" } -ckb-chain-iter = { path = "../chain-iter", version = "= 0.111.0-rc6" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc6" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc6" } +ckb-types = { path = "../types", version = "= 0.111.0-rc7" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc7" } +ckb-chain-iter = { path = "../chain-iter", version = "= 0.111.0-rc7" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc7" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc7" } serde_json = "1.0" indicatif = { version = "0.16", optional = true } diff --git a/util/jsonrpc-types/Cargo.toml b/util/jsonrpc-types/Cargo.toml index 6c586cc13d..2b98d7e67c 100644 --- a/util/jsonrpc-types/Cargo.toml +++ b/util/jsonrpc-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-jsonrpc-types" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,7 +9,7 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc6" } +ckb-types = { path = "../types", version = "= 0.111.0-rc7" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" faster-hex = "0.6" diff --git a/util/launcher/Cargo.toml b/util/launcher/Cargo.toml index 9c9c1db4f6..cee937b263 100644 --- a/util/launcher/Cargo.toml +++ b/util/launcher/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-launcher" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,44 +11,44 @@ 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.111.0-rc6" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc6" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc6" } -ckb-migration-template = { path = "migration-template", version = "= 0.111.0-rc6" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc6" } -ckb-db-migration = { path = "../../db-migration", version = "= 0.111.0-rc6" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc6" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc6" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc6" } -ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc6" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc6" } -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc6" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc6" } -ckb-network = { path = "../../network", version = "= 0.111.0-rc6"} -ckb-rpc = { path = "../../rpc", version = "= 0.111.0-rc6"} -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc6"} -ckb-network-alert = { path = "../network-alert", version = "= 0.111.0-rc6" } -ckb-sync = { path = "../../sync", version = "= 0.111.0-rc6"} -ckb-verification = { path = "../../verification", version = "= 0.111.0-rc6" } -ckb-verification-traits = { path = "../../verification/traits", version = "= 0.111.0-rc6" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc6" } -ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc6" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc6" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc6" } -ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc6" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc6" } -ckb-snapshot = { path = "../snapshot", version = "= 0.111.0-rc6" } -ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc6" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc6" } -ckb-light-client-protocol-server = { path = "../light-client-protocol-server", version = "= 0.111.0-rc6" } -ckb-block-filter = { path = "../../block-filter", version = "= 0.111.0-rc6" } -ckb-hash = { path = "../hash", version = "= 0.111.0-rc6" } +ckb-types = { path = "../types", version = "= 0.111.0-rc7" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc7" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc7" } +ckb-migration-template = { path = "migration-template", version = "= 0.111.0-rc7" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc7" } +ckb-db-migration = { path = "../../db-migration", version = "= 0.111.0-rc7" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc7" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc7" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc7" } +ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc7" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc7" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc7" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc7" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc7"} +ckb-rpc = { path = "../../rpc", version = "= 0.111.0-rc7"} +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc7"} +ckb-network-alert = { path = "../network-alert", version = "= 0.111.0-rc7" } +ckb-sync = { path = "../../sync", version = "= 0.111.0-rc7"} +ckb-verification = { path = "../../verification", version = "= 0.111.0-rc7" } +ckb-verification-traits = { path = "../../verification/traits", version = "= 0.111.0-rc7" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc7" } +ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc7" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc7" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc7" } +ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc7" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc7" } +ckb-snapshot = { path = "../snapshot", version = "= 0.111.0-rc7" } +ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc7" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc7" } +ckb-light-client-protocol-server = { path = "../light-client-protocol-server", version = "= 0.111.0-rc7" } +ckb-block-filter = { path = "../../block-filter", version = "= 0.111.0-rc7" } +ckb-hash = { path = "../hash", version = "= 0.111.0-rc7" } num_cpus = "1.10" once_cell = "1.8.0" tempfile.workspace = true [dev-dependencies] -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc6", features = ["enable_faketime"] } +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc7", features = ["enable_faketime"] } [features] with_sentry = [ "ckb-sync/with_sentry", "ckb-network/with_sentry", "ckb-app-config/with_sentry" ] diff --git a/util/launcher/migration-template/Cargo.toml b/util/launcher/migration-template/Cargo.toml index 17efb59f8a..467047c6e0 100644 --- a/util/launcher/migration-template/Cargo.toml +++ b/util/launcher/migration-template/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-migration-template" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/light-client-protocol-server/Cargo.toml b/util/light-client-protocol-server/Cargo.toml index 4a0c4800f3..e36929ff69 100644 --- a/util/light-client-protocol-server/Cargo.toml +++ b/util/light-client-protocol-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-light-client-protocol-server" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,23 +9,23 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-network = { path = "../../network", version = "= 0.111.0-rc6" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc6" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc6" } -ckb-types = { path = "../types", version = "= 0.111.0-rc6" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc6" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc7" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc7" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc7" } +ckb-types = { path = "../types", version = "= 0.111.0-rc7" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc7" } ckb-merkle-mountain-range = "0.5.2" -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc6"} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc7"} [dev-dependencies] -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc6" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc6" } -ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc6" } -ckb-launcher = { path = "../launcher", version = "= 0.111.0-rc6" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc6" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc6" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc6" } -ckb-test-chain-utils = { path = "../test-chain-utils", version = "= 0.111.0-rc6" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc7" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc7" } +ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc7" } +ckb-launcher = { path = "../launcher", version = "= 0.111.0-rc7" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc7" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc7" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc7" } +ckb-test-chain-utils = { path = "../test-chain-utils", version = "= 0.111.0-rc7" } tempfile.workspace = true -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc6", features = ["enable_faketime"]} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc7", features = ["enable_faketime"]} tokio = "1.20" diff --git a/util/logger-config/Cargo.toml b/util/logger-config/Cargo.toml index ff995791e2..2c6b422e7a 100644 --- a/util/logger-config/Cargo.toml +++ b/util/logger-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger-config" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/logger-service/Cargo.toml b/util/logger-service/Cargo.toml index a78932461e..408d4cee79 100644 --- a/util/logger-service/Cargo.toml +++ b/util/logger-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger-service" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -9,9 +9,9 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-util = { path = "..", version = "= 0.111.0-rc6" } -ckb-logger-config = { path = "../logger-config", version = "= 0.111.0-rc6" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc6" } +ckb-util = { path = "..", version = "= 0.111.0-rc7" } +ckb-logger-config = { path = "../logger-config", version = "= 0.111.0-rc7" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc7" } yansi = "0.5" log = "0.4" env_logger = "0.6" @@ -22,7 +22,7 @@ sentry = { version = "0.26.0", optional = true, features = ["log"] } time = { version = "0.3.11", features = ["formatting"] } [dev-dependencies] -ckb-logger = { path = "../logger", version = "= 0.111.0-rc6" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc7" } tempfile.workspace = true [features] diff --git a/util/logger/Cargo.toml b/util/logger/Cargo.toml index c80e0917c9..7efe37cb37 100644 --- a/util/logger/Cargo.toml +++ b/util/logger/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/memory-tracker/Cargo.toml b/util/memory-tracker/Cargo.toml index b4bc18c774..f818782e02 100644 --- a/util/memory-tracker/Cargo.toml +++ b/util/memory-tracker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-memory-tracker" -version = "0.111.0-rc6" +version = "0.111.0-rc7" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc6" } -ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc6" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc6" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc7" } +ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc7" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc7" } [target.'cfg(all(not(target_env = "msvc"), not(target_os="macos")))'.dependencies] jemalloc-ctl = { package = "tikv-jemalloc-ctl", version = "0.5.0" } diff --git a/util/metrics-config/Cargo.toml b/util/metrics-config/Cargo.toml index 78d66ca6ce..a98a991351 100644 --- a/util/metrics-config/Cargo.toml +++ b/util/metrics-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics-config" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/metrics-service/Cargo.toml b/util/metrics-service/Cargo.toml index 34396f6674..1097638dac 100644 --- a/util/metrics-service/Cargo.toml +++ b/util/metrics-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics-service" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -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.111.0-rc6" } -ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc6" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc6" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc6" } -ckb-util = { path = "..", version = "= 0.111.0-rc6" } +ckb-metrics-config = { path = "../metrics-config", version = "= 0.111.0-rc7" } +ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc7" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc7" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc7" } +ckb-util = { path = "..", version = "= 0.111.0-rc7" } prometheus = "0.13.3" hyper = { version = "0.14", features = ["http1", "tcp", "server"] } diff --git a/util/metrics/Cargo.toml b/util/metrics/Cargo.toml index 9b484920e6..1f163540aa 100644 --- a/util/metrics/Cargo.toml +++ b/util/metrics/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/multisig/Cargo.toml b/util/multisig/Cargo.toml index 384f15f274..6bce62182f 100644 --- a/util/multisig/Cargo.toml +++ b/util/multisig/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-multisig" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,9 +9,9 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-error = { path = "../../error", version = "= 0.111.0-rc6" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc6" } -ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc6" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc7" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc7" } +ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc7" } [dev-dependencies] rand = "0.7" diff --git a/util/network-alert/Cargo.toml b/util/network-alert/Cargo.toml index 31131ed538..b55783f27c 100644 --- a/util/network-alert/Cargo.toml +++ b/util/network-alert/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-network-alert" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,24 +9,24 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-multisig = { path = "../multisig", version = "= 0.111.0-rc6" } -ckb-types = { path = "../types", version = "= 0.111.0-rc6" } -ckb-util = { path = "..", version = "= 0.111.0-rc6" } -ckb-network = { path = "../../network", version = "= 0.111.0-rc6" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc6"} -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc6" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc6"} -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc6" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc6" } -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc6" } +ckb-multisig = { path = "../multisig", version = "= 0.111.0-rc7" } +ckb-types = { path = "../types", version = "= 0.111.0-rc7" } +ckb-util = { path = "..", version = "= 0.111.0-rc7" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc7" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc7"} +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc7" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc7"} +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc7" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc7" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc7" } lru = "0.7.1" semver = "1.0" [dev-dependencies] -ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc6" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc6" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc6" } +ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc7" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc7" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc7" } once_cell = "1.8.0" -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc6", features = ["enable_faketime"]} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc7", features = ["enable_faketime"]} faster-hex = "0.6" serde_json = "1.0" diff --git a/util/occupied-capacity/Cargo.toml b/util/occupied-capacity/Cargo.toml index 642228ae74..74f04a560f 100644 --- a/util/occupied-capacity/Cargo.toml +++ b/util/occupied-capacity/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-occupied-capacity" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc6" } -ckb-occupied-capacity-core = { path = "core", version = "= 0.111.0-rc6" } +ckb-occupied-capacity-macros = { path = "macros", version = "= 0.111.0-rc7" } +ckb-occupied-capacity-core = { path = "core", version = "= 0.111.0-rc7" } diff --git a/util/occupied-capacity/core/Cargo.toml b/util/occupied-capacity/core/Cargo.toml index ceaccf4192..4a805e32e4 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.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/occupied-capacity/macros/Cargo.toml b/util/occupied-capacity/macros/Cargo.toml index f883a7e468..46e6703215 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.111.0-rc6" +version = "0.111.0-rc7" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -14,4 +14,4 @@ proc-macro = true [dependencies] quote = "1.0" syn = "1.0" -ckb-occupied-capacity-core = { path = "../core", version = "= 0.111.0-rc6" } +ckb-occupied-capacity-core = { path = "../core", version = "= 0.111.0-rc7" } diff --git a/util/proposal-table/Cargo.toml b/util/proposal-table/Cargo.toml index 8924d10e09..66820a989d 100644 --- a/util/proposal-table/Cargo.toml +++ b/util/proposal-table/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-proposal-table" -version = "0.111.0-rc6" +version = "0.111.0-rc7" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc6" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc6" } -ckb-types = { path = "../types", version = "= 0.111.0-rc6" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc7" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc7" } +ckb-types = { path = "../types", version = "= 0.111.0-rc7" } diff --git a/util/rational/Cargo.toml b/util/rational/Cargo.toml index f2b641ed5d..b259065e6a 100644 --- a/util/rational/Cargo.toml +++ b/util/rational/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-rational" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/reward-calculator/Cargo.toml b/util/reward-calculator/Cargo.toml index 5e36f5d6cd..8c4da15150 100644 --- a/util/reward-calculator/Cargo.toml +++ b/util/reward-calculator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-reward-calculator" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,15 +9,15 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc6" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc6" } -ckb-dao = { path = "../dao", version = "= 0.111.0-rc6" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc6" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc6" } -ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc6"} +ckb-types = { path = "../types", version = "= 0.111.0-rc7" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc7" } +ckb-dao = { path = "../dao", version = "= 0.111.0-rc7" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc7" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc7" } +ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc7"} [dev-dependencies] -ckb-db = { path = "../../db", version = "= 0.111.0-rc6" } -ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc6" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc6" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc7" } +ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc7" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc7" } tempfile.workspace = true diff --git a/util/runtime/Cargo.toml b/util/runtime/Cargo.toml index 2eebc595b1..07e017ccea 100644 --- a/util/runtime/Cargo.toml +++ b/util/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-async-runtime" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,6 +10,6 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] tokio = { version = "1", features = ["full"] } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc6" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc6" } -ckb-spawn = { path = "../spawn", version = "= 0.111.0-rc6" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc7" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc7" } +ckb-spawn = { path = "../spawn", version = "= 0.111.0-rc7" } diff --git a/util/rust-unstable-port/Cargo.toml b/util/rust-unstable-port/Cargo.toml index 45144bb2f3..ca1f7a6d49 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.111.0-rc6" +version = "0.111.0-rc7" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" diff --git a/util/snapshot/Cargo.toml b/util/snapshot/Cargo.toml index 06be11906c..af4e3ece60 100644 --- a/util/snapshot/Cargo.toml +++ b/util/snapshot/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-snapshot" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,15 +11,15 @@ 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.111.0-rc6" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc6" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc6" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc6" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc6" } -ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc6" } +ckb-types = { path = "../types", version = "= 0.111.0-rc7" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc7" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc7" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc7" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc7" } +ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc7" } arc-swap = "1.3" -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc6" } -ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc6" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc7" } +ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc7" } ckb-merkle-mountain-range = "0.5.2" [features] diff --git a/util/spawn/Cargo.toml b/util/spawn/Cargo.toml index ba5a65d7f7..5d5307d5e0 100644 --- a/util/spawn/Cargo.toml +++ b/util/spawn/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-spawn" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/stop-handler/Cargo.toml b/util/stop-handler/Cargo.toml index d6cadcef06..e4fd339a60 100644 --- a/util/stop-handler/Cargo.toml +++ b/util/stop-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-stop-handler" -version = "0.111.0-rc6" +version = "0.111.0-rc7" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,6 +10,6 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] parking_lot = "0.12" -ckb-logger = { path = "../logger", version = "= 0.111.0-rc6" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc7" } tokio = { version = "1", features = ["sync", "rt-multi-thread"] } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc6" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc7" } diff --git a/util/systemtime/Cargo.toml b/util/systemtime/Cargo.toml index c146cce184..a081a599ca 100644 --- a/util/systemtime/Cargo.toml +++ b/util/systemtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-systemtime" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/test-chain-utils/Cargo.toml b/util/test-chain-utils/Cargo.toml index 3c3c0086ab..e8120bd1b6 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.111.0-rc6" +version = "0.111.0-rc7" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,18 +9,18 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = {path = "../types", version = "= 0.111.0-rc6"} -ckb-db = { path = "../../db", version = "= 0.111.0-rc6" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc6" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc6" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc6" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc6" } +ckb-types = {path = "../types", version = "= 0.111.0-rc7"} +ckb-db = { path = "../../db", version = "= 0.111.0-rc7" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc7" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc7" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc7" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc7" } lazy_static = "1.3.0" -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc6" } -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc6" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc6" } -ckb-util = { path = "..", version = "= 0.111.0-rc6" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc7" } +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc7" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc7" } +ckb-util = { path = "..", version = "= 0.111.0-rc7" } tempfile.workspace = true [dev-dependencies] -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc6", features = ["enable_faketime"] } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc7", features = ["enable_faketime"] } diff --git a/util/types/Cargo.toml b/util/types/Cargo.toml index fff7e851b4..766b6738ee 100644 --- a/util/types/Cargo.toml +++ b/util/types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-types" -version = "0.111.0-rc6" +version = "0.111.0-rc7" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,17 +10,17 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] molecule = "=0.7.5" -ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc6" } +ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc7" } numext-fixed-uint = { version = "0.1", features = ["support_rand", "support_heapsize", "support_serde"] } bytes = { version="1", features = ["serde"] } merkle-cbt = "0.3" -ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc6" } -ckb-hash = { path = "../hash", version = "= 0.111.0-rc6" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc6" } -ckb-constant = { path = "../constant", version = "= 0.111.0-rc6" } +ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc7" } +ckb-hash = { path = "../hash", version = "= 0.111.0-rc7" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc7" } +ckb-constant = { path = "../constant", version = "= 0.111.0-rc7" } bit-vec = "0.6.3" -ckb-error = { path = "../../error", version = "= 0.111.0-rc6" } -ckb-rational = { path = "../rational", version = "= 0.111.0-rc6" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc7" } +ckb-rational = { path = "../rational", version = "= 0.111.0-rc7" } once_cell = "1.8.0" derive_more = { version = "0.99.0", default-features=false, features = ["display"] } ckb-merkle-mountain-range = "0.5.2" diff --git a/verification/Cargo.toml b/verification/Cargo.toml index 4352509615..16c30f9545 100644 --- a/verification/Cargo.toml +++ b/verification/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,20 +9,20 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } -ckb-script = { path = "../script", version = "= 0.111.0-rc6" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc6" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc6" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } +ckb-script = { path = "../script", version = "= 0.111.0-rc7" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc7" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc7" } lru = "0.7.1" -ckb-traits = { path = "../traits", version = "= 0.111.0-rc6" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc6" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc6" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc6" } -ckb-error = { path = "../error", version = "= 0.111.0-rc6" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc7" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc7" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc7" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc7" } +ckb-error = { path = "../error", version = "= 0.111.0-rc7" } derive_more = { version = "0.99.0", default-features=false, features = ["display"] } -ckb-verification-traits = { path = "./traits", version = "= 0.111.0-rc6" } +ckb-verification-traits = { path = "./traits", version = "= 0.111.0-rc7" } [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc6" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc6" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc6", features=["enable_faketime"]} +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc7" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc7" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc7", features=["enable_faketime"]} diff --git a/verification/contextual/Cargo.toml b/verification/contextual/Cargo.toml index b370323423..7c1217b0d6 100644 --- a/verification/contextual/Cargo.toml +++ b/verification/contextual/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification-contextual" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,27 +9,27 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../../util/types", version = "= 0.111.0-rc6" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc6" } -ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc6" } +ckb-types = { path = "../../util/types", version = "= 0.111.0-rc7" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc7" } +ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc7" } rayon = "1.0" -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc6" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc6" } -ckb-dao = { path = "../../util/dao", version = "= 0.111.0-rc6" } -ckb-dao-utils = { path = "../../util/dao/utils", version = "= 0.111.0-rc6" } -ckb-logger = {path = "../../util/logger", version = "= 0.111.0-rc6"} -ckb-reward-calculator= { path = "../../util/reward-calculator", version = "= 0.111.0-rc6" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc6" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc7" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc7" } +ckb-dao = { path = "../../util/dao", version = "= 0.111.0-rc7" } +ckb-dao-utils = { path = "../../util/dao/utils", version = "= 0.111.0-rc7" } +ckb-logger = {path = "../../util/logger", version = "= 0.111.0-rc7"} +ckb-reward-calculator= { path = "../../util/reward-calculator", version = "= 0.111.0-rc7" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc7" } tokio = { version = "1", features = ["sync", "rt-multi-thread"] } -ckb-async-runtime = { path = "../../util/runtime", version = "= 0.111.0-rc6" } -ckb-verification-traits = { path = "../traits", version = "= 0.111.0-rc6" } -ckb-verification = { path = "..", version = "= 0.111.0-rc6" } +ckb-async-runtime = { path = "../../util/runtime", version = "= 0.111.0-rc7" } +ckb-verification-traits = { path = "../traits", version = "= 0.111.0-rc7" } +ckb-verification = { path = "..", version = "= 0.111.0-rc7" } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc6" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc6" } -ckb-launcher = { path = "../../util/launcher", version = "= 0.111.0-rc6" } -ckb-test-chain-utils = { path = "../../util/test-chain-utils", version = "= 0.111.0-rc6" } -ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc6", features = ["enable_faketime"]} +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc7" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc7" } +ckb-launcher = { path = "../../util/launcher", version = "= 0.111.0-rc7" } +ckb-test-chain-utils = { path = "../../util/test-chain-utils", version = "= 0.111.0-rc7" } +ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc7", features = ["enable_faketime"]} rand = "0.7" diff --git a/verification/traits/Cargo.toml b/verification/traits/Cargo.toml index 4f28e9d79d..9351d30659 100644 --- a/verification/traits/Cargo.toml +++ b/verification/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification-traits" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,4 +10,4 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] bitflags = "1.0" -ckb-error = { path = "../../error", version = "= 0.111.0-rc6" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc7" } diff --git a/wasm-build-test/Cargo.toml b/wasm-build-test/Cargo.toml index 67ea7f2415..a3e1cf4610 100644 --- a/wasm-build-test/Cargo.toml +++ b/wasm-build-test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-wasm-test" -version = "0.111.0-rc6" +version = "0.111.0-rc7" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,8 +9,8 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc6" } -ckb-script = { path = "../script", version = "= 0.111.0-rc6", default-features = false, features = [] } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } +ckb-script = { path = "../script", version = "= 0.111.0-rc7", default-features = false, features = [] } # Prevent this from interfering with workspaces [workspace] From f1e695d287bcc5c7aab9a090de8de0540112ac69 Mon Sep 17 00:00:00 2001 From: mohanson Date: Fri, 30 Jun 2023 15:31:36 +0800 Subject: [PATCH 021/125] chore(script): make update_caller_machine public --- script/src/lib.rs | 1 + script/src/syscalls/spawn.rs | 1 + 2 files changed, 2 insertions(+) diff --git a/script/src/lib.rs b/script/src/lib.rs index 8b2d128039..7f73ca7ee6 100644 --- a/script/src/lib.rs +++ b/script/src/lib.rs @@ -8,6 +8,7 @@ mod verify; mod verify_env; pub use crate::error::{ScriptError, TransactionScriptError}; +pub use crate::syscalls::spawn::update_caller_machine; pub use crate::types::{ CoreMachine, MachineContext, ResumableMachine, ScriptGroup, ScriptGroupType, ScriptVersion, TransactionSnapshot, TransactionState, VerifyResult, VmIsa, VmVersion, diff --git a/script/src/syscalls/spawn.rs b/script/src/syscalls/spawn.rs index 1f8e369d56..78f2c9715d 100644 --- a/script/src/syscalls/spawn.rs +++ b/script/src/syscalls/spawn.rs @@ -292,6 +292,7 @@ pub fn build_child_machine< Ok(machine_child) } +/// Write the data generated by callee back to the caller memory space. pub fn update_caller_machine( caller: &mut Mac, callee_exit_code: i8, From 62e922c11d7280dfee192a7a356047f1f291b9d5 Mon Sep 17 00:00:00 2001 From: ian Date: Mon, 3 Jul 2023 05:31:37 +0200 Subject: [PATCH 022/125] chore: bump to v0.111.0-rc8 --- Cargo.lock | 136 +++++++++---------- Cargo.toml | 8 +- README.md | 2 +- benches/Cargo.toml | 36 ++--- block-filter/Cargo.toml | 14 +- chain/Cargo.toml | 52 +++---- ckb-bin/Cargo.toml | 46 +++---- db-migration/Cargo.toml | 12 +- db-schema/Cargo.toml | 2 +- db/Cargo.toml | 10 +- error/Cargo.toml | 4 +- freezer/Cargo.toml | 12 +- miner/Cargo.toml | 20 +-- network/Cargo.toml | 22 +-- notify/Cargo.toml | 12 +- pow/Cargo.toml | 6 +- resource/Cargo.toml | 6 +- rpc/Cargo.toml | 60 ++++---- script/Cargo.toml | 24 ++-- script/fuzz/Cargo.toml | 10 +- shared/Cargo.toml | 38 +++--- spec/Cargo.toml | 26 ++-- store/Cargo.toml | 20 +-- sync/Cargo.toml | 56 ++++---- test/Cargo.toml | 40 +++--- traits/Cargo.toml | 4 +- tx-pool/Cargo.toml | 44 +++--- util/Cargo.toml | 4 +- util/app-config/Cargo.toml | 24 ++-- util/build-info/Cargo.toml | 2 +- util/chain-iter/Cargo.toml | 6 +- util/channel/Cargo.toml | 2 +- util/constant/Cargo.toml | 2 +- util/crypto/Cargo.toml | 4 +- util/dao/Cargo.toml | 16 +-- util/dao/utils/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/indexer/Cargo.toml | 20 +-- util/instrument/Cargo.toml | 12 +- util/jsonrpc-types/Cargo.toml | 4 +- util/launcher/Cargo.toml | 68 +++++----- util/launcher/migration-template/Cargo.toml | 2 +- util/light-client-protocol-server/Cargo.toml | 32 ++--- util/logger-config/Cargo.toml | 2 +- util/logger-service/Cargo.toml | 10 +- util/logger/Cargo.toml | 2 +- util/memory-tracker/Cargo.toml | 8 +- util/metrics-config/Cargo.toml | 2 +- util/metrics-service/Cargo.toml | 12 +- util/metrics/Cargo.toml | 2 +- util/multisig/Cargo.toml | 8 +- util/network-alert/Cargo.toml | 30 ++-- 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 | 20 +-- util/runtime/Cargo.toml | 8 +- util/rust-unstable-port/Cargo.toml | 2 +- util/snapshot/Cargo.toml | 18 +-- util/spawn/Cargo.toml | 2 +- util/stop-handler/Cargo.toml | 6 +- util/systemtime/Cargo.toml | 2 +- util/test-chain-utils/Cargo.toml | 24 ++-- util/types/Cargo.toml | 16 +-- verification/Cargo.toml | 28 ++-- verification/contextual/Cargo.toml | 38 +++--- verification/traits/Cargo.toml | 4 +- wasm-build-test/Cargo.toml | 6 +- 73 files changed, 606 insertions(+), 606 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c567732bc8..ad60946eca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -395,7 +395,7 @@ dependencies = [ [[package]] name = "ckb" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-bin", "ckb-build-info", @@ -404,7 +404,7 @@ dependencies = [ [[package]] name = "ckb-app-config" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-build-info", "ckb-chain-spec", @@ -433,7 +433,7 @@ dependencies = [ [[package]] name = "ckb-async-runtime" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-logger", "ckb-spawn", @@ -443,7 +443,7 @@ dependencies = [ [[package]] name = "ckb-benches" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-app-config", "ckb-chain", @@ -471,7 +471,7 @@ dependencies = [ [[package]] name = "ckb-bin" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "base64", "ckb-app-config", @@ -511,7 +511,7 @@ dependencies = [ [[package]] name = "ckb-block-filter" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-async-runtime", "ckb-logger", @@ -523,11 +523,11 @@ dependencies = [ [[package]] name = "ckb-build-info" -version = "0.111.0-rc7" +version = "0.111.0-rc8" [[package]] name = "ckb-chain" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -561,7 +561,7 @@ dependencies = [ [[package]] name = "ckb-chain-iter" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-store", "ckb-types", @@ -569,7 +569,7 @@ dependencies = [ [[package]] name = "ckb-chain-spec" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-constant", "ckb-crypto", @@ -589,18 +589,18 @@ dependencies = [ [[package]] name = "ckb-channel" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "crossbeam-channel", ] [[package]] name = "ckb-constant" -version = "0.111.0-rc7" +version = "0.111.0-rc8" [[package]] name = "ckb-crypto" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-fixed-hash", "faster-hex", @@ -612,7 +612,7 @@ dependencies = [ [[package]] name = "ckb-dao" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "byteorder", "ckb-chain-spec", @@ -627,7 +627,7 @@ dependencies = [ [[package]] name = "ckb-dao-utils" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "byteorder", "ckb-error", @@ -636,7 +636,7 @@ dependencies = [ [[package]] name = "ckb-db" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-app-config", "ckb-db-schema", @@ -649,7 +649,7 @@ dependencies = [ [[package]] name = "ckb-db-migration" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-app-config", "ckb-db", @@ -663,11 +663,11 @@ dependencies = [ [[package]] name = "ckb-db-schema" -version = "0.111.0-rc7" +version = "0.111.0-rc8" [[package]] name = "ckb-error" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "anyhow", "ckb-occupied-capacity", @@ -677,7 +677,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-fixed-hash-core", "ckb-fixed-hash-macros", @@ -685,7 +685,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-core" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "faster-hex", "serde", @@ -695,7 +695,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-macros" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-fixed-hash-core", "proc-macro2", @@ -705,7 +705,7 @@ dependencies = [ [[package]] name = "ckb-freezer" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-error", "ckb-logger", @@ -721,7 +721,7 @@ dependencies = [ [[package]] name = "ckb-hash" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "blake2b-ref", "blake2b-rs", @@ -729,7 +729,7 @@ dependencies = [ [[package]] name = "ckb-indexer" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -751,7 +751,7 @@ dependencies = [ [[package]] name = "ckb-instrument" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-chain", "ckb-chain-iter", @@ -764,7 +764,7 @@ dependencies = [ [[package]] name = "ckb-jsonrpc-types" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-types", "faster-hex", @@ -777,7 +777,7 @@ dependencies = [ [[package]] name = "ckb-launcher" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -833,7 +833,7 @@ dependencies = [ [[package]] name = "ckb-light-client-protocol-server" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-app-config", "ckb-chain", @@ -856,14 +856,14 @@ dependencies = [ [[package]] name = "ckb-logger" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "log", ] [[package]] name = "ckb-logger-config" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "serde", "toml", @@ -871,7 +871,7 @@ dependencies = [ [[package]] name = "ckb-logger-service" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "backtrace", "ckb-channel", @@ -890,7 +890,7 @@ dependencies = [ [[package]] name = "ckb-memory-tracker" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-db", "ckb-logger", @@ -912,7 +912,7 @@ dependencies = [ [[package]] name = "ckb-metrics" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "once_cell", "prometheus", @@ -921,14 +921,14 @@ dependencies = [ [[package]] name = "ckb-metrics-config" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "serde", ] [[package]] name = "ckb-metrics-service" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-async-runtime", "ckb-logger", @@ -941,7 +941,7 @@ dependencies = [ [[package]] name = "ckb-migration-template" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "quote", "syn", @@ -949,7 +949,7 @@ dependencies = [ [[package]] name = "ckb-miner" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "base64", "ckb-app-config", @@ -978,7 +978,7 @@ dependencies = [ [[package]] name = "ckb-multisig" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-crypto", "ckb-error", @@ -988,7 +988,7 @@ dependencies = [ [[package]] name = "ckb-network" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "bitflags", "bloom-filters", @@ -1026,7 +1026,7 @@ dependencies = [ [[package]] name = "ckb-network-alert" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1050,7 +1050,7 @@ dependencies = [ [[package]] name = "ckb-notify" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1062,7 +1062,7 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-occupied-capacity-core", "ckb-occupied-capacity-macros", @@ -1070,14 +1070,14 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity-core" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "serde", ] [[package]] name = "ckb-occupied-capacity-macros" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-occupied-capacity-core", "quote", @@ -1086,7 +1086,7 @@ dependencies = [ [[package]] name = "ckb-pow" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "byteorder", "ckb-hash", @@ -1098,7 +1098,7 @@ dependencies = [ [[package]] name = "ckb-proposal-table" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-chain-spec", "ckb-logger", @@ -1107,7 +1107,7 @@ dependencies = [ [[package]] name = "ckb-rational" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "numext-fixed-uint", "proptest", @@ -1116,7 +1116,7 @@ dependencies = [ [[package]] name = "ckb-resource" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-system-scripts", "ckb-types", @@ -1130,7 +1130,7 @@ dependencies = [ [[package]] name = "ckb-reward-calculator" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-chain-spec", "ckb-dao", @@ -1157,7 +1157,7 @@ dependencies = [ [[package]] name = "ckb-rpc" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-app-config", "ckb-chain", @@ -1206,14 +1206,14 @@ dependencies = [ [[package]] name = "ckb-rust-unstable-port" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "is_sorted", ] [[package]] name = "ckb-script" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "byteorder", "ckb-chain-spec", @@ -1238,7 +1238,7 @@ dependencies = [ [[package]] name = "ckb-shared" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "arc-swap", "ckb-async-runtime", @@ -1262,7 +1262,7 @@ dependencies = [ [[package]] name = "ckb-snapshot" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "arc-swap", "ckb-chain-spec", @@ -1278,11 +1278,11 @@ dependencies = [ [[package]] name = "ckb-spawn" -version = "0.111.0-rc7" +version = "0.111.0-rc8" [[package]] name = "ckb-stop-handler" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-channel", "ckb-logger", @@ -1292,7 +1292,7 @@ dependencies = [ [[package]] name = "ckb-store" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -1310,7 +1310,7 @@ dependencies = [ [[package]] name = "ckb-sync" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "bitflags", "ckb-app-config", @@ -1367,11 +1367,11 @@ dependencies = [ [[package]] name = "ckb-systemtime" -version = "0.111.0-rc7" +version = "0.111.0-rc8" [[package]] name = "ckb-test-chain-utils" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-chain-spec", "ckb-dao-utils", @@ -1389,14 +1389,14 @@ dependencies = [ [[package]] name = "ckb-traits" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-types", ] [[package]] name = "ckb-tx-pool" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1432,7 +1432,7 @@ dependencies = [ [[package]] name = "ckb-types" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "bit-vec", "bytes 1.4.0", @@ -1456,7 +1456,7 @@ dependencies = [ [[package]] name = "ckb-util" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-fixed-hash", "linked-hash-map", @@ -1467,7 +1467,7 @@ dependencies = [ [[package]] name = "ckb-verification" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-chain-spec", "ckb-dao", @@ -1487,7 +1487,7 @@ dependencies = [ [[package]] name = "ckb-verification-contextual" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "ckb-async-runtime", "ckb-chain", @@ -1514,7 +1514,7 @@ dependencies = [ [[package]] name = "ckb-verification-traits" -version = "0.111.0-rc7" +version = "0.111.0-rc8" dependencies = [ "bitflags", "ckb-error", diff --git a/Cargo.toml b/Cargo.toml index 6cb0d4da1b..6127ae0c8c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,11 +11,11 @@ repository = "https://github.com/nervosnetwork/ckb" rust-version = "1.67.1" [build-dependencies] -ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc7" } +ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc8" } [dependencies] -ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc7" } -ckb-bin = { path = "ckb-bin", version = "= 0.111.0-rc7" } +ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc8" } +ckb-bin = { path = "ckb-bin", version = "= 0.111.0-rc8" } [dev-dependencies] diff --git a/README.md b/README.md index 8278bb7d0f..d0385f010b 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.111.0--rc7-orange.svg)](https://github.com/nervosnetwork/ckb/releases) +[![Version](https://img.shields.io/badge/version-0.111.0--rc8-orange.svg)](https://github.com/nervosnetwork/ckb/releases) [![Nervos Talk](https://img.shields.io/badge/discuss-on%20Nervos%20Talk-3CC68A.svg)](https://talk.nervos.org/t/where-to-discuss-ckb-and-how-to-ask-for-support/6024) master | develop diff --git a/benches/Cargo.toml b/benches/Cargo.toml index 4da3236968..eef230331d 100644 --- a/benches/Cargo.toml +++ b/benches/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-benches" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,26 +13,26 @@ repository = "https://github.com/nervosnetwork/ckb" [dev-dependencies] criterion = "0.4" -ckb-chain = { path = "../chain", version = "= 0.111.0-rc7" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc7" } -ckb-store = { path = "../store", version = "= 0.111.0-rc7" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc7" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc8" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc8" } +ckb-store = { path = "../store", version = "= 0.111.0-rc8" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc8" } rand = "0.7" -ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc7"} -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc7" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc7" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc7" } +ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc8"} +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc8" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc8" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc8" } ckb-system-scripts = { version = "= 0.5.4" } lazy_static = "1.3.0" -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc7" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc7" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc7" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc7" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc7" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc7" } -ckb-network = { path = "../network", version = "= 0.111.0-rc7" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc7" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc8" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc8" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc8" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc8" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc8" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc8" } +ckb-network = { path = "../network", version = "= 0.111.0-rc8" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc8" } tempfile.workspace = true [[bench]] diff --git a/block-filter/Cargo.toml b/block-filter/Cargo.toml index 9f6c3fc02e..7577ff0ff6 100644 --- a/block-filter/Cargo.toml +++ b/block-filter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-block-filter" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,9 +11,9 @@ repository = "https://github.com/nervosnetwork/ckb" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ckb-store = { path = "../store", version = "= 0.111.0-rc7" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc7" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc7" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc7" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc7" } +ckb-store = { path = "../store", version = "= 0.111.0-rc8" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc8" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc8" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc8" } diff --git a/chain/Cargo.toml b/chain/Cargo.toml index f84213bc0c..e060f22512 100644 --- a/chain/Cargo.toml +++ b/chain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,37 +9,37 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc7" } -ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc7" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc7" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc7" } -ckb-store = { path = "../store", version = "= 0.111.0-rc7" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc7" } -ckb-verification-contextual = { path = "../verification/contextual", version = "= 0.111.0-rc7" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc7" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc7" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc7" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc7" } -ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc7" } -ckb-error = { path = "../error", version = "= 0.111.0-rc7" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc7" } -ckb-rust-unstable-port = { path = "../util/rust-unstable-port", version = "= 0.111.0-rc7" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc7" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8" } +ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc8" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc8" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc8" } +ckb-store = { path = "../store", version = "= 0.111.0-rc8" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc8" } +ckb-verification-contextual = { path = "../verification/contextual", version = "= 0.111.0-rc8" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc8" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc8" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc8" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc8" } +ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc8" } +ckb-error = { path = "../error", version = "= 0.111.0-rc8" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc8" } +ckb-rust-unstable-port = { path = "../util/rust-unstable-port", version = "= 0.111.0-rc8" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc8" } faux = { version = "^0.1", optional = true } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc7" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc7" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc7" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc7", features = ["internal"] } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc7" } -ckb-network = { path = "../network", version = "= 0.111.0-rc7" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc7" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc8" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc8" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc8" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc8", features = ["internal"] } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc8" } +ckb-network = { path = "../network", version = "= 0.111.0-rc8" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc8" } lazy_static = "1.4" tempfile.workspace = true -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc7" ,features = ["enable_faketime"]} +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc8" ,features = ["enable_faketime"]} [features] default = [] diff --git a/ckb-bin/Cargo.toml b/ckb-bin/Cargo.toml index d68969d890..2609ba6cef 100644 --- a/ckb-bin/Cargo.toml +++ b/ckb-bin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-bin" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -14,29 +14,29 @@ serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0" } serde_plain = "0.3.0" toml = "0.5" -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc7" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc7" } -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc7" } -ckb-metrics-service = { path = "../util/metrics-service", version = "= 0.111.0-rc7" } -ckb-util = { path = "../util", version = "= 0.111.0-rc7" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc7" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc7" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc7" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc7" } -ckb-store = { path = "../store", version = "= 0.111.0-rc7" } -ckb-chain-spec = {path = "../spec", version = "= 0.111.0-rc7"} -ckb-miner = { path = "../miner", version = "= 0.111.0-rc7" } -ckb-network = { path = "../network", version = "= 0.111.0-rc7"} -ckb-resource = { path = "../resource", version = "= 0.111.0-rc7"} +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc8" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8" } +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc8" } +ckb-metrics-service = { path = "../util/metrics-service", version = "= 0.111.0-rc8" } +ckb-util = { path = "../util", version = "= 0.111.0-rc8" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc8" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc8" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc8" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc8" } +ckb-store = { path = "../store", version = "= 0.111.0-rc8" } +ckb-chain-spec = {path = "../spec", version = "= 0.111.0-rc8"} +ckb-miner = { path = "../miner", version = "= 0.111.0-rc8" } +ckb-network = { path = "../network", version = "= 0.111.0-rc8"} +ckb-resource = { path = "../resource", version = "= 0.111.0-rc8"} ctrlc = { version = "3.1", features = ["termination"] } -ckb-instrument = { path = "../util/instrument", version = "= 0.111.0-rc7", features = ["progress_bar"] } -ckb-build-info = { path = "../util/build-info", version = "= 0.111.0-rc7" } -ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc7" } -ckb-chain-iter = { path = "../util/chain-iter", version = "= 0.111.0-rc7" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc7" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc7" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc7" } +ckb-instrument = { path = "../util/instrument", version = "= 0.111.0-rc8", features = ["progress_bar"] } +ckb-build-info = { path = "../util/build-info", version = "= 0.111.0-rc8" } +ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc8" } +ckb-chain-iter = { path = "../util/chain-iter", version = "= 0.111.0-rc8" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc8" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc8" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc8" } base64 = "0.21.0" tempfile.workspace = true rayon = "1.0" diff --git a/db-migration/Cargo.toml b/db-migration/Cargo.toml index fbf20491a8..e200343f21 100644 --- a/db-migration/Cargo.toml +++ b/db-migration/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db-migration" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,16 +11,16 @@ 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.111.0-rc7" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc7" } -ckb-error = { path = "../error", version = "= 0.111.0-rc7" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc7" } +ckb-db = { path = "../db", version = "= 0.111.0-rc8" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8" } +ckb-error = { path = "../error", version = "= 0.111.0-rc8" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc8" } indicatif = "0.16" console = ">=0.9.1, <1.0.0" [dev-dependencies] tempfile.workspace = true -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc7" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc8" } [features] portable = ["ckb-db/portable"] diff --git a/db-schema/Cargo.toml b/db-schema/Cargo.toml index 88e5d0ed82..00baa7c94a 100644 --- a/db-schema/Cargo.toml +++ b/db-schema/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db-schema" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/db/Cargo.toml b/db/Cargo.toml index 51041a264c..96ef02806d 100644 --- a/db/Cargo.toml +++ b/db/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,12 +9,12 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc7" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc7" } -ckb-error = { path = "../error", version = "= 0.111.0-rc7" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc8" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8" } +ckb-error = { path = "../error", version = "= 0.111.0-rc8" } libc = "0.2" rocksdb = { package = "ckb-rocksdb", version ="=0.20.0", features = ["snappy"], default-features = false } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc7" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc8" } [dev-dependencies] tempfile.workspace = true diff --git a/error/Cargo.toml b/error/Cargo.toml index 755cae5d2c..7b85bde530 100644 --- a/error/Cargo.toml +++ b/error/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-error" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,5 +11,5 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] thiserror = "1.0.22" anyhow = "1.0.34" -ckb-occupied-capacity = { path = "../util/occupied-capacity", version = "= 0.111.0-rc7" } +ckb-occupied-capacity = { path = "../util/occupied-capacity", version = "= 0.111.0-rc8" } derive_more = { version = "0.99.0", default-features = false, features = ["display"] } diff --git a/freezer/Cargo.toml b/freezer/Cargo.toml index 6684fbcae3..1aa127f419 100644 --- a/freezer/Cargo.toml +++ b/freezer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-freezer" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,11 +10,11 @@ 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.111.0-rc7" } -ckb-error = { path = "../error", version = "= 0.111.0-rc7" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc7" } -ckb-util = { path = "../util", version = "= 0.111.0-rc7" } -ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc7" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } +ckb-error = { path = "../error", version = "= 0.111.0-rc8" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8" } +ckb-util = { path = "../util", version = "= 0.111.0-rc8" } +ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc8" } fs2 = "0.4.3" fail = "0.4" snap = "1" diff --git a/miner/Cargo.toml b/miner/Cargo.toml index 02b6762325..6e03e57e1f 100644 --- a/miner/Cargo.toml +++ b/miner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-miner" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,23 +9,23 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc7" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc7" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc7" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc7" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc7" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc8" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc8" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc8" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc8" } rand = "0.7" rand_distr = "0.3" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc7" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc8" } hyper = { version = "0.14", features = ["client", "http2", "http1", "server"] } hyper-tls = "0.5" futures = "0.3" lru = "0.7.1" -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc7" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc7" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc8" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc8" } indicatif = "0.16" console = ">=0.9.1, <1.0.0" eaglesong = "0.1" diff --git a/network/Cargo.toml b/network/Cargo.toml index d081200ae5..88309b4f4c 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-network" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,28 +11,28 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] rand = "0.7" serde = { version = "1.0", features = ["derive"] } -ckb-util = { path = "../util", version = "= 0.111.0-rc7" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc7" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc7" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc7" } -ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc7"} +ckb-util = { path = "../util", version = "= 0.111.0-rc8" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc8" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc8" } +ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc8"} tokio = { version = "1", features = ["sync", "macros"] } tokio-util = { version = "0.7", features = ["codec"] } futures = "0.3" -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc7"} +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc8"} lazy_static = { version = "1.3.0", optional = true } bs58 = { version = "0.4.0", optional = true } sentry = { version = "0.26.0", optional = true } faster-hex = { version = "0.6", optional = true } -ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc7"} +ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc8"} secp256k1 = {version = "0.24", features = ["recovery"], optional = true } trust-dns-resolver = { version = "0.20", optional = true } snap = "1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } ipnetwork = "0.18" serde_json = "1.0" bloom-filters = "0.1" -ckb-spawn = { path = "../util/spawn", version = "= 0.111.0-rc7" } +ckb-spawn = { path = "../util/spawn", version = "= 0.111.0-rc8" } socket2 = "0.4" bitflags = "1.0" @@ -48,7 +48,7 @@ criterion = "0.4" proptest = "1.0" num_cpus = "1.10" once_cell = "1.8.0" -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc7", features = ["enable_faketime"]} +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc8", features = ["enable_faketime"]} [[bench]] name = "peer_store" diff --git a/notify/Cargo.toml b/notify/Cargo.toml index 979c99bc8a..78382aa2b9 100644 --- a/notify/Cargo.toml +++ b/notify/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-notify" -version = "0.111.0-rc7" +version = "0.111.0-rc8" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc7" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc7" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc7" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc7" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc8" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc8" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc8" } tokio = { version = "1", features = ["sync"] } [dev-dependencies] diff --git a/pow/Cargo.toml b/pow/Cargo.toml index b5980535f8..e5c3c12fd6 100644 --- a/pow/Cargo.toml +++ b/pow/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-pow" -version = "0.111.0-rc7" +version = "0.111.0-rc8" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,8 +10,8 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc7"} +ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc8"} serde = { version = "1.0", features = ["derive"] } eaglesong = "0.1" log = "0.4" diff --git a/resource/Cargo.toml b/resource/Cargo.toml index 18a9784df8..862c97c474 100644 --- a/resource/Cargo.toml +++ b/resource/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-resource" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,13 +13,13 @@ repository = "https://github.com/nervosnetwork/ckb" phf = "0.8.0" includedir = "0.6.0" serde = { version = "1.0", features = ["derive"] } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } ckb-system-scripts = { version = "= 0.5.4" } [build-dependencies] includedir_codegen = "0.6.0" walkdir = "2.1.4" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } ckb-system-scripts = { version = "= 0.5.4" } [dev-dependencies] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 6b3ed98458..a9bf1b717e 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-rpc" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,19 +9,19 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc7" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } -ckb-network = { path = "../network", version = "= 0.111.0-rc7" } -ckb-notify = { path = "../notify", version = "= 0.111.0-rc7" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc7" } -ckb-store = { path = "../store", version = "= 0.111.0-rc7" } -ckb-sync = { path = "../sync", version = "= 0.111.0-rc7" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc7" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc7"} -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc7"} -ckb-network-alert = { path = "../util/network-alert", version = "= 0.111.0-rc7" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc7" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc7" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc8" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } +ckb-network = { path = "../network", version = "= 0.111.0-rc8" } +ckb-notify = { path = "../notify", version = "= 0.111.0-rc8" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc8" } +ckb-store = { path = "../store", version = "= 0.111.0-rc8" } +ckb-sync = { path = "../sync", version = "= 0.111.0-rc8" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc8" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8"} +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc8"} +ckb-network-alert = { path = "../util/network-alert", version = "= 0.111.0-rc8" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc8" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc8" } jsonrpc-core = "18.0" jsonrpc-derive = "18.0" jsonrpc-http-server = "18.0" @@ -30,27 +30,27 @@ jsonrpc-ws-server = "18.0" jsonrpc-server-utils = "18.0" jsonrpc-pubsub = "18.0" serde_json = "1.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc7" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc7" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc7" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc7" } -ckb-util = { path = "../util", version = "= 0.111.0-rc7" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc7" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc7" } -ckb-error = { path = "../error", version = "= 0.111.0-rc7" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc7" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc7" } -ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc7" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc7" } -ckb-indexer = { path = "../util/indexer", version = "= 0.111.0-rc7" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc8" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc8" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc8" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc8" } +ckb-util = { path = "../util", version = "= 0.111.0-rc8" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc8" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc8" } +ckb-error = { path = "../error", version = "= 0.111.0-rc8" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc8" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc8" } +ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc8" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc8" } +ckb-indexer = { path = "../util/indexer", version = "= 0.111.0-rc8" } itertools = "0.10.5" tokio = "1" [dev-dependencies] reqwest = { version = "0.11.4", features = ["blocking", "json"] } serde = { version = "1.0", features = ["derive"] } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc7" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc7" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc8" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc8" } tempfile.workspace = true pretty_assertions = "1.3.0" -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc7" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc8" } diff --git a/script/Cargo.toml b/script/Cargo.toml index c972a5696b..b16fb6ed8d 100644 --- a/script/Cargo.toml +++ b/script/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-script" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -18,24 +18,24 @@ logging = ["ckb-logger"] flatmemory = [] [dependencies] -ckb-traits = { path = "../traits", version = "= 0.111.0-rc7" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc8" } byteorder = "1.3.1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc7" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc8" } ckb-vm = { version = "=0.24.0", default-features = false } faster-hex = "0.6" -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc7", optional = true } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8", optional = true } serde = { version = "1.0", features = ["derive"] } -ckb-error = { path = "../error", version = "= 0.111.0-rc7" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc7" } +ckb-error = { path = "../error", version = "= 0.111.0-rc8" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc8" } [dev-dependencies] proptest = "1.0" -ckb-db = { path = "../db", version = "= 0.111.0-rc7" } -ckb-store = { path = "../store", version = "= 0.111.0-rc7" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc7" } +ckb-db = { path = "../db", version = "= 0.111.0-rc8" } +ckb-store = { path = "../store", version = "= 0.111.0-rc8" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc8" } tiny-keccak = { version = "2.0", features = ["sha3"] } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc7" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc7" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc8" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc8" } tempfile.workspace = true rand = "0.8.4" diff --git a/script/fuzz/Cargo.toml b/script/fuzz/Cargo.toml index a876d22c4e..67c7b0901c 100644 --- a/script/fuzz/Cargo.toml +++ b/script/fuzz/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-script-fuzz" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -15,10 +15,10 @@ cargo-fuzz = true [dependencies] arbitrary = { version = "1", features = ["derive"] } libfuzzer-sys = { version="0.4.0", features=["arbitrary-derive"] } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc7" } -ckb-types = { path = "../../util/types", version = "= 0.111.0-rc7" } -ckb-script = { path = "../../script", version = "= 0.111.0-rc7" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc7" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc8" } +ckb-types = { path = "../../util/types", version = "= 0.111.0-rc8" } +ckb-script = { path = "../../script", version = "= 0.111.0-rc8" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc8" } # Prevent this from interfering with workspaces [workspace] diff --git a/shared/Cargo.toml b/shared/Cargo.toml index acbba92530..f8f7677061 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-shared" -version = "0.111.0-rc7" +version = "0.111.0-rc8" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,27 +9,27 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc7" } -ckb-store = { path = "../store", version = "= 0.111.0-rc7" } -ckb-db = { path = "../db", version = "= 0.111.0-rc7" } -ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc7" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc8" } +ckb-store = { path = "../store", version = "= 0.111.0-rc8" } +ckb-db = { path = "../db", version = "= 0.111.0-rc8" } +ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc8" } arc-swap = "1.3" -ckb-error = { path = "../error", version = "= 0.111.0-rc7" } -ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc7" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc7" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc7" } -ckb-notify = { path = "../notify", version = "= 0.111.0-rc7" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc7" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc7" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc7" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc7" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc7" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc7" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc7" } +ckb-error = { path = "../error", version = "= 0.111.0-rc8" } +ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc8" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc8" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc8" } +ckb-notify = { path = "../notify", version = "= 0.111.0-rc8" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc8" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc8" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc8" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc8" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc8" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc8" } [dev-dependencies] -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc7", features = ["enable_faketime"] } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc8", features = ["enable_faketime"] } [features] portable = ["ckb-db/portable", "ckb-store/portable", "ckb-tx-pool/portable"] diff --git a/spec/Cargo.toml b/spec/Cargo.toml index ee4432c4af..4e03694634 100644 --- a/spec/Cargo.toml +++ b/spec/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain-spec" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,15 +11,15 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] serde = { version = "1.0", features = ["derive"] } toml = "0.5" -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc7" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc7" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc7" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc7" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc7" } -ckb-rational = { path = "../util/rational", version = "= 0.111.0-rc7" } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc7"} -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc7"} -ckb-error = { path = "../error", version = "= 0.111.0-rc7" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc7" } -ckb-util = { path = "../util", version = "= 0.111.0-rc7" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc8" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc8" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc8" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc8" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc8" } +ckb-rational = { path = "../util/rational", version = "= 0.111.0-rc8" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc8"} +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc8"} +ckb-error = { path = "../error", version = "= 0.111.0-rc8" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc8" } +ckb-util = { path = "../util", version = "= 0.111.0-rc8" } diff --git a/store/Cargo.toml b/store/Cargo.toml index 16304ff502..5341ddd31b 100644 --- a/store/Cargo.toml +++ b/store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-store" -version = "0.111.0-rc7" +version = "0.111.0-rc8" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,16 +9,16 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } -ckb-db = { path = "../db", version = "= 0.111.0-rc7" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc7" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } +ckb-db = { path = "../db", version = "= 0.111.0-rc8" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc8" } lru = "0.7.1" -ckb-traits = { path = "../traits", version = "= 0.111.0-rc7" } -ckb-util = { path = "../util", version = "= 0.111.0-rc7" } -ckb-error = { path = "../error", version = "= 0.111.0-rc7" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc7" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc7" } -ckb-freezer = { path = "../freezer", version = "= 0.111.0-rc7" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc8" } +ckb-util = { path = "../util", version = "= 0.111.0-rc8" } +ckb-error = { path = "../error", version = "= 0.111.0-rc8" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc8" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc8" } +ckb-freezer = { path = "../freezer", version = "= 0.111.0-rc8" } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] diff --git a/sync/Cargo.toml b/sync/Cargo.toml index 4b57e84355..0bdb2ecf62 100644 --- a/sync/Cargo.toml +++ b/sync/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-sync" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,48 +9,48 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-chain = { path = "../chain", version = "= 0.111.0-rc7" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc7" } -ckb-store = { path = "../store", version = "= 0.111.0-rc7" } -ckb-app-config = {path = "../util/app-config", version = "= 0.111.0-rc7"} -ckb-types = {path = "../util/types", version = "= 0.111.0-rc7"} -ckb-network = { path = "../network", version = "= 0.111.0-rc7" } -ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc7"} -ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc7"} -ckb-util = { path = "../util", version = "= 0.111.0-rc7" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc7" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc7" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc7" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc7" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc7" } -ckb-error = {path = "../error", version = "= 0.111.0-rc7"} -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc7" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc8" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc8" } +ckb-store = { path = "../store", version = "= 0.111.0-rc8" } +ckb-app-config = {path = "../util/app-config", version = "= 0.111.0-rc8"} +ckb-types = {path = "../util/types", version = "= 0.111.0-rc8"} +ckb-network = { path = "../network", version = "= 0.111.0-rc8" } +ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc8"} +ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc8"} +ckb-util = { path = "../util", version = "= 0.111.0-rc8" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc8" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc8" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc8" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc8" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc8" } +ckb-error = {path = "../error", version = "= 0.111.0-rc8"} +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc8" } sentry = { version = "0.26.0", optional = true } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc7" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc7" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc7" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc8" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc8" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc8" } tokio = { version = "1", features = ["sync"] } lru = "0.7.1" futures = "0.3" governor = "0.3.1" tempfile.workspace = true -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc7" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc8" } bitflags = "1.0" dashmap = "4.0" keyed_priority_queue = "0.3" sled = "0.34.7" [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc7" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc8" } rand = "0.7" -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc7" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc7" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc7" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc7", features = ["mock"] } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc7" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc8" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc8" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc8" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc8", features = ["mock"] } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc8" } faux = "^0.1" once_cell = "1.8.0" -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc7" , features = ["enable_faketime"]} +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc8" , features = ["enable_faketime"]} [features] default = [] diff --git a/test/Cargo.toml b/test/Cargo.toml index a9be74e2e0..d3ec359d14 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-test" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,28 +11,28 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] clap = { version = "=3.2.21" } toml = "0.5.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc7" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc7" } -ckb-network = { path = "../network", version = "= 0.111.0-rc7" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc7" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc7" } -ckb-util = { path = "../util", version = "= 0.111.0-rc7" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc7" } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc7" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc7" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc7" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc7" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc7" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc7" } -ckb-logger-config = { path = "../util/logger-config", version = "= 0.111.0-rc7" } -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc7" } -ckb-error = { path = "../error", version = "= 0.111.0-rc7" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc7" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc8" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc8" } +ckb-network = { path = "../network", version = "= 0.111.0-rc8" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc8" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc8" } +ckb-util = { path = "../util", version = "= 0.111.0-rc8" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc8" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc8" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc8" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc8" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc8" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc8" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8" } +ckb-logger-config = { path = "../util/logger-config", version = "= 0.111.0-rc8" } +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc8" } +ckb-error = { path = "../error", version = "= 0.111.0-rc8" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc8" } tempfile = "3" reqwest = { version = "0.11.4", features = ["blocking", "json"] } rand = "0.7" -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc7" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc8" } serde_json = "1.0" lazy_static = "1.4.0" byteorder = "1.3.1" diff --git a/traits/Cargo.toml b/traits/Cargo.toml index 90d2dee95c..17d4053882 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-traits" -version = "0.111.0-rc7" +version = "0.111.0-rc8" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc7" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } diff --git a/tx-pool/Cargo.toml b/tx-pool/Cargo.toml index c2a665ef01..1ed8428ccf 100644 --- a/tx-pool/Cargo.toml +++ b/tx-pool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-tx-pool" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,27 +11,27 @@ 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.111.0-rc7" } -ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc7"} -ckb-verification = { path = "../verification", version = "= 0.111.0-rc7" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc7"} +ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } +ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc8"} +ckb-verification = { path = "../verification", version = "= 0.111.0-rc8" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc8"} lru = "0.7.1" -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc7" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc7" } -ckb-store = { path = "../store", version = "= 0.111.0-rc7" } -ckb-util = { path = "../util", version = "= 0.111.0-rc7" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc7" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc7" } -ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc7" } -ckb-error = { path = "../error", version = "= 0.111.0-rc7" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc8" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc8" } +ckb-store = { path = "../store", version = "= 0.111.0-rc8" } +ckb-util = { path = "../util", version = "= 0.111.0-rc8" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc8" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc8" } +ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc8" } +ckb-error = { path = "../error", version = "= 0.111.0-rc8" } tokio = { version = "1", features = ["sync", "process"] } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc7" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc7" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc7" } -ckb-network = { path = "../network", version = "= 0.111.0-rc7" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc7" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc7" } -ckb-db = { path = "../db", version = "= 0.111.0-rc7" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc8" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc8" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc8" } +ckb-network = { path = "../network", version = "= 0.111.0-rc8" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc8" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc8" } +ckb-db = { path = "../db", version = "= 0.111.0-rc8" } sentry = { version = "0.26.0", optional = true } serde_json = "1.0" rand = "0.8.4" @@ -42,8 +42,8 @@ rustc-hash = "1.1" [dev-dependencies] tempfile.workspace = true -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc7" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc7", features = ["enable_faketime"]} +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc8" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc8", features = ["enable_faketime"]} [features] default = [] diff --git a/util/Cargo.toml b/util/Cargo.toml index 4b5948cbf5..d4d2079dd0 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-util" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -15,7 +15,7 @@ regex = "1.1.6" once_cell = "1.8.0" [dev-dependencies] -ckb-fixed-hash = { path = "fixed-hash", version = "= 0.111.0-rc7" } +ckb-fixed-hash = { path = "fixed-hash", version = "= 0.111.0-rc8" } [features] deadlock_detection = ["parking_lot/deadlock_detection"] diff --git a/util/app-config/Cargo.toml b/util/app-config/Cargo.toml index 4876c3755b..d45270faba 100644 --- a/util/app-config/Cargo.toml +++ b/util/app-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-app-config" -version = "0.111.0-rc7" +version = "0.111.0-rc8" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -15,20 +15,20 @@ serde_plain = "0.3.0" serde_json = "1.0" toml = "0.5" path-clean = "0.1.0" -ckb-logger = { path = "../../util/logger", version = "= 0.111.0-rc7" } -ckb-logger-config = { path = "../../util/logger-config", version = "= 0.111.0-rc7" } -ckb-metrics-config = { path = "../../util/metrics-config", version = "= 0.111.0-rc7" } -ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc7"} -ckb-jsonrpc-types = {path = "../jsonrpc-types", version = "= 0.111.0-rc7"} -ckb-pow = { path = "../../pow", version = "= 0.111.0-rc7" } -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc7"} -ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc7" } -ckb-types = { path = "../types", version = "= 0.111.0-rc7" } +ckb-logger = { path = "../../util/logger", version = "= 0.111.0-rc8" } +ckb-logger-config = { path = "../../util/logger-config", version = "= 0.111.0-rc8" } +ckb-metrics-config = { path = "../../util/metrics-config", version = "= 0.111.0-rc8" } +ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc8"} +ckb-jsonrpc-types = {path = "../jsonrpc-types", version = "= 0.111.0-rc8"} +ckb-pow = { path = "../../pow", version = "= 0.111.0-rc8" } +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc8"} +ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc8" } +ckb-types = { path = "../types", version = "= 0.111.0-rc8" } secio = { version="0.5.7", package="tentacle-secio" } multiaddr = { version="0.3.0", package="tentacle-multiaddr" } rand = "0.7" sentry = { version = "0.26.0", optional = true } -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc7" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc8" } url = { version = "2.2.2", features = ["serde"] } ubyte = { version = "0.10", features = ["serde"] } @@ -37,4 +37,4 @@ with_sentry = ["sentry"] [dev-dependencies] tempfile.workspace = true -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc7" ,features = ["enable_faketime"]} +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc8" ,features = ["enable_faketime"]} diff --git a/util/build-info/Cargo.toml b/util/build-info/Cargo.toml index ca7e8978fc..69e931d97a 100644 --- a/util/build-info/Cargo.toml +++ b/util/build-info/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-build-info" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/chain-iter/Cargo.toml b/util/chain-iter/Cargo.toml index f4e0d0b495..9c6eeda960 100644 --- a/util/chain-iter/Cargo.toml +++ b/util/chain-iter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain-iter" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc7" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc7" } +ckb-types = { path = "../types", version = "= 0.111.0-rc8" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc8" } diff --git a/util/channel/Cargo.toml b/util/channel/Cargo.toml index 94e1d1839a..f06d027bd6 100644 --- a/util/channel/Cargo.toml +++ b/util/channel/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-channel" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/constant/Cargo.toml b/util/constant/Cargo.toml index 09eadbad89..7549f9914c 100644 --- a/util/constant/Cargo.toml +++ b/util/constant/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-constant" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/crypto/Cargo.toml b/util/crypto/Cargo.toml index 8c7838f925..2d57bb7469 100644 --- a/util/crypto/Cargo.toml +++ b/util/crypto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-crypto" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc7" } +ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc8" } lazy_static = "1.3" secp256k1 = { version = "0.24", features = ["recovery"], optional = true } thiserror = "1.0.22" diff --git a/util/dao/Cargo.toml b/util/dao/Cargo.toml index a951c09c99..a2b19cccc9 100644 --- a/util/dao/Cargo.toml +++ b/util/dao/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-dao" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,13 +10,13 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../types", version = "= 0.111.0-rc7" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc7" } -ckb-dao-utils = { path = "./utils", version = "= 0.111.0-rc7" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc7" } +ckb-types = { path = "../types", version = "= 0.111.0-rc8" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc8" } +ckb-dao-utils = { path = "./utils", version = "= 0.111.0-rc8" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc8" } [dev-dependencies] -ckb-db = { path = "../../db", version = "= 0.111.0-rc7" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc7" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc7" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc8" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc8" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc8" } tempfile.workspace = true diff --git a/util/dao/utils/Cargo.toml b/util/dao/utils/Cargo.toml index 8c2b633c7d..376db2274d 100644 --- a/util/dao/utils/Cargo.toml +++ b/util/dao/utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-dao-utils" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,5 +10,5 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../../types", version = "= 0.111.0-rc7" } -ckb-error = { path = "../../../error", version = "= 0.111.0-rc7" } +ckb-types = { path = "../../types", version = "= 0.111.0-rc8" } +ckb-error = { path = "../../../error", version = "= 0.111.0-rc8" } diff --git a/util/fixed-hash/Cargo.toml b/util/fixed-hash/Cargo.toml index 045116bade..1caec14fea 100644 --- a/util/fixed-hash/Cargo.toml +++ b/util/fixed-hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-fixed-hash" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -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.111.0-rc7" } -ckb-fixed-hash-macros = { path = "macros", version = "= 0.111.0-rc7" } +ckb-fixed-hash-core = { path = "core", version = "= 0.111.0-rc8" } +ckb-fixed-hash-macros = { path = "macros", version = "= 0.111.0-rc8" } diff --git a/util/fixed-hash/core/Cargo.toml b/util/fixed-hash/core/Cargo.toml index a77a86d24e..6522097ceb 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.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/fixed-hash/macros/Cargo.toml b/util/fixed-hash/macros/Cargo.toml index fbdb95a8d3..776d8df6d3 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.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -12,7 +12,7 @@ repository = "https://github.com/nervosnetwork/ckb" proc-macro = true [dependencies] -ckb-fixed-hash-core = { path = "../core", version = "= 0.111.0-rc7" } +ckb-fixed-hash-core = { path = "../core", version = "= 0.111.0-rc8" } quote = "1.0" syn = "1.0" proc-macro2 = "1.0" diff --git a/util/hash/Cargo.toml b/util/hash/Cargo.toml index 2f494300b8..cfb408265b 100644 --- a/util/hash/Cargo.toml +++ b/util/hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-hash" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/indexer/Cargo.toml b/util/indexer/Cargo.toml index a2c72958ab..9b24d3a973 100644 --- a/util/indexer/Cargo.toml +++ b/util/indexer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-indexer" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,15 +13,15 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] thiserror = "1.0" rocksdb = { package = "ckb-rocksdb", version ="=0.20.0", features = ["snappy"], default-features = false } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc7" } -ckb-types = { path = "../types", version = "= 0.111.0-rc7" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc7" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc7" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc7" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc7" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc7" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc7" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc7" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc8" } +ckb-types = { path = "../types", version = "= 0.111.0-rc8" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc8" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc8" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc8" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc8" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc8" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc8" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc8" } rhai = { version = "1.10.0", features = ["no_function", "no_float", "no_module", "sync"]} serde_json = "1.0" numext-fixed-uint = "0.1" diff --git a/util/instrument/Cargo.toml b/util/instrument/Cargo.toml index c2ec31c770..a1bda42237 100644 --- a/util/instrument/Cargo.toml +++ b/util/instrument/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-instrument" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc7" } -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc7" } -ckb-chain-iter = { path = "../chain-iter", version = "= 0.111.0-rc7" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc7" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc7" } +ckb-types = { path = "../types", version = "= 0.111.0-rc8" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc8" } +ckb-chain-iter = { path = "../chain-iter", version = "= 0.111.0-rc8" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc8" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc8" } serde_json = "1.0" indicatif = { version = "0.16", optional = true } diff --git a/util/jsonrpc-types/Cargo.toml b/util/jsonrpc-types/Cargo.toml index 2b98d7e67c..d1c8694207 100644 --- a/util/jsonrpc-types/Cargo.toml +++ b/util/jsonrpc-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-jsonrpc-types" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,7 +9,7 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc7" } +ckb-types = { path = "../types", version = "= 0.111.0-rc8" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" faster-hex = "0.6" diff --git a/util/launcher/Cargo.toml b/util/launcher/Cargo.toml index cee937b263..d9577d93db 100644 --- a/util/launcher/Cargo.toml +++ b/util/launcher/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-launcher" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,44 +11,44 @@ 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.111.0-rc7" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc7" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc7" } -ckb-migration-template = { path = "migration-template", version = "= 0.111.0-rc7" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc7" } -ckb-db-migration = { path = "../../db-migration", version = "= 0.111.0-rc7" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc7" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc7" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc7" } -ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc7" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc7" } -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc7" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc7" } -ckb-network = { path = "../../network", version = "= 0.111.0-rc7"} -ckb-rpc = { path = "../../rpc", version = "= 0.111.0-rc7"} -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc7"} -ckb-network-alert = { path = "../network-alert", version = "= 0.111.0-rc7" } -ckb-sync = { path = "../../sync", version = "= 0.111.0-rc7"} -ckb-verification = { path = "../../verification", version = "= 0.111.0-rc7" } -ckb-verification-traits = { path = "../../verification/traits", version = "= 0.111.0-rc7" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc7" } -ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc7" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc7" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc7" } -ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc7" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc7" } -ckb-snapshot = { path = "../snapshot", version = "= 0.111.0-rc7" } -ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc7" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc7" } -ckb-light-client-protocol-server = { path = "../light-client-protocol-server", version = "= 0.111.0-rc7" } -ckb-block-filter = { path = "../../block-filter", version = "= 0.111.0-rc7" } -ckb-hash = { path = "../hash", version = "= 0.111.0-rc7" } +ckb-types = { path = "../types", version = "= 0.111.0-rc8" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc8" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc8" } +ckb-migration-template = { path = "migration-template", version = "= 0.111.0-rc8" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc8" } +ckb-db-migration = { path = "../../db-migration", version = "= 0.111.0-rc8" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc8" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc8" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc8" } +ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc8" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc8" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc8" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc8" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc8"} +ckb-rpc = { path = "../../rpc", version = "= 0.111.0-rc8"} +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc8"} +ckb-network-alert = { path = "../network-alert", version = "= 0.111.0-rc8" } +ckb-sync = { path = "../../sync", version = "= 0.111.0-rc8"} +ckb-verification = { path = "../../verification", version = "= 0.111.0-rc8" } +ckb-verification-traits = { path = "../../verification/traits", version = "= 0.111.0-rc8" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc8" } +ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc8" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc8" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc8" } +ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc8" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc8" } +ckb-snapshot = { path = "../snapshot", version = "= 0.111.0-rc8" } +ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc8" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc8" } +ckb-light-client-protocol-server = { path = "../light-client-protocol-server", version = "= 0.111.0-rc8" } +ckb-block-filter = { path = "../../block-filter", version = "= 0.111.0-rc8" } +ckb-hash = { path = "../hash", version = "= 0.111.0-rc8" } num_cpus = "1.10" once_cell = "1.8.0" tempfile.workspace = true [dev-dependencies] -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc7", features = ["enable_faketime"] } +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc8", features = ["enable_faketime"] } [features] with_sentry = [ "ckb-sync/with_sentry", "ckb-network/with_sentry", "ckb-app-config/with_sentry" ] diff --git a/util/launcher/migration-template/Cargo.toml b/util/launcher/migration-template/Cargo.toml index 467047c6e0..dc8d17308f 100644 --- a/util/launcher/migration-template/Cargo.toml +++ b/util/launcher/migration-template/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-migration-template" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/light-client-protocol-server/Cargo.toml b/util/light-client-protocol-server/Cargo.toml index e36929ff69..00fa1481ef 100644 --- a/util/light-client-protocol-server/Cargo.toml +++ b/util/light-client-protocol-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-light-client-protocol-server" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,23 +9,23 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-network = { path = "../../network", version = "= 0.111.0-rc7" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc7" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc7" } -ckb-types = { path = "../types", version = "= 0.111.0-rc7" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc7" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc8" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc8" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc8" } +ckb-types = { path = "../types", version = "= 0.111.0-rc8" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc8" } ckb-merkle-mountain-range = "0.5.2" -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc7"} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc8"} [dev-dependencies] -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc7" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc7" } -ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc7" } -ckb-launcher = { path = "../launcher", version = "= 0.111.0-rc7" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc7" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc7" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc7" } -ckb-test-chain-utils = { path = "../test-chain-utils", version = "= 0.111.0-rc7" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc8" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc8" } +ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc8" } +ckb-launcher = { path = "../launcher", version = "= 0.111.0-rc8" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc8" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc8" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc8" } +ckb-test-chain-utils = { path = "../test-chain-utils", version = "= 0.111.0-rc8" } tempfile.workspace = true -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc7", features = ["enable_faketime"]} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc8", features = ["enable_faketime"]} tokio = "1.20" diff --git a/util/logger-config/Cargo.toml b/util/logger-config/Cargo.toml index 2c6b422e7a..579aba7997 100644 --- a/util/logger-config/Cargo.toml +++ b/util/logger-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger-config" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/logger-service/Cargo.toml b/util/logger-service/Cargo.toml index 408d4cee79..9986345cc9 100644 --- a/util/logger-service/Cargo.toml +++ b/util/logger-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger-service" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -9,9 +9,9 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-util = { path = "..", version = "= 0.111.0-rc7" } -ckb-logger-config = { path = "../logger-config", version = "= 0.111.0-rc7" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc7" } +ckb-util = { path = "..", version = "= 0.111.0-rc8" } +ckb-logger-config = { path = "../logger-config", version = "= 0.111.0-rc8" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc8" } yansi = "0.5" log = "0.4" env_logger = "0.6" @@ -22,7 +22,7 @@ sentry = { version = "0.26.0", optional = true, features = ["log"] } time = { version = "0.3.11", features = ["formatting"] } [dev-dependencies] -ckb-logger = { path = "../logger", version = "= 0.111.0-rc7" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc8" } tempfile.workspace = true [features] diff --git a/util/logger/Cargo.toml b/util/logger/Cargo.toml index 7efe37cb37..873faa7611 100644 --- a/util/logger/Cargo.toml +++ b/util/logger/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/memory-tracker/Cargo.toml b/util/memory-tracker/Cargo.toml index f818782e02..6681beac50 100644 --- a/util/memory-tracker/Cargo.toml +++ b/util/memory-tracker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-memory-tracker" -version = "0.111.0-rc7" +version = "0.111.0-rc8" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc7" } -ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc7" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc7" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc8" } +ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc8" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc8" } [target.'cfg(all(not(target_env = "msvc"), not(target_os="macos")))'.dependencies] jemalloc-ctl = { package = "tikv-jemalloc-ctl", version = "0.5.0" } diff --git a/util/metrics-config/Cargo.toml b/util/metrics-config/Cargo.toml index a98a991351..eae191be78 100644 --- a/util/metrics-config/Cargo.toml +++ b/util/metrics-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics-config" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/metrics-service/Cargo.toml b/util/metrics-service/Cargo.toml index 1097638dac..cb757ee005 100644 --- a/util/metrics-service/Cargo.toml +++ b/util/metrics-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics-service" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -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.111.0-rc7" } -ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc7" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc7" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc7" } -ckb-util = { path = "..", version = "= 0.111.0-rc7" } +ckb-metrics-config = { path = "../metrics-config", version = "= 0.111.0-rc8" } +ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc8" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc8" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc8" } +ckb-util = { path = "..", version = "= 0.111.0-rc8" } prometheus = "0.13.3" hyper = { version = "0.14", features = ["http1", "tcp", "server"] } diff --git a/util/metrics/Cargo.toml b/util/metrics/Cargo.toml index 1f163540aa..d57f0fb15c 100644 --- a/util/metrics/Cargo.toml +++ b/util/metrics/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/multisig/Cargo.toml b/util/multisig/Cargo.toml index 6bce62182f..e3948ead96 100644 --- a/util/multisig/Cargo.toml +++ b/util/multisig/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-multisig" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,9 +9,9 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-error = { path = "../../error", version = "= 0.111.0-rc7" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc7" } -ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc7" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc8" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc8" } +ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc8" } [dev-dependencies] rand = "0.7" diff --git a/util/network-alert/Cargo.toml b/util/network-alert/Cargo.toml index b55783f27c..747236dcd4 100644 --- a/util/network-alert/Cargo.toml +++ b/util/network-alert/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-network-alert" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,24 +9,24 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-multisig = { path = "../multisig", version = "= 0.111.0-rc7" } -ckb-types = { path = "../types", version = "= 0.111.0-rc7" } -ckb-util = { path = "..", version = "= 0.111.0-rc7" } -ckb-network = { path = "../../network", version = "= 0.111.0-rc7" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc7"} -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc7" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc7"} -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc7" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc7" } -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc7" } +ckb-multisig = { path = "../multisig", version = "= 0.111.0-rc8" } +ckb-types = { path = "../types", version = "= 0.111.0-rc8" } +ckb-util = { path = "..", version = "= 0.111.0-rc8" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc8" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc8"} +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc8" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc8"} +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc8" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc8" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc8" } lru = "0.7.1" semver = "1.0" [dev-dependencies] -ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc7" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc7" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc7" } +ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc8" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc8" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc8" } once_cell = "1.8.0" -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc7", features = ["enable_faketime"]} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc8", features = ["enable_faketime"]} faster-hex = "0.6" serde_json = "1.0" diff --git a/util/occupied-capacity/Cargo.toml b/util/occupied-capacity/Cargo.toml index 74f04a560f..1d8e42d085 100644 --- a/util/occupied-capacity/Cargo.toml +++ b/util/occupied-capacity/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-occupied-capacity" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc7" } -ckb-occupied-capacity-core = { path = "core", version = "= 0.111.0-rc7" } +ckb-occupied-capacity-macros = { path = "macros", version = "= 0.111.0-rc8" } +ckb-occupied-capacity-core = { path = "core", version = "= 0.111.0-rc8" } diff --git a/util/occupied-capacity/core/Cargo.toml b/util/occupied-capacity/core/Cargo.toml index 4a805e32e4..0274f46dca 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.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/occupied-capacity/macros/Cargo.toml b/util/occupied-capacity/macros/Cargo.toml index 46e6703215..e8f5486160 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.111.0-rc7" +version = "0.111.0-rc8" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -14,4 +14,4 @@ proc-macro = true [dependencies] quote = "1.0" syn = "1.0" -ckb-occupied-capacity-core = { path = "../core", version = "= 0.111.0-rc7" } +ckb-occupied-capacity-core = { path = "../core", version = "= 0.111.0-rc8" } diff --git a/util/proposal-table/Cargo.toml b/util/proposal-table/Cargo.toml index 66820a989d..f247075aa5 100644 --- a/util/proposal-table/Cargo.toml +++ b/util/proposal-table/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-proposal-table" -version = "0.111.0-rc7" +version = "0.111.0-rc8" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc7" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc7" } -ckb-types = { path = "../types", version = "= 0.111.0-rc7" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc8" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc8" } +ckb-types = { path = "../types", version = "= 0.111.0-rc8" } diff --git a/util/rational/Cargo.toml b/util/rational/Cargo.toml index b259065e6a..525887229e 100644 --- a/util/rational/Cargo.toml +++ b/util/rational/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-rational" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/reward-calculator/Cargo.toml b/util/reward-calculator/Cargo.toml index 8c4da15150..05170377a6 100644 --- a/util/reward-calculator/Cargo.toml +++ b/util/reward-calculator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-reward-calculator" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,15 +9,15 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc7" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc7" } -ckb-dao = { path = "../dao", version = "= 0.111.0-rc7" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc7" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc7" } -ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc7"} +ckb-types = { path = "../types", version = "= 0.111.0-rc8" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc8" } +ckb-dao = { path = "../dao", version = "= 0.111.0-rc8" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc8" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc8" } +ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc8"} [dev-dependencies] -ckb-db = { path = "../../db", version = "= 0.111.0-rc7" } -ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc7" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc7" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc8" } +ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc8" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc8" } tempfile.workspace = true diff --git a/util/runtime/Cargo.toml b/util/runtime/Cargo.toml index 07e017ccea..3cf4c0d88b 100644 --- a/util/runtime/Cargo.toml +++ b/util/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-async-runtime" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,6 +10,6 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] tokio = { version = "1", features = ["full"] } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc7" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc7" } -ckb-spawn = { path = "../spawn", version = "= 0.111.0-rc7" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc8" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc8" } +ckb-spawn = { path = "../spawn", version = "= 0.111.0-rc8" } diff --git a/util/rust-unstable-port/Cargo.toml b/util/rust-unstable-port/Cargo.toml index ca1f7a6d49..26ab44ef30 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.111.0-rc7" +version = "0.111.0-rc8" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" diff --git a/util/snapshot/Cargo.toml b/util/snapshot/Cargo.toml index af4e3ece60..3b1eb848be 100644 --- a/util/snapshot/Cargo.toml +++ b/util/snapshot/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-snapshot" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,15 +11,15 @@ 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.111.0-rc7" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc7" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc7" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc7" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc7" } -ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc7" } +ckb-types = { path = "../types", version = "= 0.111.0-rc8" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc8" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc8" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc8" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc8" } +ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc8" } arc-swap = "1.3" -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc7" } -ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc7" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc8" } +ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc8" } ckb-merkle-mountain-range = "0.5.2" [features] diff --git a/util/spawn/Cargo.toml b/util/spawn/Cargo.toml index 5d5307d5e0..79e32f5980 100644 --- a/util/spawn/Cargo.toml +++ b/util/spawn/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-spawn" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/stop-handler/Cargo.toml b/util/stop-handler/Cargo.toml index e4fd339a60..1d300c494a 100644 --- a/util/stop-handler/Cargo.toml +++ b/util/stop-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-stop-handler" -version = "0.111.0-rc7" +version = "0.111.0-rc8" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,6 +10,6 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] parking_lot = "0.12" -ckb-logger = { path = "../logger", version = "= 0.111.0-rc7" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc8" } tokio = { version = "1", features = ["sync", "rt-multi-thread"] } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc7" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc8" } diff --git a/util/systemtime/Cargo.toml b/util/systemtime/Cargo.toml index a081a599ca..b193a631c3 100644 --- a/util/systemtime/Cargo.toml +++ b/util/systemtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-systemtime" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/test-chain-utils/Cargo.toml b/util/test-chain-utils/Cargo.toml index e8120bd1b6..98b4685fc1 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.111.0-rc7" +version = "0.111.0-rc8" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,18 +9,18 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = {path = "../types", version = "= 0.111.0-rc7"} -ckb-db = { path = "../../db", version = "= 0.111.0-rc7" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc7" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc7" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc7" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc7" } +ckb-types = {path = "../types", version = "= 0.111.0-rc8"} +ckb-db = { path = "../../db", version = "= 0.111.0-rc8" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc8" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc8" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc8" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc8" } lazy_static = "1.3.0" -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc7" } -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc7" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc7" } -ckb-util = { path = "..", version = "= 0.111.0-rc7" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc8" } +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc8" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc8" } +ckb-util = { path = "..", version = "= 0.111.0-rc8" } tempfile.workspace = true [dev-dependencies] -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc7", features = ["enable_faketime"] } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc8", features = ["enable_faketime"] } diff --git a/util/types/Cargo.toml b/util/types/Cargo.toml index 766b6738ee..364e1e520e 100644 --- a/util/types/Cargo.toml +++ b/util/types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-types" -version = "0.111.0-rc7" +version = "0.111.0-rc8" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,17 +10,17 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] molecule = "=0.7.5" -ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc7" } +ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc8" } numext-fixed-uint = { version = "0.1", features = ["support_rand", "support_heapsize", "support_serde"] } bytes = { version="1", features = ["serde"] } merkle-cbt = "0.3" -ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc7" } -ckb-hash = { path = "../hash", version = "= 0.111.0-rc7" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc7" } -ckb-constant = { path = "../constant", version = "= 0.111.0-rc7" } +ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc8" } +ckb-hash = { path = "../hash", version = "= 0.111.0-rc8" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc8" } +ckb-constant = { path = "../constant", version = "= 0.111.0-rc8" } bit-vec = "0.6.3" -ckb-error = { path = "../../error", version = "= 0.111.0-rc7" } -ckb-rational = { path = "../rational", version = "= 0.111.0-rc7" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc8" } +ckb-rational = { path = "../rational", version = "= 0.111.0-rc8" } once_cell = "1.8.0" derive_more = { version = "0.99.0", default-features=false, features = ["display"] } ckb-merkle-mountain-range = "0.5.2" diff --git a/verification/Cargo.toml b/verification/Cargo.toml index 16c30f9545..79aa455db1 100644 --- a/verification/Cargo.toml +++ b/verification/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,20 +9,20 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } -ckb-script = { path = "../script", version = "= 0.111.0-rc7" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc7" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc7" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } +ckb-script = { path = "../script", version = "= 0.111.0-rc8" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc8" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc8" } lru = "0.7.1" -ckb-traits = { path = "../traits", version = "= 0.111.0-rc7" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc7" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc7" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc7" } -ckb-error = { path = "../error", version = "= 0.111.0-rc7" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc8" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc8" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc8" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc8" } +ckb-error = { path = "../error", version = "= 0.111.0-rc8" } derive_more = { version = "0.99.0", default-features=false, features = ["display"] } -ckb-verification-traits = { path = "./traits", version = "= 0.111.0-rc7" } +ckb-verification-traits = { path = "./traits", version = "= 0.111.0-rc8" } [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc7" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc7" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc7", features=["enable_faketime"]} +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc8" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc8" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc8", features=["enable_faketime"]} diff --git a/verification/contextual/Cargo.toml b/verification/contextual/Cargo.toml index 7c1217b0d6..9ec2eadcc5 100644 --- a/verification/contextual/Cargo.toml +++ b/verification/contextual/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification-contextual" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,27 +9,27 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../../util/types", version = "= 0.111.0-rc7" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc7" } -ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc7" } +ckb-types = { path = "../../util/types", version = "= 0.111.0-rc8" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc8" } +ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc8" } rayon = "1.0" -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc7" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc7" } -ckb-dao = { path = "../../util/dao", version = "= 0.111.0-rc7" } -ckb-dao-utils = { path = "../../util/dao/utils", version = "= 0.111.0-rc7" } -ckb-logger = {path = "../../util/logger", version = "= 0.111.0-rc7"} -ckb-reward-calculator= { path = "../../util/reward-calculator", version = "= 0.111.0-rc7" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc7" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc8" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc8" } +ckb-dao = { path = "../../util/dao", version = "= 0.111.0-rc8" } +ckb-dao-utils = { path = "../../util/dao/utils", version = "= 0.111.0-rc8" } +ckb-logger = {path = "../../util/logger", version = "= 0.111.0-rc8"} +ckb-reward-calculator= { path = "../../util/reward-calculator", version = "= 0.111.0-rc8" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc8" } tokio = { version = "1", features = ["sync", "rt-multi-thread"] } -ckb-async-runtime = { path = "../../util/runtime", version = "= 0.111.0-rc7" } -ckb-verification-traits = { path = "../traits", version = "= 0.111.0-rc7" } -ckb-verification = { path = "..", version = "= 0.111.0-rc7" } +ckb-async-runtime = { path = "../../util/runtime", version = "= 0.111.0-rc8" } +ckb-verification-traits = { path = "../traits", version = "= 0.111.0-rc8" } +ckb-verification = { path = "..", version = "= 0.111.0-rc8" } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc7" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc7" } -ckb-launcher = { path = "../../util/launcher", version = "= 0.111.0-rc7" } -ckb-test-chain-utils = { path = "../../util/test-chain-utils", version = "= 0.111.0-rc7" } -ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc7", features = ["enable_faketime"]} +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc8" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc8" } +ckb-launcher = { path = "../../util/launcher", version = "= 0.111.0-rc8" } +ckb-test-chain-utils = { path = "../../util/test-chain-utils", version = "= 0.111.0-rc8" } +ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc8", features = ["enable_faketime"]} rand = "0.7" diff --git a/verification/traits/Cargo.toml b/verification/traits/Cargo.toml index 9351d30659..74fb2891f5 100644 --- a/verification/traits/Cargo.toml +++ b/verification/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification-traits" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,4 +10,4 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] bitflags = "1.0" -ckb-error = { path = "../../error", version = "= 0.111.0-rc7" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc8" } diff --git a/wasm-build-test/Cargo.toml b/wasm-build-test/Cargo.toml index a3e1cf4610..8dbf644ca9 100644 --- a/wasm-build-test/Cargo.toml +++ b/wasm-build-test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-wasm-test" -version = "0.111.0-rc7" +version = "0.111.0-rc8" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,8 +9,8 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc7" } -ckb-script = { path = "../script", version = "= 0.111.0-rc7", default-features = false, features = [] } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } +ckb-script = { path = "../script", version = "= 0.111.0-rc8", default-features = false, features = [] } # Prevent this from interfering with workspaces [workspace] From 65c7bc5c25b3c2567946a101a750d316c2ff0104 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Tue, 20 Jun 2023 18:29:56 +0800 Subject: [PATCH 023/125] test: make sure `2_in_2_out_rtx` will suspend on first run --- script/src/verify/tests/utils.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/src/verify/tests/utils.rs b/script/src/verify/tests/utils.rs index a92ed6cd11..d206de1f37 100644 --- a/script/src/verify/tests/utils.rs +++ b/script/src/verify/tests/utils.rs @@ -35,7 +35,7 @@ use tempfile::TempDir; use crate::verify::*; pub(crate) const ALWAYS_SUCCESS_SCRIPT_CYCLE: u64 = 537; -pub(crate) const CYCLE_BOUND: Cycle = 200_000; +pub(crate) const CYCLE_BOUND: Cycle = 250_000; pub(crate) const V2_CYCLE_BOUND: Cycle = 300_000; fn sha3_256>(s: T) -> [u8; 32] { From 3955cff41670152f6e0b9fc0f21f6ba78ec2f16f Mon Sep 17 00:00:00 2001 From: ian Date: Sun, 25 Jun 2023 21:43:05 +0800 Subject: [PATCH 024/125] chore: add `make docker-publish-rc` Push the latest version as the image tag only. Skip the `latest` image tag. This will be used to push the rc version, which should not become the latest image in Docker. --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index e264edde70..7d7adb98fb 100644 --- a/Makefile +++ b/Makefile @@ -168,6 +168,10 @@ docker-publish: docker tag nervos/ckb:$$(git describe) nervos/ckb:latest docker push nervos/ckb:latest +.PHONY: docker-publish-rc +docker-publish-rc: + docker push nervos/ckb:$$(git describe) + ##@ Code Quality .PHONY: fmt fmt: setup-ckb-test ## Check Rust source code format to keep to the same style. From 82b12d132250837c3b9f71ecd9a9c2caab3b89ec Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Thu, 29 Jun 2023 08:56:23 +0800 Subject: [PATCH 025/125] Fix bats tests failed for rc version like `ckb 0.111.0-rc6` --- util/app-config/src/tests/cli.bats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/app-config/src/tests/cli.bats b/util/app-config/src/tests/cli.bats index 08368f7de6..6212a0025b 100644 --- a/util/app-config/src/tests/cli.bats +++ b/util/app-config/src/tests/cli.bats @@ -31,7 +31,7 @@ _full_help() { function short_version { #@test run _short assert_success - assert_output --regexp "^ckb [0-9.]+[-]?[a-z]*$" + assert_output --regexp "^ckb [0-9.]+[-]?[a-z0-9]*$" } #@test "ckb --version" { From 00ff6817daaa6c8bf28cc40862b3593ecbc4bbe0 Mon Sep 17 00:00:00 2001 From: driftluo Date: Tue, 4 Jul 2023 14:01:41 +0800 Subject: [PATCH 026/125] chore: add comment to header sync with empty --- sync/src/synchronizer/block_fetcher.rs | 12 ++++++++++-- sync/src/synchronizer/headers_process.rs | 5 +++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/sync/src/synchronizer/block_fetcher.rs b/sync/src/synchronizer/block_fetcher.rs index ec0688f238..14d882933e 100644 --- a/sync/src/synchronizer/block_fetcher.rs +++ b/sync/src/synchronizer/block_fetcher.rs @@ -97,8 +97,16 @@ impl<'a> BlockFetcher<'a> { } } - // This peer has nothing interesting. - let best_known = self.peer_best_known_header()?; + let best_known = match self.peer_best_known_header() { + Some(t) => t, + None => { + debug!( + "peer {} doesn't have best known header, ignore it", + self.peer + ); + return None; + } + }; if !best_known.is_better_than(self.active_chain.total_difficulty()) { // Advancing this peer's last_common_header is unnecessary for block-sync mechanism. // However, RPC `get_peers`, returns peers information which includes diff --git a/sync/src/synchronizer/headers_process.rs b/sync/src/synchronizer/headers_process.rs index ec0b732335..5a875f79ba 100644 --- a/sync/src/synchronizer/headers_process.rs +++ b/sync/src/synchronizer/headers_process.rs @@ -108,6 +108,11 @@ impl<'a> HeadersProcess<'a> { } if headers.is_empty() { + // Empty means that the other peer's tip may be consistent with our own best known, + // but empty cannot 100% confirm this, so it does not set the other peer's best header + // to the shared best known. + // This action means that if the newly connected node has not been sync with headers, + // it cannot be used as a synchronization node. debug!("HeadersProcess is_empty (synchronized)"); if let Some(mut state) = self.synchronizer.peers().state.get_mut(&self.peer) { self.synchronizer From 4bf0df1b41c71c030e572eacf6d1711b8d0f10c3 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Jul 2023 17:40:27 +0800 Subject: [PATCH 027/125] Fix `hermit-abi` yanked --- Cargo.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ad60946eca..cad033854e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2466,9 +2466,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hex" @@ -2719,7 +2719,7 @@ version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.2", "io-lifetimes", "rustix 0.37.7", "windows-sys 0.48.0", From 37e8cf3046a45ef6a89ca990c5652c883b030753 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Jul 2023 11:25:23 +0800 Subject: [PATCH 028/125] Fix relayer::request_proposal_txs dedup proposals Signed-off-by: Eval EXEC --- Cargo.lock | 16 +++++++++++++--- Cargo.toml | 1 + sync/Cargo.toml | 1 + sync/src/relayer/mod.rs | 9 +++++---- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cad033854e..6004ceb3d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1188,7 +1188,7 @@ dependencies = [ "ckb-util", "ckb-verification", "ckb-verification-traits", - "itertools", + "itertools 0.10.5", "jsonrpc-core", "jsonrpc-derive", "jsonrpc-http-server", @@ -1342,6 +1342,7 @@ dependencies = [ "faux", "futures", "governor", + "itertools 0.11.0", "keyed_priority_queue", "lru", "once_cell", @@ -1700,7 +1701,7 @@ dependencies = [ "ciborium", "clap 3.2.23", "criterion-plot", - "itertools", + "itertools 0.10.5", "lazy_static", "num-traits", "oorandom", @@ -1721,7 +1722,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ "cast", - "itertools", + "itertools 0.10.5", ] [[package]] @@ -2740,6 +2741,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.1" diff --git a/Cargo.toml b/Cargo.toml index 6127ae0c8c..b280ac8d31 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -93,6 +93,7 @@ members = [ [workspace.dependencies] tempfile = "3" +itertools = "0.11.0" [profile.release] overflow-checks = true diff --git a/sync/Cargo.toml b/sync/Cargo.toml index 0bdb2ecf62..fa998193e7 100644 --- a/sync/Cargo.toml +++ b/sync/Cargo.toml @@ -39,6 +39,7 @@ bitflags = "1.0" dashmap = "4.0" keyed_priority_queue = "0.3" sled = "0.34.7" +itertools.workspace = true [dev-dependencies] ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc8" } diff --git a/sync/src/relayer/mod.rs b/sync/src/relayer/mod.rs index 92a03a77ea..38a31a19af 100644 --- a/sync/src/relayer/mod.rs +++ b/sync/src/relayer/mod.rs @@ -39,6 +39,7 @@ use ckb_types::{ prelude::*, }; use ckb_util::Mutex; +use itertools::Itertools; use std::collections::{HashMap, HashSet}; use std::sync::Arc; use std::time::{Duration, Instant}; @@ -238,11 +239,11 @@ impl Relayer { nc: &dyn CKBProtocolContext, peer: PeerIndex, block_hash_and_number: BlockNumberAndHash, - mut proposals: Vec, + proposals: Vec, ) { - proposals.dedup(); let tx_pool = self.shared.shared().tx_pool_controller(); - let fresh_proposals = match tx_pool.fresh_proposals_filter(proposals) { + let fresh_proposals: Vec = match tx_pool.fresh_proposals_filter(proposals) + { Err(err) => { debug_target!( crate::LOG_TARGET_RELAY, @@ -251,7 +252,7 @@ impl Relayer { ); return; } - Ok(fresh_proposals) => fresh_proposals, + Ok(fresh_proposals) => fresh_proposals.into_iter().unique().collect(), }; let to_ask_proposals: Vec = self From ee0b414490eea6751e08fb82bf29296efb856ba5 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Jul 2023 17:47:05 +0800 Subject: [PATCH 029/125] deps: let `ckb-rpc` use `workspace.itertools` --- Cargo.lock | 2 +- rpc/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6004ceb3d8..66155fd786 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1188,7 +1188,7 @@ dependencies = [ "ckb-util", "ckb-verification", "ckb-verification-traits", - "itertools 0.10.5", + "itertools 0.11.0", "jsonrpc-core", "jsonrpc-derive", "jsonrpc-http-server", diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index a9bf1b717e..c9a856d56a 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -43,7 +43,7 @@ ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc8" } ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc8" } ckb-pow = { path = "../pow", version = "= 0.111.0-rc8" } ckb-indexer = { path = "../util/indexer", version = "= 0.111.0-rc8" } -itertools = "0.10.5" +itertools.workspace = true tokio = "1" [dev-dependencies] From 316e09e6b487c525631be0098a4dd7628a9e13d2 Mon Sep 17 00:00:00 2001 From: mohanson Date: Thu, 6 Jul 2023 14:40:50 +0800 Subject: [PATCH 030/125] feat(script): add peak_memory syscall --- script/src/syscalls/mod.rs | 3 ++ script/src/syscalls/peak_memory.rs | 30 ++++++++++++++++ script/src/syscalls/spawn.rs | 3 ++ script/src/verify.rs | 10 ++++-- .../tests/ckb_latest/features_since_v2023.rs | 32 ++++++++++++++++++ script/testdata/Makefile | 4 ++- script/testdata/spawn_peak_memory | Bin 0 -> 4240 bytes script/testdata/spawn_peak_memory.c | 28 +++++++++++++++ 8 files changed, 107 insertions(+), 3 deletions(-) create mode 100644 script/src/syscalls/peak_memory.rs create mode 100755 script/testdata/spawn_peak_memory create mode 100644 script/testdata/spawn_peak_memory.c diff --git a/script/src/syscalls/mod.rs b/script/src/syscalls/mod.rs index 5b5f84fc52..258c30b3ec 100644 --- a/script/src/syscalls/mod.rs +++ b/script/src/syscalls/mod.rs @@ -11,6 +11,7 @@ mod load_script; mod load_script_hash; mod load_tx; mod load_witness; +mod peak_memory; mod set_content; pub(crate) mod spawn; mod utils; @@ -35,6 +36,7 @@ pub use self::load_script::LoadScript; pub use self::load_script_hash::LoadScriptHash; pub use self::load_tx::LoadTx; pub use self::load_witness::LoadWitness; +pub use self::peak_memory::PeakMemory; pub use self::set_content::SetContent; pub use self::spawn::Spawn; pub use self::vm_version::VMVersion; @@ -77,6 +79,7 @@ pub const SPAWN: u64 = 2101; pub const GET_MEMORY_LIMIT: u64 = 2102; pub const SET_CONTENT: u64 = 2103; pub const LOAD_EXTENSION: u64 = 2104; +pub const PEAK_MEMORY: u64 = 2105; pub const DEBUG_PRINT_SYSCALL_NUMBER: u64 = 2177; #[cfg(test)] pub const DEBUG_PAUSE: u64 = 2178; diff --git a/script/src/syscalls/peak_memory.rs b/script/src/syscalls/peak_memory.rs new file mode 100644 index 0000000000..e86e9d034f --- /dev/null +++ b/script/src/syscalls/peak_memory.rs @@ -0,0 +1,30 @@ +use crate::syscalls::PEAK_MEMORY; +use ckb_vm::{ + registers::{A0, A7}, + Error as VMError, Register, SupportMachine, Syscalls, +}; + +#[derive(Debug, Default)] +pub struct PeakMemory { + value: u64, +} + +impl PeakMemory { + pub fn new(value: u64) -> Self { + Self { value } + } +} + +impl Syscalls for PeakMemory { + fn initialize(&mut self, _machine: &mut Mac) -> Result<(), VMError> { + Ok(()) + } + + fn ecall(&mut self, machine: &mut Mac) -> Result { + if machine.registers()[A7].to_u64() != PEAK_MEMORY { + return Ok(false); + } + machine.set_register(A0, Mac::REG::from_u64(self.value)); + Ok(true) + } +} diff --git a/script/src/syscalls/spawn.rs b/script/src/syscalls/spawn.rs index 78f2c9715d..3ff98bcec2 100644 --- a/script/src/syscalls/spawn.rs +++ b/script/src/syscalls/spawn.rs @@ -287,6 +287,9 @@ pub fn build_child_machine< *callee_peak_memory, Arc::clone(context), ))); + let machine_builder = machine_builder.syscall(Box::new( + syscalls_generator.build_peak_memory(*callee_peak_memory), + )); let mut machine_child = Machine::new(machine_builder.build()); set_vm_max_cycles(&mut machine_child, cycles_limit); Ok(machine_child) diff --git a/script/src/verify.rs b/script/src/verify.rs index ee1e524e32..0e62f8497c 100644 --- a/script/src/verify.rs +++ b/script/src/verify.rs @@ -6,8 +6,8 @@ use crate::{ syscalls::{ spawn::{build_child_machine, update_caller_machine}, CurrentCycles, Debugger, Exec, GetMemoryLimit, LoadCell, LoadCellData, LoadExtension, - LoadHeader, LoadInput, LoadScript, LoadScriptHash, LoadTx, LoadWitness, SetContent, Spawn, - VMVersion, + LoadHeader, LoadInput, LoadScript, LoadScriptHash, LoadTx, LoadWitness, PeakMemory, + SetContent, Spawn, VMVersion, }, type_id::TypeIdSystemScript, types::{ @@ -257,6 +257,11 @@ impl PeakMemory { + PeakMemory::new(peak_memory) + } + /// Generate same syscalls. The result does not contain spawn syscalls. pub fn generate_same_syscalls( &self, @@ -323,6 +328,7 @@ impl 1); } + +#[test] +fn check_spawn_peak_memory() { + let script_version = SCRIPT_VERSION; + + let (spawn_caller_cell, spawn_caller_data_hash) = + load_cell_from_path("testdata/spawn_peak_memory"); + + let spawn_caller_script = Script::new_builder() + .hash_type(script_version.data_hash_type().into()) + .code_hash(spawn_caller_data_hash) + .build(); + let output = CellOutputBuilder::default() + .capacity(capacity_bytes!(100).pack()) + .lock(spawn_caller_script) + .build(); + let input = CellInput::new(OutPoint::null(), 0); + + let transaction = TransactionBuilder::default().input(input).build(); + let dummy_cell = create_dummy_cell(output); + + let rtx = ResolvedTransaction { + transaction, + resolved_cell_deps: vec![spawn_caller_cell], + resolved_inputs: vec![dummy_cell], + resolved_dep_groups: vec![], + }; + let verifier = TransactionScriptsVerifierWithEnv::new(); + let result = verifier.verify_without_limit(script_version, &rtx); + assert_eq!(result.is_ok(), script_version >= ScriptVersion::V2); +} diff --git a/script/testdata/Makefile b/script/testdata/Makefile index 0584b38224..f78b9a4fe2 100644 --- a/script/testdata/Makefile +++ b/script/testdata/Makefile @@ -68,7 +68,8 @@ ALL_BINS := jalr_zero \ spawn_caller_strcat_wrap \ spawn_caller_strcat \ spawn_caller_strcat_data_hash \ - spawn_recursive + spawn_recursive \ + spawn_peak_memory ALL_LIBS := is_even.lib \ add1.lib sub1.lib mul2.lib div2.lib @@ -154,3 +155,4 @@ spawn_caller_strcat_data_hash: spawn_caller_strcat_data_hash.c spawn_peak_memory_2m_to_32m: spawn_peak_memory_2m_to_32m.c spawn_peak_memory_4m_to_32m: spawn_peak_memory_4m_to_32m.c spawn_recursive: spawn_recursive.c +spawn_peak_memory: spawn_peak_memory.c diff --git a/script/testdata/spawn_peak_memory b/script/testdata/spawn_peak_memory new file mode 100755 index 0000000000000000000000000000000000000000..417eaca59965076e7f47f8639ee4e36979cce6c9 GIT binary patch literal 4240 zcmeHLeN0nV6hH6vwS|ZRD;qdbkqT_Yb$m^6D52t`%xpr2x?r+Nc~oFpg|_0yV(bT{ z7R8U$v@C83(##pR7&BwaT+}hbG+9ixKZr|AHawFRlXl*>76jj?3YD@! zCh${=?plvaS?1_cGRMs)54L~cxTOTyEf>hTT+BzuDjUD;zZIH($FH1#3%bG)58~yK zE2B5Y3rCwCnI3-=WXIVM!?*ECNy$;3sEWC4Oj`T^!yEK=tDLu68B`C>#C=C=P|4-m z%Fpdq-zor)ZQx6l(>AGUVg8IhW#e%UixY9hRPs+UmiCIZUiBDQ(^2ItzXq6+vGJcL ze!HoSPwjWyu}vz1XU9m-w(oe-bA=CQJB;eosZUOXI;+?kEhFYWiwuvG`Gc?$al31g zg(Hhk9qFy*Yqs=zT)GOCa&v`ZG(DK>9xf8vhCx-izDUJwuCQ%Ru5xm#IJ<9XboC5h z(~GO-+NM%AR}dy)2`7-vHAgT9t2Whi*0A+*T!)RtnJ%HRhxHtsg6^T41D+hWKpxt^+(Nol_@UZ}1Z>{wrsFeZmD*~WK^~(`a{Tw2yUxtY4XAx2T z3?ix@5K(d7lasL?uM_&(JYG37Te5v^l>v`81H>FH_F-%KUtVi>;_}ml-l4{xM;`~? zZG3xNcEc9h@~9;!Ti?2}vp@au*3gd8og?oBtNVrMXg2f2l@rb_)0K|ZZdleFni0x4 zaB|mzt5*pvi&#g1OA+h`Wk>S{5{8oUW-eAKY6dNv4tE}Aj|{%QX;0@KcCQ{+#F62K z_NwW1LbHogU*$mmz>yK1{gt;BWNX|odD@oY9%FqnWI5Kgt`rhn%#bVN?|Tml-THtd z`buNyuJ{;cZWPJm-)i|01w>4Ow2+)0<-6xLQzWii*P%-M+mRDrEt4}CAms~ZS zpii*-et9hJ5!s>3PW;uBFnn}}EMN;c*11+*=xNs-EfvZ}xaHl~>ZVfEU3cSTmz3G^ zl7bf=LT=q%P@|>p`Z2{_BE~k7C{ifi~yi9*O@IQi@q8( z7Q-P6XiWQS^cFp640XG9oAgElXzKUXTXyM9CjDX1>_&suMV?uNYO@(M!hWOCu#a>? zMySzSET;PE0~Q1Mka=by?_lz7CU+zvBeNDkQJ&xze7N8T^E`=1i^Nm^)9)maRyvOj z5EWrBMVrLaH1u9Z?`!0)7%q{v8XK3O()fJo9OO&)LFpPe*9FZ_@l|Yz4T~?8;!CA? z%A*}nn_>YrgpZ$|zj7(Q6z@#oLgT1Ui +#include + +#include "ckb_syscalls.h" + +int main(int argc, char *argv[]) { + int peak_memory = ckb_peak_memory(); + if (peak_memory != (argc + 1) * 8) { + return 1; + } + if (peak_memory < 56) { + int spawn_argc = argc + 1; + const char *spawn_argv[] = {"", "", "", "", "", "", "", ""}; + int8_t spawn_exit_code = 255; + spawn_args_t spgs = { + .memory_limit = 8, + .exit_code = &spawn_exit_code, + .content = NULL, + .content_length = NULL, + }; + uint64_t success = ckb_spawn(0, 3, 0, spawn_argc, spawn_argv, &spgs); + if (success != 0) { + return success; + } + } else { + return 0; + } +} From 7fb2f2f1d7e2f06b1254cea28ac5a29ade207ca7 Mon Sep 17 00:00:00 2001 From: mohanson Date: Thu, 6 Jul 2023 17:55:25 +0800 Subject: [PATCH 031/125] Rename peak_memory to current_memory --- .../syscalls/{peak_memory.rs => current_memory.rs} | 10 +++++----- script/src/syscalls/mod.rs | 6 +++--- script/src/syscalls/spawn.rs | 2 +- script/src/verify.rs | 12 ++++++------ .../verify/tests/ckb_latest/features_since_v2023.rs | 6 +++--- script/testdata/Makefile | 4 ++-- .../{spawn_peak_memory => spawn_current_memory} | Bin .../{spawn_peak_memory.c => spawn_current_memory.c} | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) rename script/src/syscalls/{peak_memory.rs => current_memory.rs} (71%) rename script/testdata/{spawn_peak_memory => spawn_current_memory} (100%) rename script/testdata/{spawn_peak_memory.c => spawn_current_memory.c} (93%) diff --git a/script/src/syscalls/peak_memory.rs b/script/src/syscalls/current_memory.rs similarity index 71% rename from script/src/syscalls/peak_memory.rs rename to script/src/syscalls/current_memory.rs index e86e9d034f..401d778191 100644 --- a/script/src/syscalls/peak_memory.rs +++ b/script/src/syscalls/current_memory.rs @@ -1,27 +1,27 @@ -use crate::syscalls::PEAK_MEMORY; +use crate::syscalls::CURRENT_MEMORY; use ckb_vm::{ registers::{A0, A7}, Error as VMError, Register, SupportMachine, Syscalls, }; #[derive(Debug, Default)] -pub struct PeakMemory { +pub struct CurrentMemory { value: u64, } -impl PeakMemory { +impl CurrentMemory { pub fn new(value: u64) -> Self { Self { value } } } -impl Syscalls for PeakMemory { +impl Syscalls for CurrentMemory { fn initialize(&mut self, _machine: &mut Mac) -> Result<(), VMError> { Ok(()) } fn ecall(&mut self, machine: &mut Mac) -> Result { - if machine.registers()[A7].to_u64() != PEAK_MEMORY { + if machine.registers()[A7].to_u64() != CURRENT_MEMORY { return Ok(false); } machine.set_register(A0, Mac::REG::from_u64(self.value)); diff --git a/script/src/syscalls/mod.rs b/script/src/syscalls/mod.rs index 258c30b3ec..17012469a5 100644 --- a/script/src/syscalls/mod.rs +++ b/script/src/syscalls/mod.rs @@ -1,4 +1,5 @@ mod current_cycles; +mod current_memory; mod debugger; mod exec; mod get_memory_limit; @@ -11,7 +12,6 @@ mod load_script; mod load_script_hash; mod load_tx; mod load_witness; -mod peak_memory; mod set_content; pub(crate) mod spawn; mod utils; @@ -24,6 +24,7 @@ mod pause; mod tests; pub use self::current_cycles::CurrentCycles; +pub use self::current_memory::CurrentMemory; pub use self::debugger::Debugger; pub use self::exec::Exec; pub use self::get_memory_limit::GetMemoryLimit; @@ -36,7 +37,6 @@ pub use self::load_script::LoadScript; pub use self::load_script_hash::LoadScriptHash; pub use self::load_tx::LoadTx; pub use self::load_witness::LoadWitness; -pub use self::peak_memory::PeakMemory; pub use self::set_content::SetContent; pub use self::spawn::Spawn; pub use self::vm_version::VMVersion; @@ -79,7 +79,7 @@ pub const SPAWN: u64 = 2101; pub const GET_MEMORY_LIMIT: u64 = 2102; pub const SET_CONTENT: u64 = 2103; pub const LOAD_EXTENSION: u64 = 2104; -pub const PEAK_MEMORY: u64 = 2105; +pub const CURRENT_MEMORY: u64 = 2105; pub const DEBUG_PRINT_SYSCALL_NUMBER: u64 = 2177; #[cfg(test)] pub const DEBUG_PAUSE: u64 = 2178; diff --git a/script/src/syscalls/spawn.rs b/script/src/syscalls/spawn.rs index 3ff98bcec2..15d48b6908 100644 --- a/script/src/syscalls/spawn.rs +++ b/script/src/syscalls/spawn.rs @@ -288,7 +288,7 @@ pub fn build_child_machine< Arc::clone(context), ))); let machine_builder = machine_builder.syscall(Box::new( - syscalls_generator.build_peak_memory(*callee_peak_memory), + syscalls_generator.build_current_memory(*callee_peak_memory), )); let mut machine_child = Machine::new(machine_builder.build()); set_vm_max_cycles(&mut machine_child, cycles_limit); diff --git a/script/src/verify.rs b/script/src/verify.rs index 0e62f8497c..0d1356aeda 100644 --- a/script/src/verify.rs +++ b/script/src/verify.rs @@ -5,8 +5,8 @@ use crate::{ error::{ScriptError, TransactionScriptError}, syscalls::{ spawn::{build_child_machine, update_caller_machine}, - CurrentCycles, Debugger, Exec, GetMemoryLimit, LoadCell, LoadCellData, LoadExtension, - LoadHeader, LoadInput, LoadScript, LoadScriptHash, LoadTx, LoadWitness, PeakMemory, + CurrentCycles, CurrentMemory, Debugger, Exec, GetMemoryLimit, LoadCell, LoadCellData, + LoadExtension, LoadHeader, LoadInput, LoadScript, LoadScriptHash, LoadTx, LoadWitness, SetContent, Spawn, VMVersion, }, type_id::TypeIdSystemScript, @@ -257,9 +257,9 @@ impl PeakMemory { - PeakMemory::new(peak_memory) + /// Build syscall: current_memory + pub fn build_current_memory(&self, current_memory: u64) -> CurrentMemory { + CurrentMemory::new(current_memory) } /// Generate same syscalls. The result does not contain spawn syscalls. @@ -328,7 +328,7 @@ impl Date: Mon, 3 Jul 2023 15:40:45 +0800 Subject: [PATCH 032/125] Fix bats test `ckb_run` should wait ckb process exit --- util/app-config/src/tests/ckb_run_replay.bats | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/util/app-config/src/tests/ckb_run_replay.bats b/util/app-config/src/tests/ckb_run_replay.bats index be7eba5a3b..6ca4dd5405 100644 --- a/util/app-config/src/tests/ckb_run_replay.bats +++ b/util/app-config/src/tests/ckb_run_replay.bats @@ -3,12 +3,18 @@ bats_load_library 'bats-assert' bats_load_library 'bats-support' _ckb_run() { - ckb run -C ${CKB_DIRNAME} 1>${TMP_DIR}/ckb_run.log 2>&1 & - echo $! >${TMP_DIR}/ckb_run.pid + ckb run -C ${CKB_DIRNAME} &> ${TMP_DIR}/ckb_run.log & + PID=$! sleep 5 - kill "$(<"${TMP_DIR}/ckb_run.pid")" + kill ${PID} + + while kill -0 ${PID}; do + echo "waiting for ckb to exit" + sleep 1 + done tail -n 50 ${TMP_DIR}/ckb_run.log } + _ckb_replay() { # from 1 to 2500 enough to trigger profile action CKB_LOG=err ckb replay -C ${CKB_DIRNAME} --tmp-target ${TMP_DIR} --profile 1 2500 From 5323d3cd8b1d80359233d925d8ca75608e2b730c Mon Sep 17 00:00:00 2001 From: mohanson Date: Wed, 5 Jul 2023 16:47:34 +0800 Subject: [PATCH 033/125] refactor(scripts): current_cycles returns the sum of cycles of all living machine --- script/src/syscalls/current_cycles.rs | 14 ++++-- script/src/syscalls/spawn.rs | 5 +++ .../syscalls/tests/vm_latest/syscalls_2.rs | 2 +- script/src/types.rs | 4 ++ script/src/verify.rs | 10 +++-- .../tests/ckb_latest/features_since_v2023.rs | 34 +++++++++++++++ script/testdata/Makefile | 6 ++- script/testdata/spawn_callee_current_cycles | Bin 0 -> 4744 bytes script/testdata/spawn_callee_current_cycles.c | 15 +++++++ script/testdata/spawn_caller_current_cycles | Bin 0 -> 7008 bytes script/testdata/spawn_caller_current_cycles.c | 41 ++++++++++++++++++ 11 files changed, 122 insertions(+), 9 deletions(-) create mode 100755 script/testdata/spawn_callee_current_cycles create mode 100644 script/testdata/spawn_callee_current_cycles.c create mode 100755 script/testdata/spawn_caller_current_cycles create mode 100644 script/testdata/spawn_caller_current_cycles.c diff --git a/script/src/syscalls/current_cycles.rs b/script/src/syscalls/current_cycles.rs index 15528ce111..dc87cd281c 100644 --- a/script/src/syscalls/current_cycles.rs +++ b/script/src/syscalls/current_cycles.rs @@ -5,11 +5,13 @@ use ckb_vm::{ }; #[derive(Debug, Default)] -pub struct CurrentCycles {} +pub struct CurrentCycles { + base: u64, +} impl CurrentCycles { - pub fn new() -> Self { - Self {} + pub fn new(base: u64) -> Self { + Self { base } } } @@ -22,7 +24,11 @@ impl Syscalls for CurrentCycles { if machine.registers()[A7].to_u64() != CURRENT_CYCLES { return Ok(false); } - machine.set_register(A0, Mac::REG::from_u64(machine.cycles())); + let cycles = self + .base + .checked_add(machine.cycles()) + .ok_or(VMError::CyclesOverflow)?; + machine.set_register(A0, Mac::REG::from_u64(cycles)); Ok(true) } } diff --git a/script/src/syscalls/spawn.rs b/script/src/syscalls/spawn.rs index 15d48b6908..7c96b2b682 100644 --- a/script/src/syscalls/spawn.rs +++ b/script/src/syscalls/spawn.rs @@ -155,6 +155,7 @@ where caller_exit_code_addr: exit_code_addr.to_u64(), caller_content_addr: content_addr.to_u64(), caller_content_length_addr: content_length_addr.to_u64(), + cycles_base: machine.cycles(), }; let mut machine_child = build_child_machine( &self.script_group, @@ -258,6 +259,7 @@ pub fn build_child_machine< callee_memory_limit, content, content_length, + cycles_base, .. } = spawn_data; @@ -275,6 +277,9 @@ pub fn build_child_machine< let machine_builder = machine_syscalls .into_iter() .fold(machine_builder, |builder, syscall| builder.syscall(syscall)); + let machine_builder = machine_builder.syscall(Box::new( + syscalls_generator.build_current_cycles(*cycles_base), + )); let machine_builder = machine_builder.syscall(Box::new( syscalls_generator.build_get_memory_limit(*callee_memory_limit), )); diff --git a/script/src/syscalls/tests/vm_latest/syscalls_2.rs b/script/src/syscalls/tests/vm_latest/syscalls_2.rs index 85c44d7fd3..b0ad504a91 100644 --- a/script/src/syscalls/tests/vm_latest/syscalls_2.rs +++ b/script/src/syscalls/tests/vm_latest/syscalls_2.rs @@ -53,7 +53,7 @@ fn test_current_cycles() { machine.set_cycles(cycles); - let result = CurrentCycles::new().ecall(&mut machine); + let result = CurrentCycles::new(0).ecall(&mut machine); assert!(result.unwrap()); assert_eq!(machine.registers()[A0], cycles); diff --git a/script/src/types.rs b/script/src/types.rs index 1fdab303c1..19434b7a9c 100644 --- a/script/src/types.rs +++ b/script/src/types.rs @@ -133,6 +133,7 @@ pub enum ResumePoint { caller_exit_code_addr: u64, caller_content_addr: u64, caller_content_length_addr: u64, + cycles_base: u64, }, } @@ -146,6 +147,7 @@ pub struct SpawnData { pub(crate) caller_exit_code_addr: u64, pub(crate) caller_content_addr: u64, pub(crate) caller_content_length_addr: u64, + pub(crate) cycles_base: u64, } impl TryFrom<&SpawnData> for ResumePoint { @@ -160,6 +162,7 @@ impl TryFrom<&SpawnData> for ResumePoint { caller_exit_code_addr, caller_content_addr, caller_content_length_addr, + cycles_base, } = value; Ok(ResumePoint::Spawn { callee_peak_memory: *callee_peak_memory, @@ -172,6 +175,7 @@ impl TryFrom<&SpawnData> for ResumePoint { caller_exit_code_addr: *caller_exit_code_addr, caller_content_addr: *caller_content_addr, caller_content_length_addr: *caller_content_length_addr, + cycles_base: *cycles_base, }) } } diff --git a/script/src/verify.rs b/script/src/verify.rs index 0d1356aeda..af1182af12 100644 --- a/script/src/verify.rs +++ b/script/src/verify.rs @@ -137,8 +137,8 @@ impl { /// Build syscall: current_cycles - pub fn build_current_cycles(&self) -> CurrentCycles { - CurrentCycles::new() + pub fn build_current_cycles(&self, base: u64) -> CurrentCycles { + CurrentCycles::new(base) } /// Build syscall: vm_version @@ -299,7 +299,6 @@ impl= ScriptVersion::V1 { syscalls.append(&mut vec![ Box::new(self.build_vm_version()), - Box::new(self.build_current_cycles()), Box::new(self.build_exec( Arc::clone(&script_group_input_indices), Arc::clone(&script_group_output_indices), @@ -323,6 +322,9 @@ impl>, ) -> Vec)>> { let mut syscalls = self.generate_same_syscalls(script_version, script_group); + if script_version >= ScriptVersion::V1 { + syscalls.push(Box::new(self.build_current_cycles(0))); + } if script_version >= ScriptVersion::V2 { syscalls.append(&mut vec![ Box::new(self.build_get_memory_limit(8)), @@ -1044,6 +1046,7 @@ impl { let spawn_data = SpawnData { callee_peak_memory: *callee_peak_memory, @@ -1053,6 +1056,7 @@ impl= ScriptVersion::V2); } + +#[test] +fn check_spawn_current_cycles() { + let script_version = SCRIPT_VERSION; + + let (spawn_caller_cell, spawn_caller_data_hash) = + load_cell_from_path("testdata/spawn_caller_current_cycles"); + let (spawn_callee_cell, _spawn_callee_data_hash) = + load_cell_from_path("testdata/spawn_callee_current_cycles"); + + let spawn_caller_script = Script::new_builder() + .hash_type(script_version.data_hash_type().into()) + .code_hash(spawn_caller_data_hash) + .build(); + let output = CellOutputBuilder::default() + .capacity(capacity_bytes!(100).pack()) + .lock(spawn_caller_script) + .build(); + let input = CellInput::new(OutPoint::null(), 0); + + let transaction = TransactionBuilder::default().input(input).build(); + let dummy_cell = create_dummy_cell(output); + + let rtx = ResolvedTransaction { + transaction, + resolved_cell_deps: vec![spawn_caller_cell, spawn_callee_cell], + resolved_inputs: vec![dummy_cell], + resolved_dep_groups: vec![], + }; + let verifier = TransactionScriptsVerifierWithEnv::new(); + let result = verifier.verify_without_limit(script_version, &rtx); + assert_eq!(result.is_ok(), script_version >= ScriptVersion::V2); +} diff --git a/script/testdata/Makefile b/script/testdata/Makefile index 79df20d70a..e57b995194 100644 --- a/script/testdata/Makefile +++ b/script/testdata/Makefile @@ -69,7 +69,9 @@ ALL_BINS := jalr_zero \ spawn_caller_strcat \ spawn_caller_strcat_data_hash \ spawn_recursive \ - spawn_current_memory + spawn_current_memory \ + spawn_caller_current_cycles \ + spawn_callee_current_cycles ALL_LIBS := is_even.lib \ add1.lib sub1.lib mul2.lib div2.lib @@ -138,12 +140,14 @@ get_memory_limit: get_memory_limit.c set_content: set_content.c spawn_big_content_length: spawn_big_content_length.c spawn_big_memory_size: spawn_big_memory_size.c +spawn_callee_current_cycles: spawn_callee_current_cycles.c spawn_callee_exec_callee: spawn_callee_exec_callee.c spawn_callee_exec_caller: spawn_callee_exec_caller.c spawn_callee_get_memory_limit: spawn_callee_get_memory_limit.c spawn_callee_out_of_cycles: spawn_callee_out_of_cycles.c spawn_callee_set_content: spawn_callee_out_of_cycles.c spawn_callee_strcat: spawn_callee_strcat.c +spawn_caller_current_cycles: spawn_caller_current_cycles.c spawn_caller_exec: spawn_caller_exec.c spawn_caller_get_memory_limit: spawn_caller_get_memory_limit.c spawn_caller_out_of_cycles: spawn_caller_out_of_cycles.c diff --git a/script/testdata/spawn_callee_current_cycles b/script/testdata/spawn_callee_current_cycles new file mode 100755 index 0000000000000000000000000000000000000000..b726e5699fe594cf5ed4a793efc4c3e0ca1d810d GIT binary patch literal 4744 zcmeHLe{56L9{--(+j~2ybhFEwW}B21H`s%^(JAnN*>1KSsDl{s1(FBr?&>zR3T*)~ zS?rH>T{l2UNedyy{Rl+R5OtX~yu7#9w~UdzkoaDL)0pU3E1hwnGwU44=H5BG_kip3 z{pBCVWZ&eR&-s48pYQp8?>V>k_S`p2Pn#KpfC>XsKs2*tGf0khl{g?i18f8t?v=0% zBkX6f?do!gm;pO8bef5ve39?x9)LBx=%fhQqE1*GZfhm~+B`9iqD!*BFCmRH=6Fm+ zqgkTK)rh-XT zPaS$h|A-tJk=GrNbHnrTe>vXr*9a#ww@~j+H`#sa@Hgr4dxW|NNQ{~}HRLjp+ zJv1bahAMG(V+#JkF{ZVE%&EzDZoM5f<`j+khCS0<;zWwf?D>}o&phOa;LJ(f{1)xe z@6$bXOask*0y9E>^aEk#;Vo#yEU(*`v&QT(k?U}ml4=PXkA?!gQ_ZtZ zZlXA$4<-%5u_UN>Z!)M^*6De&pw7>(WWAC2#Hx8y!%!n;y9k>w2}|h2?Ehho)m1h0 zG%(F_tJl4?x-=jh7-T|+XCM~;+x5^PZhmXWrLZ!tOd9#PedMQ{F|WIi8#Huq5e6U} zZgigmEgywmE(%)QdgT~#>t!+G)+@t^TQ7qVw_b!1w_d=A8{UWMX;mofhik_|VL4jp znQO;(M?>Kf5OcJ7lkVal!|qsK;hUA=_<=#Z-YAEgC>k$L;5Fe5jPUJ<(r*#keoz{l zF1D)`r|MOzf0pY6=Mp$+ewd@tf zRY>SmEtA*k6|XUsr+hfGUqNC?O#IHx*?fNLju0PHoC!o`q)GL$ z>iEfInq0YB;g+ip&)gp`;HP}U4??UusEC=@Me}7-x8v9AZ{bRQ+&U0{DxE$b4e=VL zAXeON{7=Y#YreQ$IrjDd$w6|FEb?vF`stkA)nwLgb3B_**`oh!y&b&}koBYKkJ@x? zfA{zI|K-55ld?;m^!8hA3E8HO6+NTHv$g5xC-#i*P1KJHSy@bJ=fzI{_PO1@RYAya zP0tHESn#ubiB&6wwq=Yj%4!7fVOdMX_1yS_74zrnxP~!T)sdbf%R=w2o67#YZ zuY<272&d}iHVCZ&R{H@9)-Qb}S>=BXcYthd5T@Vslmt^uM21Dzg$%4AMTx+g3^3ANcZ)A5a`0*3Rj7(WwvZyER+YngMJ$TB}QX}jbXA5I}O*0zp zCs(p%@ABnx^X5O?0DaRH&|*#d$>*A&Sx{YrGh7~=9M(6^Xpl+y9eGCa8ts;uhwTHt zbCz;s`uB0|g^{v*EW&Bog?Wlk<>VPBRLcQ%k!Mk9E0@^Jx(%txC#E2Vy08;KLuEA) zs@%i&?8U;~70GT~5cCTo5~>!2`2`_<%|a2sefKyL-!~sg*eW5d%v~V*%L+vtm5};> z?EUm!O3jDeisFBWd6fM=&f6}aOTyL{I zW~q%ZLqqmptCjYd%5mGiZ0e>+H;M&^T%)I<1}B2o{n}!O|qc-99t^zxI}Vr2qf` literal 0 HcmV?d00001 diff --git a/script/testdata/spawn_callee_current_cycles.c b/script/testdata/spawn_callee_current_cycles.c new file mode 100644 index 0000000000..b84fb5353f --- /dev/null +++ b/script/testdata/spawn_callee_current_cycles.c @@ -0,0 +1,15 @@ +#include +#include +#include + +#include "ckb_syscalls.h" + +int main(int argc, char *argv[]) { + int caller_cycles = atoi(argv[0]); + // Callee's current cycles must >= caller's current cycles. + int callee_cycles = ckb_current_cycles(); + if (callee_cycles < caller_cycles) { + return 1; + } + return 0; +} diff --git a/script/testdata/spawn_caller_current_cycles b/script/testdata/spawn_caller_current_cycles new file mode 100755 index 0000000000000000000000000000000000000000..efa2fcec4dc2521451a7944a9c92c52bcb89966a GIT binary patch literal 7008 zcmeHMeNYqE7C*cBB7&%m6-%^6qEMMOkB=xyFcXj@N-gc{tM+52m9T_QQ6UjsMl@fW zHG$~((t>SlOW{3UwNs{}l0WqQDfyv|!#{cehn$`d9zz z40q=4@7#NS=bp1?@9s_RJ)qxgz%dN?g2Ru%v|@3#Psb?=7PA7=tAn*5K-U1saVo>yu?m-QJUdk$Yg!ycnVTl=$Yr}lbj>EkYmiG~dJTH5JU7ye+ z?n`!!fTB!r+CH9Dd8E_Plt7Ju?!cC+mTUPF&yQ`r^~&|HH@W*0r}M(nr}cUEJh@8> zgs)5>mwp!U@3|2n)f#D7XU}EqnjbxWj8rF5q4*U@7Z1nZ4X+D&U&P2v#wyfQHeILo zlxT!6V1D{?8!>krMEdrE*rFTOJn{rNr}jp9UPYP7VZ-!xJ!Y^QFr(e*k7_<(LANju zM&~J@g<566R*rxzclt${*e0~=--lMg7$giidPV>?`XwOJ4!>vAj`}54pdCL3+PhR~ zR+M&1r1zmQDZ}EZCG-6UUvlzeVk=iq3q)0rzPcISIEU=P)2%nlM3l?-p~Kd+0Kjiw zZjw><37H!UOAp!g$a{7idQ>uz+5A`+D^VttwW1LyP~-Y10W*w@E*mC4$zG7q4I@l<`D8arqy~a>+!53jVt|ljtt2zZfM(7u=GoDK=;=s6JQs*L&nyqG3BMJj zujoFeu-tOG(5>|qkGIhQ@6QoA6%B;#gJtAu^37nw37yJ$@*uWZ>;9a&L1!L(%{Snd zdwz=KQSw7`fUy4%PikfRZ%2YL|H-yLU3@qo3`YX7X!b;3e^h?xc7)LdoM$5%`m^kS z<7(vbLz%<&{Iky9l0d_Fgm8{8^hbIlL3%1%+jr@3HJ$IZ8{0hbLoKd^A~}Wbfo^z2 zW*LkGperI5_D3{Sfi8Iz+mJwI-dc3My1(|?Kd0Wgdv84c?%B~h!zYJ6?Q8EbOpT0g zyP0Dl)xCQ)0yE&dZ?Its!s_6m|6<`ZQXA@gd;A?b==ugD*9GgXSg8A{ zF^!bO!kL;F4;K3L)e)8FM*Ulq)|W${qz&$%*NcTU8kZMB=j(2^?923}HK^#bu3)qk zBi9FA0SJBe;h@I%H;l~6bZMkdVWEHd`UmQR5)ZPY4C{{(7i*-!`g+*i%zAvl+ZV46 zZaVi4%|>^+qi%JgD~Gt~3TIvN9DjGe_sxz6V+m&(+?p5)`=le&*Rqd|f{pBrb8I9J zMe#r1BtMfvOS7&F)RS3Ebic+G`mSa&Kt}^J3q$W#Tn^ATBN}M~1nZNqlLe0y-L~eF z?PP52?ehGJ*zGs=<<*_2dyQ(Z_%rkNFGv{bD$y6^_4sKc$RxQS9!~5__YCR?-yq0d zUZ;}@bHSdwq<|7G7do0k!z&{CqOKA@O=B{N3m7KDBI*%a=$gUoEyyWqDZe}frwwCz*R0{Xb?YcB%<#Cwz7r!p3QA3NTAraGxVb9o?r46uCz^nM%1jML|q+9 zn+TY<7t=HE@A?hNG*Q)w`}a)3`OqiV{59gpdhf@LF`<~jY)Po{^1TJU4%;blr_L*G z!T}l^OKfeRlypF=xC4}^wu%s<+A2hdYO4Sts;xLeR9i8GsI~$^RM9tMVq%`Zk%Di1 z{zegY|B8R>d%45km;|g3w`0(j_*0|peB9E*+Qv{-=iRqEm|RKzdh{=XQxb5Vp+Rs) zg1x@e*=@whs?2Yc;xRnF&oGoTyk?Zo4beL&R?+Ql`^Mm&E?gFi2`I5#AOgcd>WLuT zEp>L&)0!<^cql<1qLv@Jq&<$_Km znO+p??7pX>^yq0Y*~IjW^lH`fqk@m^<9T=8eS&q~Wi364Q~BdthhG_bt*@|$kV^67 z`u2J%Z~A5D3J=I#=xgz;5GdiPz7@*}cQo$o5Gn}A9zmV@+QQIcb)>C8T-0mLAzMhi zwzoW|qNM`gZbE*XNgg;_Fr7iTXrb~WA(*Z>lccG^MlT4S^uWYndy;1aZxSGuGsC-# zSV&_bI_c*xuV_7{4rkJ)ROe~oe1`Sr;42i~bnToHMYH>y3dv&~{4BmdD}_RQX+vV4 zc-a4fT4%ptTBv<}Nx}3&(?Um6{}ekTnfZ8vLTjD@(@UEL9rkf&2EFXP&ZEYAyatJaIYYR~Eym+k$veUx}C%k=THqK{NASB)i0Y8lg>xRy%<6 zShL_XHsL^GN@`lVdi9!&wd+iUM3K3;q_nKOVteI|ox7^4E!N#Nd-jsGXrS3Ln}OL3 z%w}LV1G5?ULuTL}w+B$m{qNt*A%8P3J<9&ij#|Xx84h{@_9 zMQC?pw#;T=HUqO6n9aa!27X@#6x{wakH!rfG8Iphq?ygD&Fb`&l+?AW6sc*dG*t?) zDr5eZUwX2iMb4|sEJO|3F+ielzNorpjk+vtSIV|Z=3-(l1aqmatlYgll@SU}EEKXp zuwX#|pt6)&tkqUiA*ih8y;e|F?<_J|O`tNDZY!=fRhmInwxi6t%~V}&B0*J*8obQ% zEG!gSETAHGR#uvKFoQ4=s!UdEby?wVtC{(O{ksdZ1~Y5({XKt#L-$(@vSm#aCvbo^ znjR`>L;Jo(8rQ3kvMarUJ6~A&5F3CWj{iOI7-x?*r`ht$c>~*I&ORP2Guuj}j762V zkK*j3xbqAC7=s^!_s`>>kYe5g_KP|D#hf9}`z?D7QZVY k$oH-pv|rAvo|~cI?fGt|&BxC7F*w1+U;1Dtl4sig9|w`;asU7T literal 0 HcmV?d00001 diff --git a/script/testdata/spawn_caller_current_cycles.c b/script/testdata/spawn_caller_current_cycles.c new file mode 100644 index 0000000000..f508cd3966 --- /dev/null +++ b/script/testdata/spawn_caller_current_cycles.c @@ -0,0 +1,41 @@ +#include +#include +#include + +#include "ckb_syscalls.h" + +int fib(int n) { + if (n < 2) { + return n; + } + return fib(n - 1) + fib(n - 2); +} + +int main() { + // Use invalid calculations to make the current cycles a larger value. + if (fib(20) != 6765) { + return 1; + } + + int cycles = ckb_current_cycles(); + char buffer[8]; + itoa(cycles, buffer, 10); + const char *argv[] = { &buffer[0] }; + int8_t spawn_exit_code = 255; + uint8_t spawn_content[80] = {}; + uint64_t spawn_content_length = 80; + spawn_args_t spgs = { + .memory_limit = 8, + .exit_code = &spawn_exit_code, + .content = &spawn_content[0], + .content_length = &spawn_content_length, + }; + int success = ckb_spawn(1, 3, 0, 1, argv, &spgs); + if (success != 0) { + return 1; + } + if (spawn_exit_code != 0) { + return 1; + } + return 0; +} From 3fd9de51b3c6e7a072d641e42ceb215b1cb67f39 Mon Sep 17 00:00:00 2001 From: mohanson Date: Thu, 6 Jul 2023 10:20:40 +0800 Subject: [PATCH 034/125] User more strict checking in spawn_callee_current_cycles --- script/testdata/spawn_callee_current_cycles | Bin 4744 -> 4760 bytes script/testdata/spawn_callee_current_cycles.c | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/script/testdata/spawn_callee_current_cycles b/script/testdata/spawn_callee_current_cycles index b726e5699fe594cf5ed4a793efc4c3e0ca1d810d..1c2dd40aa077b6b63675e0cae5d1acad0e851907 100755 GIT binary patch delta 456 zcmeBBouN8GLNJVxkpTo8z$631jES1^On3PvZ)6jjm|($a$qo^>oVZY2&<4t}5r^op znRrr1+KPE=;}@IUiHDn}E4997UMBRhZQ^Y_b!hz4Z5)`yB<99yA|s{L1!Z;(L&M<7ro* z{L$jca~M?_izgpq)OIcrW@jm3d!zQmxbwL~a_@5n;YdpdVHTE>Mi-fcRu)B;rs6ylqL4ZOH}-Q3 delta 440 zcmbQC+Mzl@LePzokpTo8z$61h$3#tern7vL53-3(Ot9e8WQT}rPFyH1r~~Ebh(q+~ zOgyP0ZOOc~@rzCF#KTR~m0I63Fa&fYItsEq0kU`|3ouGaEJ|QhHCAP1bYyI5m<%+a z^SEQGFsp0myI_aOPk)2=}IqeYX~Fsd>ZO}@ma?OZI( z&Qi?wM(v4l=W~bT-scR$k(Lg^EG)&1E;0$NEQ%~m(;vT4`R|%?G<|YAdkIK2NF_*B zayL*lP~~I?rpJs)n^l;-nOIANSz1aqm$05;G&FZJ@kIgIj{23W-CjaEu=hR?>sL_~gC}7SB52MM2K%N0qgTdsD0_Kxf2nbC6 zAz*+oX0oB6Ip+j9i2eza3kA(5X9x;R-XUngxM1=}L3_rtlMRLJ8D%FI3aJAChGA;r diff --git a/script/testdata/spawn_callee_current_cycles.c b/script/testdata/spawn_callee_current_cycles.c index b84fb5353f..c2005c9da4 100644 --- a/script/testdata/spawn_callee_current_cycles.c +++ b/script/testdata/spawn_callee_current_cycles.c @@ -6,9 +6,9 @@ int main(int argc, char *argv[]) { int caller_cycles = atoi(argv[0]); - // Callee's current cycles must >= caller's current cycles. + // Callee's current cycles must > caller's current cycles. int callee_cycles = ckb_current_cycles(); - if (callee_cycles < caller_cycles) { + if (callee_cycles < caller_cycles + 100000) { return 1; } return 0; From 8bea079b1439a673ff7ec5d6ea547ce4fa053a29 Mon Sep 17 00:00:00 2001 From: mohanson Date: Tue, 11 Jul 2023 15:16:48 +0800 Subject: [PATCH 035/125] chore(script): test case spawn_peak_memory_512k_to_32m --- .../tests/ckb_latest/features_since_v2023.rs | 32 ++++++++++++++++ script/testdata/Makefile | 6 ++- script/testdata/spawn_peak_memory_512k_to_32m | Bin 0 -> 7008 bytes .../testdata/spawn_peak_memory_512k_to_32m.c | 36 ++++++++++++++++++ 4 files changed, 73 insertions(+), 1 deletion(-) create mode 100755 script/testdata/spawn_peak_memory_512k_to_32m create mode 100644 script/testdata/spawn_peak_memory_512k_to_32m.c diff --git a/script/src/verify/tests/ckb_latest/features_since_v2023.rs b/script/src/verify/tests/ckb_latest/features_since_v2023.rs index 05990ee14d..82d7e96964 100644 --- a/script/src/verify/tests/ckb_latest/features_since_v2023.rs +++ b/script/src/verify/tests/ckb_latest/features_since_v2023.rs @@ -22,6 +22,7 @@ use crate::verify::{tests::utils::*, *}; // check_spawn_big_content_length: fails when content_length > 256K. // check_peak_memory_4m_to_32m: spawn should success when peak memory <= 32M // check_peak_memory_2m_to_32m: spawn should success when peak memory <= 32M +// check_peak_memory_512k_to_32m: spawn should success when peak memory <= 32M // check_spawn_snapshot: A spawn B, then B gets suspended to snapshot and resume again. // check_spawn_state: Like check_spawn_snapshot but invoking verifier.resume_from_state instead. // check_spawn_current_memory: Use current_memory() to terminate infinite recursion. @@ -572,6 +573,37 @@ fn check_peak_memory_2m_to_32m() { assert_eq!(result.is_ok(), script_version >= ScriptVersion::V2); } +#[test] +fn check_peak_memory_512k_to_32m() { + let script_version = SCRIPT_VERSION; + + let (spawn_caller_cell, spawn_caller_data_hash) = + load_cell_from_path("testdata/spawn_peak_memory_512k_to_32m"); + + let spawn_caller_script = Script::new_builder() + .hash_type(script_version.data_hash_type().into()) + .code_hash(spawn_caller_data_hash) + .build(); + let output = CellOutputBuilder::default() + .capacity(capacity_bytes!(100).pack()) + .lock(spawn_caller_script) + .build(); + let input = CellInput::new(OutPoint::null(), 0); + + let transaction = TransactionBuilder::default().input(input).build(); + let dummy_cell = create_dummy_cell(output); + + let rtx = ResolvedTransaction { + transaction, + resolved_cell_deps: vec![spawn_caller_cell], + resolved_inputs: vec![dummy_cell], + resolved_dep_groups: vec![], + }; + let verifier = TransactionScriptsVerifierWithEnv::new(); + let result = verifier.verify_without_limit(script_version, &rtx); + assert_eq!(result.is_ok(), script_version >= ScriptVersion::V2); +} + #[test] fn check_spawn_snapshot() { let script_version = SCRIPT_VERSION; diff --git a/script/testdata/Makefile b/script/testdata/Makefile index e57b995194..1550a931de 100644 --- a/script/testdata/Makefile +++ b/script/testdata/Makefile @@ -71,7 +71,10 @@ ALL_BINS := jalr_zero \ spawn_recursive \ spawn_current_memory \ spawn_caller_current_cycles \ - spawn_callee_current_cycles + spawn_callee_current_cycles \ + spawn_peak_memory_512k_to_32m \ + spawn_peak_memory_2m_to_32m \ + spawn_peak_memory_4m_to_32m ALL_LIBS := is_even.lib \ add1.lib sub1.lib mul2.lib div2.lib @@ -156,6 +159,7 @@ spawn_caller_set_content: spawn_caller_set_content.c spawn_caller_strcat_wrap: spawn_caller_strcat_wrap.c spawn_caller_strcat: spawn_caller_strcat.c spawn_caller_strcat_data_hash: spawn_caller_strcat_data_hash.c +spawn_peak_memory_512k_to_32m: spawn_peak_memory_512k_to_32m.c spawn_peak_memory_2m_to_32m: spawn_peak_memory_2m_to_32m.c spawn_peak_memory_4m_to_32m: spawn_peak_memory_4m_to_32m.c spawn_recursive: spawn_recursive.c diff --git a/script/testdata/spawn_peak_memory_512k_to_32m b/script/testdata/spawn_peak_memory_512k_to_32m new file mode 100755 index 0000000000000000000000000000000000000000..118c5ab1d3667660fd139ae7df1657e77c51cb44 GIT binary patch literal 7008 zcmeHMeN0nX7C-m3?}LF6n4&NXu9XU?JJSJS{1``;f^F5ELHEN^C)u&(Q7NNUfvRXi zZ2NdE_%X)RfD?BTh3Jk>V%#Ncjb@i+31YG_aX(ylGs!H_j_qWL#aP4-Dtj;QJwKY6 zzvi#a_9XZH?z!i8?m6$g+xOCY4;tSyQ3!z|6x;`*waH@@vcZxgb%?D3mV*jk(;yWi z>{jEkv)M8+0X8J)N+g2xOSTs+0B%k)DhL^pPFM`-$~t7oelj+*67Q0X3eS+~Hs%jA zp~bCHaJ{GMb;sUy93Sv>=8I7Per`j2Q#X4LM05E=KgRMY?^svFGwccd%9?Vc9CKW= z{OoQO|M=H{jCU-i+5)S`MaJP(E!QP3GSLN5&}NDD{0K50H6oK}%Hi^I{B4_sCY(?@ zjHjal>x5vw2P1!@jV*nCoL~Ep!KR^&_Ss)}T%DN!ez&_`Bf2LvUi2vC6Spx6!V8^z}ihclP}#ST;oAj|^pe1CS{?elRvWV93lL7KYptOz3!&%3Qts9FQ^xCrAoX81+)fUvUhL#)FrkIRs`$mBLMAspkaE(WT`-|s_Rh4Q)l&LaJ`$$RoB7lSfC{=ut&6%W`J!|W z!AtIqYO#-R7@++7CZRw0`w{j}FGA9uL=v*#Ww?+7*wJp3$x zGMTabNMQ(9n604rZ*HfFX5RZC&0xRSrr~m$RYM$@1d;1uBOna1aOQA)Qp4S(PO&WT zh}CG=OBCN8e#M_P{-bynT03}G!-9%G63#eZb>37Ob5dukbA4%W>@d-Y;JC)1cf5Hbx zxl_K*so=HSQ}Ina^OWP&DNxFR0bS$sX1$U&syx+7kv!KZoSsic{$n4fAbH6`FBF_(>pPeeScN(L^ww7T*J9&&A!Q3gL&+IVJHXstJ=AK)0=@@ z)%{1ok(!4%lgF$2f-gENjsvZ`E%RW$DX3>dV!jPHT-|)`g zb<92L2O(3Wa%}0ivSRtsFr)Wf^t#tv-8V>SW+9cx>ewTTO_`i4@3Azysu#zCt4 z*n_9Rg9B3+PwHG8@M@0g@zSW$s~TWHSi?fgQXT$1>RfZsRrY!X&Bo^h2Zo;NMI){n zS>wn^dcSP=*|_S8JGSnjH>6r|XkOQF;Z$|(gRu`IABAd$`IHoD@!^Yy#dYy5!h&|l zZH-Oy>(wBtdqNB5^WIcS2&lEZXP>I2Y$Pj~Q#O6h!qkpBEBANprw)vMT)Dk#JGH}# z;|N9VaMBWA#<%*^x=U)Xekl~Clw9pN1gbaMVd9v(s69$`sxV7fc4!`-C%)vk)@_>b>HKRS(#P+YR4 zwCwGr%a*UO*6_8qZFTngkGJn|?A*1xp|Q!iXYan|{RapSw2CYwqA1U?E#qZTKNES} zFeB(&L?Tqq2=y&O?AnWV|M$Qj5*AB|A4q z!pkx$_WyO1cM)J#>5VVSUUS?T`-;Z98%ar4AX$NA1(Fp=R^a8&dPlpk zZi&tIwymtRxVU8bB5lbM{StjKNG5aj#%Cjj^*DHAeG|VI@BQGeI)iT9yR@u+$?oE< z4sx-Q3r{Ww9F9FZN=T>1DnX3|yaY`c0Q61vCTFA5S_68gt=S3s#$B~mrxo-z`_^rZ zR)-Dr^*igGTdj?a*8QO0h83kR@tP#4X=(yJzsupU?Ie?s4E0v0v$4KrkJCmrNxrv` zZ!q~b&+PeQjLc{RCE1}EWF2qhz9e{Cea1r>-^@y1`ptL`oX8^O!!M~IA3Mkz!0Wh2 zD0qupl4s`)l1k1#UX(;#hmEsvQ~WvEpOeoolw%BK4kf;VZ(&3F3;sE>e~#>^@V?7` zB{sa6zq08#Q5*y zaT2jOfv5PtnJ_M8C;1T52e{$byAx>7&Z{;g7!-eHnCMFG${4{3Ie+_$gSemQ|6g9z B{SN>D literal 0 HcmV?d00001 diff --git a/script/testdata/spawn_peak_memory_512k_to_32m.c b/script/testdata/spawn_peak_memory_512k_to_32m.c new file mode 100644 index 0000000000..21680926ce --- /dev/null +++ b/script/testdata/spawn_peak_memory_512k_to_32m.c @@ -0,0 +1,36 @@ +#include +#include +#include + +#include "ckb_syscalls.h" + +int main(int argc, char *argv[]) { + int8_t spawn_exit_code = 255; + spawn_args_t spgs = { + .memory_limit = 1, + .exit_code = &spawn_exit_code, + .content = NULL, + .content_length = NULL, + }; + int8_t can_i_spawn = 0; + if (argc == 0) { + can_i_spawn = 1; + } + uint64_t depth = (uint64_t)atoi(argv[0]); + if (depth < 56) { + can_i_spawn = 1; + } + if (can_i_spawn) { + char buffer[20]; + itoa(depth + 1, buffer, 10); + const char *argv[] = {buffer}; + uint64_t success = ckb_spawn(0, 3, 0, 1, argv, &spgs); + if (success != 0) { + return success; + } + if (spawn_exit_code != 0) { + return 1; + } + } + return 0; +} From 9cf92da60a7db567298e2f329354b354cc13cfc0 Mon Sep 17 00:00:00 2001 From: mohanson Date: Tue, 11 Jul 2023 17:48:25 +0800 Subject: [PATCH 036/125] Update ckb to v0.24.2 --- Cargo.lock | 8 ++++---- script/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 66155fd786..6e02264f93 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1523,9 +1523,9 @@ dependencies = [ [[package]] name = "ckb-vm" -version = "0.24.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77a1ce8d1ed8b18041d194ffe0d647c3a707af9347f49b5f543317c73943634" +checksum = "cb89eb30f9e82e63c637a0824e25b12d99de9be9c36675ba6f79479094a8b42c" dependencies = [ "byteorder", "bytes 1.4.0", @@ -1541,9 +1541,9 @@ dependencies = [ [[package]] name = "ckb-vm-definitions" -version = "0.24.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "328c7a6b5664483d5c02fae7b0ada0c407660e7064b2f1505ee6f5d07a4dbf2b" +checksum = "9d51f3b5550ebe2a37a6921127273afc00257b11f39517664dd0b35455d7e396" [[package]] name = "clang-sys" diff --git a/script/Cargo.toml b/script/Cargo.toml index b16fb6ed8d..f583b88923 100644 --- a/script/Cargo.toml +++ b/script/Cargo.toml @@ -22,7 +22,7 @@ ckb-traits = { path = "../traits", version = "= 0.111.0-rc8" } byteorder = "1.3.1" ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc8" } -ckb-vm = { version = "=0.24.0", default-features = false } +ckb-vm = { version = "=0.24.2", default-features = false } faster-hex = "0.6" ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8", optional = true } serde = { version = "1.0", features = ["derive"] } From 2dc251624a7da1b79a4ce0ac9d0e36ca267c263e Mon Sep 17 00:00:00 2001 From: mohanson Date: Mon, 17 Jul 2023 10:52:27 +0800 Subject: [PATCH 037/125] deps(script): update ckb-vm to v0.24.3 --- Cargo.lock | 8 ++++---- script/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6e02264f93..cdf443d006 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1523,9 +1523,9 @@ dependencies = [ [[package]] name = "ckb-vm" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb89eb30f9e82e63c637a0824e25b12d99de9be9c36675ba6f79479094a8b42c" +checksum = "1f5747a877a71ff164fa0f17daf6e9abca036c2381b8576679fb3ac07ae77bbc" dependencies = [ "byteorder", "bytes 1.4.0", @@ -1541,9 +1541,9 @@ dependencies = [ [[package]] name = "ckb-vm-definitions" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d51f3b5550ebe2a37a6921127273afc00257b11f39517664dd0b35455d7e396" +checksum = "83869c9d322de1ddbfde5b54b7376f9a1ac32273c50e21cdd5e8a1bd1a1cf632" [[package]] name = "clang-sys" diff --git a/script/Cargo.toml b/script/Cargo.toml index f583b88923..708bd6fc58 100644 --- a/script/Cargo.toml +++ b/script/Cargo.toml @@ -22,7 +22,7 @@ ckb-traits = { path = "../traits", version = "= 0.111.0-rc8" } byteorder = "1.3.1" ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc8" } -ckb-vm = { version = "=0.24.2", default-features = false } +ckb-vm = { version = "=0.24.3", default-features = false } faster-hex = "0.6" ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8", optional = true } serde = { version = "1.0", features = ["derive"] } From 920baf76ca1cbb9f9c04a74ae377de977db4f16e Mon Sep 17 00:00:00 2001 From: mohanson Date: Mon, 17 Jul 2023 11:41:09 +0800 Subject: [PATCH 038/125] test(script): add check_spawn_times_bug test case --- .../tests/ckb_latest/features_since_v2023.rs | 97 ++++++++++++++++++ script/testdata/spawn_times | Bin 0 -> 15288 bytes script/testdata/spawn_times.md | 81 +++++++++++++++ 3 files changed, 178 insertions(+) create mode 100755 script/testdata/spawn_times create mode 100644 script/testdata/spawn_times.md diff --git a/script/src/verify/tests/ckb_latest/features_since_v2023.rs b/script/src/verify/tests/ckb_latest/features_since_v2023.rs index 82d7e96964..09ed1b2ce4 100644 --- a/script/src/verify/tests/ckb_latest/features_since_v2023.rs +++ b/script/src/verify/tests/ckb_latest/features_since_v2023.rs @@ -27,6 +27,8 @@ use crate::verify::{tests::utils::*, *}; // check_spawn_state: Like check_spawn_snapshot but invoking verifier.resume_from_state instead. // check_spawn_current_memory: Use current_memory() to terminate infinite recursion. // check_spawn_current_cycles: callee's current_cycles should inherit caller's current_cycles. +// check_spawn_times_bug_1: BUG: execution results may be inconsistent +// check_spawn_times_bug_2: BUG: execution results may be inconsistent #[test] fn check_vm_version() { @@ -777,3 +779,98 @@ fn check_spawn_current_cycles() { let result = verifier.verify_without_limit(script_version, &rtx); assert_eq!(result.is_ok(), script_version >= ScriptVersion::V2); } + +#[test] +fn check_spawn_times_bug_1() { + let script_version = SCRIPT_VERSION; + + let (spawn_caller_cell, spawn_caller_data_hash) = load_cell_from_path("testdata/spawn_times"); + + let spawn_caller_script = Script::new_builder() + .hash_type(script_version.data_hash_type().into()) + .code_hash(spawn_caller_data_hash) + .build(); + let output = CellOutputBuilder::default() + .capacity(capacity_bytes!(100).pack()) + .lock(spawn_caller_script) + .build(); + let input = CellInput::new(OutPoint::null(), 0); + + let transaction = TransactionBuilder::default().input(input).build(); + let dummy_cell = create_dummy_cell(output); + + let rtx = ResolvedTransaction { + transaction, + resolved_cell_deps: vec![spawn_caller_cell], + resolved_inputs: vec![dummy_cell], + resolved_dep_groups: vec![], + }; + let verifier = TransactionScriptsVerifierWithEnv::new(); + let result = verifier.verify_without_limit(script_version, &rtx); + assert_eq!(result.is_ok(), script_version >= ScriptVersion::V2); +} + +#[test] +fn check_spawn_times_bug_2() { + let script_version = SCRIPT_VERSION; + if script_version <= ScriptVersion::V1 { + return; + } + let (spawn_caller_cell, spawn_caller_data_hash) = load_cell_from_path("testdata/spawn_times"); + + let spawn_caller_script = Script::new_builder() + .hash_type(script_version.data_hash_type().into()) + .code_hash(spawn_caller_data_hash) + .build(); + let output = CellOutputBuilder::default() + .capacity(capacity_bytes!(100).pack()) + .lock(spawn_caller_script) + .build(); + let input = CellInput::new(OutPoint::null(), 0); + + let transaction = TransactionBuilder::default().input(input).build(); + let dummy_cell = create_dummy_cell(output); + + let rtx = ResolvedTransaction { + transaction, + resolved_cell_deps: vec![spawn_caller_cell], + resolved_inputs: vec![dummy_cell], + resolved_dep_groups: vec![], + }; + let verifier = TransactionScriptsVerifierWithEnv::new(); + let result = verifier.verify_without_pause(script_version, &rtx, Cycle::MAX); + let cycles_once = result.unwrap(); + + let (cycles, _) = verifier + .verify_map(script_version, &rtx, |verifier| { + let max_cycles = Cycle::MAX; + let cycles; + let mut times = 0usize; + times += 1; + let mut init_state = match verifier.resumable_verify(max_cycles).unwrap() { + VerifyResult::Suspended(state) => Some(state), + VerifyResult::Completed(cycle) => { + cycles = cycle; + return Ok((cycles, times)); + } + }; + + loop { + times += 1; + let state = init_state.take().unwrap(); + match verifier.resume_from_state(state, max_cycles).unwrap() { + VerifyResult::Suspended(state) => { + init_state = Some(state); + } + VerifyResult::Completed(cycle) => { + cycles = cycle; + break; + } + } + } + + Ok::<(u64, usize), Error>((cycles, times)) + }) + .unwrap(); + assert_eq!(cycles, cycles_once); +} diff --git a/script/testdata/spawn_times b/script/testdata/spawn_times new file mode 100755 index 0000000000000000000000000000000000000000..c7dcd39e58e0206107a29fda1098222a07eacb1c GIT binary patch literal 15288 zcmb_j4O|r0wZAj7GrPc|kYT~kybUV^_vs3|EFUIXKzB97_)BfX)TV}ISQG{1V?jyc zE3nKW1dL`xV$}p85VJM@`Xp$Qend22G>OSCtt8qsMfs4l*w7S|Bna=^`A~v1eeHXf z-*D&t@44rmbMCo!&b>4HGutXVNf1a$B>FqTrF6Z7CCC*cancP&6HpwY;lCg9MGTZx zA|}-*h^;Y=)P9DPAtl#HWMVCDcPGh&a=Y{ZsYc0>T*g#1TnetpspK8=q;^U^u^pB* z(kj(Qu9f;zay=#C_Zegf<^F!y>q^J%{@rw0FZHA7t>jP1IO4YExbhvGt6)($A-vGEMXI8$` zkzTA%+nS%hb(=GN&U|IO#pd#;Ba|8|;hV_s*8l5zq!p&87cT^{w{oD1)f6SFBBD=< zC{|;l{R%c^X1MfOPWX4186_d%{{(wy7iPIKbF+%4q&_0cpCY$pA;*3@84m%>Po}}y z1pWnuX`*NRulQp=zHm*&f2w|G1Fd=rdW=u>_lfd|_Q}uOxaoTgG=Y9ff1E6z4f@0W zF&Tdkuo-Y=IUO1Lg3PC!`s~62mp;v@cVuO5%)$O16{Alpb~#}XA=RrSe=&%qyZOBj z_*DIL0)8J{ll#Z`oGI{2fX$i${|qq9-wCt1c#8UNz@nzWzW~gC3jC{oKtJ*i=owHS z^T~JS6=vo;3-sAr^TB4YnB*7hVP)Z**kqYGnXXJQAeb`=Pme@AJD?RpAJLNiEMn+}C5ch1(FCtaKH8eibZa8A%bBgy|H^o3I>TzK5jB-{v4BwSgU zY55L#N{K79xMJr!wmn(o9uHuOgxT7*3tP4)Ni`6|x< zd5(xhc)V@R!G0sHEcy&bW|lJ@^C5jCJ+N=#6e5?g&2j3N`^9SmPS}rd-DLbF8PCi~ zcW&3qUYfSGFeklWvEH@G3D2J#eP)3^NqkN|Qs}b5^D3L zm+z5^NU4{LXpQ__Rmze!2t6j_*$x-C$yspUk|j$V1qIH0(GZgQi}k4y;!{yCuKn{< zef8o~67bXoz7mM<7wdsJ>nm}dDR;C$E-P{^mCIVWK3Oiy;TKAk@qd-iZkdmwmnaPI znrw$pWjb&RF)4n*!E!0OTSm5PQBGmD7#v^X^D)E zv_{56#zw|P#z#d)MMasTEK$)>)~J}M*r>RucypvV%4{}U%+Y46ImR4ojx)zwA}vuC zv&CYGwpcAOmRL)iB|bVbIx5;6ZHbPKwnoQ9$419R$6F(is7{_z-U6@EpER5+e9u3zUQ{bxrKQaZ5 zC*})N;LiYFKVRa9lBOjjl@cQVy@3B3@M(|(9-!byp?G`>{2joL0Pd0KA64i-gK{t| zSSpOm3ClkO7YVrHTeu42*faycNAYouLgWT z!n+8l!1|5?9{QgMt&;E(1rGwlqyR4S7sq8D&@2Ev7w~Fm2lA8or@%)6*8nbWA;lJ$J_s*zfKT?n z1%TgxhhGAw1icjdE(iQxpvN(Wk}#hq06z*wtioW@wB3q*U6>vMxQRHPYt?}720TNu zZ-QOY6So%iI|}uk(J;m$BK^btyaRX-;G(>89mYQc{4(H^=kE~U=K-InH*QAS79hf2 z2Y1&>68r?sM|1()6M@V?Xn%N*%3&%u@pXE!c68>saK3@Rnwpf}kWM>73M6tBZO$Z=mHaf%(_`!j=^Y0TdWe}sl*5GBdcwKSv;a3+HZ>4#ji$#($? z(mbdkZ03qOP~cigJ%m(+c}#EUmFCg&BOx*HY-2om+N+vAS(62aZ5-Rm5X(cXP)D~f z)i?w?Aiyx=zfmJaAY;#bn{j}p^N?{U0vSglG{#ZdW*qc!&h{D3Z78p?9k$O2AZ&!4 zSRu=0Jagi^>v_u;OSd$t}sDO4F8r~bH=2MgvnzpmvrGDZ{Q^>pt;_1 z0>-4&7V44uNWC}w_V|>Qgus|@M24^B{2M7>_N~+_wL;;Y++{4E+s3Yahl>A#wd#-% z6ph%KRb1qcwlgy;S2Iu+SuSE)Rq`HG)otRzk6sKq{63L{YpV^O+- zSSk8vy`ZW8*+i7EVZ5wlZk}hLp})E3eAnvHH6tlQ>jzoC5XAZTX%?6Nw(>-|x$0Pz zv68o~m$lLlnktMvrvCK<^eL8}hXmbnwAiylH@|&vs-X6uHeH)4=;~6>tzp`EK(p4} z$*=J=crH{BE0cNLqp>_f9_{+CLixT_dwO#^lX8XaN$fv`=9+EFN_pj$K%j0$m z4u~Yrw|y?v+I#lR8=x40(qTLIO@~Gp9-e-nj)#`@3I5N%_R`E<2Wr*CYcCn=@_s(&ObdM$ z8IBE)al;+V6KCd}HF$@|3`d8@u3-KucKZtS#MwFTJ@MY04;>oe1vM$`gX>cbX=nht zm*HxL>&Wn!g<%qJtw^ft*vAc?C5d2R8#5+UsL8kLg1UpQ1^p%HOIEEWyJy`TD=Uf5 z3mpv~Ngi4~xMm=we|^t}F5#vXaTV%>%+ubAne`mS7~LH-;%OFeL&+y-M=-C>zA4;@ zMN2C_`16vL+>Uouf`%FAw$C6e{U;H-eLLb*nn>Z(m56_{jIM|2gZ z)gbo~8c|1V=&<@QZ8#b-ZaAhM4?O!q;vV%L+HmaJ7`KPH*QbLzOM|4>P@3zsE3~+* zIBoOk&7oV$w%iAvuww;ReAd@zrTbkPy^zT5Waj&?Y}v z_DeiE@S+FJetai!;37{P==2b?@2x-U z+ce$#)_o(WXQJoT*5DR?2w9k-goZj{J40Yw2t{_VhiHp(jmG^R*y24Ma-R=F)Ojm% zpR*zA+*;&*$BC$S3X%H^kKCtgk^93YM19zb+!xvrb>SkS&h#SpyWo{2+pt!Ip>!S5 z2$R}S7E3gi-A@?Yb*Rx@fehu_P-FQzWZ-WSjr=vj;Q54T^qeIO6&q1wMF`PGx2a*A zRqoR?^Z}OpFbw*zLLVT<8Ia>$kmKD#=w}^jEV&8&T!Vf-fqu?HKVVIF2+`O-fgGr$FcUTlAN2lh1R1?-M(4z180dXKuBQeVZsNS)Q8O10s+PsSRbyEaxy$G5UK zV^Q~9^+0?p9!F{XLSX!09W7(U@tZhqu`q7iVBAjPaYNKAH}SX;Fm42l8v)~nVB8Rl z8-j5o{l>7-It`9`H zhT6#;I?LKtMAH)`Ykxs%)p2MdFK4}k_5qrp$a@)~nR%YkhLPr>^Me-#KJM@Ax!kp3 zG;JhfX!Bssz;4H0r$yU|xQzGB-m0CMLeVf1P6Q)MY(4sV7gx;v0(F_%bO!&+2438?i*0N6iqM$dSoc zT*lD_#;VdsEcB{G(2yuy1-)!)MKv~~hu6}j-Pha4*qQ~1+j8hX9kv$hYb5s)ZM4v@ zku54O;;t@VNZ78}TKHd+Y$dN^RXoAbl`4+%H8odS{Jh8zc>sm;+(AD)!U3yq_pGm> ztbRyyrA?*j4duIsqHoFL^PD6rbGY5hY5XFv9>cMO!YTE$xwP;Y=8{QZ zF6)6yxXdNNeR(f;Eqx~D68>y=ZS`ni{pIrT+jj2yoZE7Ap0U#KOVIH3D#GxFFEac( znSe57c>OJko9;i0^}96=5ze&DJ!|^uM+Cob$2agfRmwQfp2h1{-Hnr9sWOZx7Ntqa65^c)Oy3SAJ=rh=r_o1S>SJ>7bF_q@S?t4 zyQ|s76!&G?H#cu)wp@KW>6wOS$Q@U+eQ*SJ5$`hiTxq;L&ndAMIs$Q+Sl6B-)!E$_ zPfAErwuCgh&%G_T&kE_pyAsdVHkroxq=fXjUOghw*fvXuy)aL16}C=7nhWR3H1sA3 zVTzh$n%?zNUm4}Fc1ZI4SeD0w=X<40=X6OeGhDiQxxWIrzaph&SiaOUyrNc)DD{G( zW$(s1;4bjaO$v4UQxal(S{{X8Aar*Gydg;9$N2lw^kA`W9==>AIM|-*mCBUg?TT5o8GMDcG33)ZKrm50;Y?xg;#aT>4}#cX&{X%h77S^LB5i zjF|4@yXZ8jT1R!)&K|9!yjOMQzMzzv2i6m-((c*=T-}nC)sQ9b1jMnWS4v~% zc}N+BUb{T5o53?-PjRgz6UIR7p-A-a-QT~RqM6$fz{%Zcmt#BvV#P7{2QD)d>d zrwXxtNag-jHA($iiySr!{W7__R#5RI{m4YVB|5Ik=N@;fY7DOyEuMBH6c!??f`KP; zi|zyx+K0!ppA!mo5Qp`lJ#9Nu+$U6H=2}c0vyZYf5Q`QfOG+oi?b}J z9qep$g+y8{m&W_yh++5D0B4Y6ci)~iW2O5yDnzR$N}>11+Wl1-Sy-#Ex8;fJ(-l?s zjH;nE<@aF?%Y8J8E*i&F>tb^*ZlCm4JowwJXc2*v* z$M7fy%Cp>gzl8QZri^>n24&ovX3FEf3aE}q=&Jm?ULm{H5l zPvAp{5$)bgVQmKDx-X&={K4)@`@w5VJ=|X|YHsO-Pb(QM8u7VVPrzY9YD+u9p zh#3D=ftGrH>oHfb45Q+<_Av(3iP%p(R3p^~IYSx5+(R~!Vwp6Exrb;Z#4=%k{BT(# zv@)n}phk5tVNj=_Mh13mOc83NVJAa(5{;@pVlTJ5@0MER z?#x^q10E|kmUEdWR1vwES0Y@u)-D*F+q*K?+p{vu+qH6&aWn!gm?6#igg)99F%;^I z7)f$QjHWqPc9DfEdstefZdPKL;RU%oyzediYqedvFCwzM{SlkIJrU{N zu835bIdg5etuc1>ANh|T#IY7MaripryjbaJ)EWFae;KuvGVWN`&8#tdPi(u@QkJP zWthi0)YAGo%C32+ZDo4qIheC0uOqgTryAYwKu%KzG3Uv~GO+!`-#h4V zX(O}})xPah5Rpt)-_!p=xGZ$2a0{FVEZ(cs&p8s@ZA zQ*qy&(ddGcZoIQ%M&2}w+5f}bCEYcLnR|@=Ca{VD9VTIaDQbxtCQ@h2QK&mYC29jAZqp{bBw55b zdaMid{EmIwL2q&-0v(sPz@?BhPc))MM_C z8DI;Cr!OA#Img?$xveUxZEf&;IVRNwV=mQOj3aOMMg(|=NMmpm0XsoNV*R zUdQ60rGo*PGn^VnwbMMXxZl_liDG2xE_5{)pA+7_e?MMH+k=D6BmQ=SwvB`s8T|v!gLJxE%g6WTlLOf4< zYj-<2RR%%W@2jtNR6A(98D;`dLHw>7|6aO5(~vgndD>JP0Ge0v)| zPIb@ly-|7u^dO_offiUlQIqGHJ)$NcJz{6sM2!Mc2}yRVBzydo-KiAlfqD90PgEt& zYEyOJ>pKeEU^n|JT3Am!B;Mz}N`h8|pnC{THd_(aUz-+?f%Tu+M%y5Ew@uzf;=SYd z#niv8TwEFRthvfq{bn1LuBF(*Aav3<5Y228e1A!{XsrZWxE$#|U};2hxxY{mHrOYr zF2frHHv`cwBQ!IkLPs#VrHiS(HN3E%ny00N>X}IJ{fNXZ9m7O2Wz`bI_5Jm0@Y@5J z_t#3glD!8p>VJ+}QcZ9-jzYiXD6!XVtET+zw2gDOL%bmrT48U0DDg@gZRhs1Yl%lL z)l<=0LAs-WhrqCj5?OJnMC zFOhmQ7>|#kV~vTAsuyS- zqD$F7>X7?E;J5_#h|rG!Ep7!>zDu3(Cvj|#TksEuy&X#jBL3lS&C6e9z&Xl9O;c%~ zTkaDzM24tI*}lNx(&e1*A@DeVk{9;}-T2m$W+}d{nyfm4aQXz=`?7M zl9zt7nQwWZiTJt|KOsT~!v~W4SN9xHGbmOQh!(?JCR4e$lB-k`LAk5><9yjZFHhU{ zTrYipPS$GBKiSieOS-P6CuKHd+8kvSgzYS-_QtVYaAtSB(p1SEVuE2cp3xdWS*yrWTMH9UuxcHOr2>(l8T4m0 zXnL}TfY>1z?WytB8a*7DK5a)x*ja8`ry_2MD z;ppcoSn;WI)!arEMcHD|jgZ#_3A5E$(uWbJP1mrr9sTqqO9Qpq0+B%G+bkV}j>G*B zDn7~ibuzdY?ngA{H65bqX=0(zN4@T6Aa3tKgL9yFzQj|Rg73mi4InK;d zU)seM-JsU)`e98h6Nosbo#flNTUNqCzlkWC#&PN>x2_!`^T6Kt`tC#4@nn8x+p$Vx zC09l=RCE;~&cC5o@%-E6gD!ymr<#A<(>&?6RZ%r|Snu2yk;x+z#=snUIpMH0hg7A> z`|FeW3-UZny{9{qA9Y)+5M}j62eZYwk;~NFxyqMG_lakT^|B}WUx6KIHS`G7 zv`V4}f2D`U1M5?G%i^`f8oqfd8A>P{P37oz>?srPHj8(+-$IM;iK$C>q8}V#;FV8` zJ0M;V&)J(+c>A@Q3Gu?4Q^X6>J|YX^G!LAeZsW&WG-ngI0Ucr4sY_(7JCShm1tgpe zK|iet{D83SKR4A_l$8jD+fnHXZu(hxU)h&n=G_bpXX46=NvluP?YP-O2E(&x{|9X0 z&hZvc1EP2a-f^&D^eEl~+|n8M-5O@s#Uc6Wy^i_;E#J4NxZ`LPt3v_z&@`Pyvl<?a%1oSeHc34t9nd7`#Er1RT1-{yQN68FvZv><^(+EN>P z!-A$U?i16{;b{tgshuPEM6L5iV1230a$A$*w>2p%!Cz6Bc9z=Qb{bZSQuJ!ll4bLc zSUhha_U4W0LdpuX}@OJ8}LCsejg+iocSO>OAG3gGPD+o%&Szp5xz^g!&#yI`FA& z_|GOvg50tsVqM?UcO=n&Bt>kYBjH2lokEHYR@z)rPzT&!cL8>{yDmJ%{rv{4TagU+ zMYHdGJGZTUn!wzI9s=QXYBmk~MAVG_cm%#13C7=aG+W(oFsL%)fSbwVGiL8Pu|gmd z7#7y$lYPVV?B{Mw_f}Y}I%;9*156?Lfah$25X?~Lo^SDVP{N;riMBF!sPAXL@;piE zUbF`%0=^4bRNe5_lR<7zFe=*TR>9h7XOMyXJ=sVM!I{clI8S+p%nRw}#=l|J+eB%* zzil33gK6ra=lP5So)ar9Oebk86PN_%S8%60WY;C`DGn*Bbu+L&*}xanf#|KeMtJ9L zD0v0m`^>j@XSWYBw7^^&FRG>Kf5mWI(TgX9U7*y$E?O*`mIf5F%RF^KcSh zYM1s&C0nlMCb=41ILgJnz#6OLDWQ{JCN#mhUb_x)zh_`3ev}}633BF|#$odCHmTIz zhoi?iIb{_=jsT|#-UrIxi`2k!1&NT;2k%SCE~k$^lv0VDCYKeuwQ_=QKgBd%P72@u zYyFSbAE;mS#&V>{_s{r|UvAk_{MhkZ@6H-|H9G5+%JK12Tfg!c(5(xO^1yBH|6<*C z_P-Z7o8n79sD1RzBT0Ui(BJ=rv@9~beewElE{yg4;SbR#J}LWr_Odg>5l=jKdN|_Y zAA90D+q0t!X2$gYZRmyCkAIo`hoxcDi+(5P@b!Apx1Yroj*m%6v6rI%Kf)C{CBIFN z#>GEH@5woQr7I>y-eucg&wFS6GrkL#&H2mKm{~tSC0((_XA+l9E-QK{cHA$enLn3v zMPJzs-k(e-)9;t*_y4nTnB2eQZU6rNM<16z8Vr!W(o2w8$>_h#_|Z*pSb-CKafOre z?W^*8FA0TH86(`~XBKcph|t5WDuB)}iiyrN=SDu6jsH3DKMwxE_o10NTb%ie^{ZAb z*GE}Rk)~L*V%f6A`iS}ZD6`3I0uodH)^vx-|}8-A4o1e@UZZ!Sj~NcDeD*pB$RM`o2O{~j(?Ht-0X zB27%P*=|GFnwXT7k;k=C!^gD}pj8Yk*H8S`5<@IpxP|gtE#>!*%I_j?|NapZLz=`6 z;qUWtdkD+Kr2Gz2`F-RjMKHO3a{qe3C$@iKoh1JYu~LIK>0+E1pRT!znTao@RjI7)X)d(3}gn%sUFRALN#^gHQk fS$@NJP>B{p3ZGSQujoFJ^hLRS%0zHNI|cq9v;@p) literal 0 HcmV?d00001 diff --git a/script/testdata/spawn_times.md b/script/testdata/spawn_times.md new file mode 100644 index 0000000000..351817947d --- /dev/null +++ b/script/testdata/spawn_times.md @@ -0,0 +1,81 @@ +This binary comes from: . Since I couldn't build a binary in C that would cause the same bug, I just added the binary to the project. + +```rs +#![no_std] +#![cfg_attr(not(test), no_main)] + +#[cfg(test)] +extern crate alloc; + +#[cfg(not(test))] +use ckb_std::default_alloc; +#[cfg(not(test))] +ckb_std::entry!(program_entry); +#[cfg(not(test))] +default_alloc!(); + +use core::result::Result; + +use alloc::{vec}; +use core::ffi::{CStr}; + +use ckb_std::{debug, syscalls}; +use ckb_std::ckb_constants::Source; +use ckb_std::env::argv; +use ckb_std::syscalls::{current_cycles, get_memory_limit, set_content, spawn}; + + +/// +/// test case : +/// invoke int ckb_spawn( uint64_t memory_limit, +/// size_t index, +/// size_t source, +/// size_t bounds, +/// int argc, char* argv[], +/// int8_t* exit_code, +/// uint8_t* content, +/// uint64_t* content_length); +/// +/// for { +/// spawn(xxx) +/// } +/// case1 : for { +/// spawn(xxx) +/// } +/// +/// result： +/// return ERROR : ExceededMaximumCycles +/// +pub fn program_entry() -> i8 { + // let argvs = argv(); + // debug!("argvs length:{:?}:{:?}",argvs.len(),argvs); + + if get_memory_limit() != 8 { + return 0; + } + let mut exit_code: i8 = 0; + let mut content: [u8; 10] = [1; 10]; + + let content_length: u64 = content.len() as u64; + let mut spawn_args = syscalls::SpawnArgs { + memory_limit: 8, + exit_code: &mut exit_code as *mut i8, + content: content.as_mut_ptr(), + content_length: &content_length as *const u64 as *mut u64, + }; + // let cstr1 = CStr::from_bytes_with_nul(b"arg0\0").unwrap(); + //argv is empty + let cstrs = vec![]; + + spawn_args.memory_limit = 1; + for i in 0..10000 { + debug!("current idx:{:?}",i); + let result = spawn(0, Source::CellDep, 0, cstrs.as_slice(), &spawn_args); + assert_eq!(exit_code, 0); + // debug!("result:{:?}",result); + let cycles = current_cycles(); + debug!("cycle:{:?}",cycles); + } + return 0; +} +``` From a632415301def4fc711a314c3de5840f345e0f83 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Tue, 20 Jun 2023 17:02:17 +0800 Subject: [PATCH 039/125] feat: add `register_thread` and `new_tokio_exit_rx` --- util/stop-handler/src/lib.rs | 151 ++----------------------- util/stop-handler/src/stop_register.rs | 74 ++++++++++++ 2 files changed, 82 insertions(+), 143 deletions(-) create mode 100644 util/stop-handler/src/stop_register.rs diff --git a/util/stop-handler/src/lib.rs b/util/stop-handler/src/lib.rs index d9ceddf268..fe80839dd3 100644 --- a/util/stop-handler/src/lib.rs +++ b/util/stop-handler/src/lib.rs @@ -1,147 +1,12 @@ //! TODO(doc): @keroro520 -use ckb_logger::error; -use parking_lot::Mutex; -use std::fmt::Debug; -use std::sync::mpsc; -use std::sync::{Arc, Weak}; -use std::thread::JoinHandle; -use tokio::sync::oneshot as tokio_oneshot; -use tokio::sync::watch as tokio_watch; -/// init flags -pub const WATCH_INIT: u8 = 0; -/// stop flags -pub const WATCH_STOP: u8 = 1; +pub use stop_register::{ + broadcast_exit_signals, new_crossbeam_exit_rx, new_tokio_exit_rx, register_thread, + wait_all_ckb_services_exit, +}; -/// TODO(doc): @keroro520 -#[derive(Debug)] -pub enum SignalSender { - /// TODO(doc): @keroro520 - Crossbeam(ckb_channel::Sender), - /// TODO(doc): @keroro520 - Std(mpsc::Sender), - /// TODO(doc): @keroro520 - Tokio(tokio_oneshot::Sender), - /// A single-producer, multi-consumer channel that only retains the last sent value. - Watch(tokio_watch::Sender), - /// Do nothing, for tests - Dummy, -} +pub use tokio_util::sync::CancellationToken; -impl SignalSender { - /// TODO(doc): @keroro520 - pub fn send(self, cmd: T) { - match self { - SignalSender::Crossbeam(tx) => { - if let Err(e) = tx.try_send(cmd) { - error!("handler signal send error {:?}", e); - }; - } - SignalSender::Std(tx) => { - if let Err(e) = tx.send(cmd) { - error!("handler signal send error {:?}", e); - }; - } - SignalSender::Tokio(tx) => { - if let Err(e) = tx.send(cmd) { - error!("handler signal send error {:?}", e); - }; - } - SignalSender::Watch(tx) => { - if let Err(e) = tx.send(WATCH_STOP) { - error!("handler signal send error {:?}", e); - }; - } - SignalSender::Dummy => {} - } - } -} - -#[derive(Debug)] -struct Handler { - signal: SignalSender, - thread: Option>, -} - -/// Weak is a version of Arc that holds a non-owning reference to the managed allocation. -/// Since a Weak reference does not count towards ownership, -/// it will not prevent the value stored in the allocation from being dropped, -/// and Weak itself makes no guarantees about the value still being present. -#[derive(Debug)] -enum Ref { - Arc(Arc), - Weak(Weak), -} - -impl Clone for Ref { - #[inline] - fn clone(&self) -> Ref { - match self { - Self::Arc(arc) => Self::Arc(Arc::clone(arc)), - Self::Weak(weak) => Self::Weak(Weak::clone(weak)), - } - } -} - -impl Ref { - fn downgrade(&self) -> Ref { - match self { - Self::Arc(arc) => Self::Weak(Arc::downgrade(arc)), - Self::Weak(weak) => Self::Weak(Weak::clone(weak)), - } - } -} - -/// TODO(doc): @keroro520 -//the outer Option take ownership for `Arc::try_unwrap` -//the inner Option take ownership for `JoinHandle` or `oneshot::Sender` -#[derive(Clone, Debug)] -pub struct StopHandler { - inner: Option>>>>, - name: String, -} - -impl StopHandler { - /// TODO(doc): @keroro520 - pub fn new( - signal: SignalSender, - thread: Option>, - name: String, - ) -> StopHandler { - let handler = Handler { signal, thread }; - StopHandler { - inner: Some(Ref::Arc(Arc::new(Mutex::new(Some(handler))))), - name, - } - } - - /// Creates a new Weak pointer. - pub fn downgrade_clone(&self) -> StopHandler { - StopHandler { - inner: self.inner.as_ref().map(|inner| inner.downgrade()), - name: self.name.clone(), - } - } - - /// TODO(doc): @keroro520 - pub fn try_send(&mut self, cmd: T) { - let inner = self - .inner - .take() - .expect("Stop signal can only be sent once"); - - if let Ref::Arc(inner) = inner { - if let Ok(lock) = Arc::try_unwrap(inner) { - ckb_logger::info!("StopHandler({}) send signal", self.name); - let handler = lock.lock().take().expect("Handler can only be taken once"); - let Handler { signal, thread } = handler; - signal.send(cmd); - if let Some(thread) = thread { - if let Err(e) = thread.join() { - error!("handler thread join error {:?}", e); - }; - } - }; - } - } -} +mod stop_register; +#[cfg(test)] +mod tests; diff --git a/util/stop-handler/src/stop_register.rs b/util/stop-handler/src/stop_register.rs new file mode 100644 index 0000000000..e329565ae8 --- /dev/null +++ b/util/stop-handler/src/stop_register.rs @@ -0,0 +1,74 @@ +use ckb_logger::{info, trace, warn}; +use ckb_util::Mutex; +use tokio_util::sync::CancellationToken; + +struct CkbServiceHandles { + thread_handles: Vec<(String, std::thread::JoinHandle<()>)>, +} + +/// Wait all ckb services exit +pub fn wait_all_ckb_services_exit() { + info!("waiting exit signal..."); + let exit_signal = new_crossbeam_exit_rx(); + let _ = exit_signal.recv(); + info!("received exit signal, broadcasting exit signal to all threads"); + let mut handles = CKB_HANDLES.lock(); + for (name, join_handle) in handles.thread_handles.drain(..) { + match join_handle.join() { + Ok(_) => { + info!("wait thread {} done", name); + } + Err(e) => { + warn!("wait thread {}: ERROR: {:?}", name, e) + } + } + } + info!("all ckb threads have been stopped"); +} + +static CKB_HANDLES: once_cell::sync::Lazy> = + once_cell::sync::Lazy::new(|| { + Mutex::new(CkbServiceHandles { + thread_handles: vec![], + }) + }); + +static TOKIO_EXIT: once_cell::sync::Lazy = + once_cell::sync::Lazy::new(CancellationToken::new); + +static CROSSBEAM_EXIT_SENDERS: once_cell::sync::Lazy>>> = + once_cell::sync::Lazy::new(|| Mutex::new(vec![])); + +/// Create a new CancellationToken for exit signal +pub fn new_tokio_exit_rx() -> CancellationToken { + TOKIO_EXIT.clone() +} + +/// Create a new crossbeam Receiver for exit signal +pub fn new_crossbeam_exit_rx() -> ckb_channel::Receiver<()> { + let (tx, rx) = ckb_channel::bounded(1); + CROSSBEAM_EXIT_SENDERS.lock().push(tx); + rx +} + +/// Broadcast exit signals to all threads and all tokio tasks +pub fn broadcast_exit_signals() { + TOKIO_EXIT.cancel(); + CROSSBEAM_EXIT_SENDERS.lock().iter().for_each(|tx| { + if let Err(e) = tx.try_send(()) { + println!("broadcast thread: ERROR: {:?}", e) + } else { + println!("send a crossbeam exit signal"); + } + }); +} + +/// Register a thread `JoinHandle` to `CKB_HANDLES` +pub fn register_thread(name: &str, thread_handle: std::thread::JoinHandle<()>) { + trace!("register thread {}", name); + CKB_HANDLES + .lock() + .thread_handles + .push((name.into(), thread_handle)); + trace!("register thread done {}", name); +} From a64c2ff640cd69e48a0fc429c183fc73850912eb Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Tue, 20 Jun 2023 17:02:38 +0800 Subject: [PATCH 040/125] test: add basic unit test for ckb shutdown --- util/stop-handler/src/tests.rs | 142 +++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 util/stop-handler/src/tests.rs diff --git a/util/stop-handler/src/tests.rs b/util/stop-handler/src/tests.rs new file mode 100644 index 0000000000..3141512bb7 --- /dev/null +++ b/util/stop-handler/src/tests.rs @@ -0,0 +1,142 @@ +use crate::{ + broadcast_exit_signals, new_crossbeam_exit_rx, new_tokio_exit_rx, register_thread, + wait_all_ckb_services_exit, +}; +use ckb_async_runtime::{new_global_runtime, Handle}; +use ckb_channel::select; +use rand::Rng; +use std::sync::atomic::{AtomicI64, Ordering}; +use std::sync::Arc; +use std::time::Duration; +use tokio_util::sync::CancellationToken; + +fn send_ctrlc_later(duration: Duration) { + std::thread::spawn(move || { + std::thread::sleep(duration); + // send SIGINT to myself + unsafe { + libc::raise(libc::SIGINT); + println!("[ $$ sent SIGINT to myself $$ ]"); + } + }); +} + +#[derive(Default)] +struct TestStopMemo { + spawned_threads_count: Arc, + stopped_threads_count: Arc, + + spawned_tokio_task_count: Arc, + stopped_tokio_task_count: Arc, +} + +impl TestStopMemo { + fn start_many_threads(&self) { + for i in 0..rand::thread_rng().gen_range(3..7) { + let join = std::thread::spawn({ + let stopped_threads_count = Arc::clone(&self.stopped_threads_count); + move || { + let ticker = ckb_channel::tick(Duration::from_millis(500)); + let deadline = ckb_channel::after(Duration::from_millis( + (rand::thread_rng().gen_range(1.0..5.0) * 1000.0) as u64, + )); + + let stop = new_crossbeam_exit_rx(); + + loop { + select! { + recv(ticker) -> _ => { + println!("thread {} received tick signal", i); + }, + recv(stop) -> _ => { + println!("thread {} received crossbeam exit signal", i); + stopped_threads_count.fetch_add(1, Ordering::SeqCst); + return; + }, + recv(deadline) -> _ =>{ + println!("thread {} finish its job", i); + stopped_threads_count.fetch_add(1, Ordering::SeqCst); + return + } + } + } + } + }); + + self.spawned_threads_count.fetch_add(1, Ordering::SeqCst); + register_thread(&format!("test thread {}", i), join); + } + } + + fn start_many_tokio_tasks(&self, handle: &Handle) { + for i in 0..rand::thread_rng().gen_range(3..7) { + let stop: CancellationToken = new_tokio_exit_rx(); + + handle.spawn({ + let spawned_tokio_task_count = Arc::clone(&self.spawned_tokio_task_count); + let stopped_tokio_task_count = Arc::clone(&self.stopped_tokio_task_count); + async move { + spawned_tokio_task_count.fetch_add(1, Ordering::SeqCst); + + let mut interval = tokio::time::interval(Duration::from_millis(500)); + + let duration = Duration::from_millis( + (rand::thread_rng().gen_range(1.0..5.0) * 1000.0) as u64, + ); + let deadline = tokio::time::sleep(duration); + tokio::pin!(deadline); + + loop { + tokio::select! { + _ = &mut deadline =>{ + println!("tokio task {} finish its job", i); + stopped_tokio_task_count.fetch_add(1, Ordering::SeqCst); + break; + } + _ = interval.tick()=> { + println!("tokio task {} received tick signal", i); + }, + _ = stop.cancelled() => { + println!("tokio task {} receive exit signal", i); + stopped_tokio_task_count.fetch_add(1, Ordering::SeqCst); + break + }, + else => break, + } + } + } + }); + } + } +} +#[test] +fn basic() { + let (mut handle, mut stop_recv, _runtime) = new_global_runtime(); + + ctrlc::set_handler(move || { + broadcast_exit_signals(); + }) + .expect("Error setting Ctrl-C handler"); + + send_ctrlc_later(Duration::from_secs(3)); + + let test_memo = TestStopMemo::default(); + + test_memo.start_many_threads(); + test_memo.start_many_tokio_tasks(&handle); + + handle.drop_guard(); + wait_all_ckb_services_exit(); + handle.block_on(async move { + stop_recv.recv().await; + }); + + assert_eq!( + test_memo.spawned_threads_count.load(Ordering::SeqCst), + test_memo.stopped_threads_count.load(Ordering::SeqCst), + ); + assert_eq!( + test_memo.spawned_tokio_task_count.load(Ordering::SeqCst), + test_memo.stopped_tokio_task_count.load(Ordering::SeqCst), + ); +} From 2d6409c42a0098fcd5def0950788bce257824c82 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Tue, 20 Jun 2023 17:04:09 +0800 Subject: [PATCH 041/125] wait all thread and tokio tasks exit before process exit --- Cargo.lock | 29 ++++++----- benches/benches/benchmarks/overall.rs | 3 +- block-filter/src/filter.rs | 16 +++--- chain/src/chain.rs | 34 +++---------- chain/src/tests/util.rs | 3 +- ckb-bin/Cargo.toml | 1 + ckb-bin/src/helper.rs | 40 ++++++++++----- ckb-bin/src/lib.rs | 46 +++++++++++++---- ckb-bin/src/subcommand/miner.rs | 25 ++++------ ckb-bin/src/subcommand/run.rs | 28 +++-------- miner/src/client.rs | 47 +++++++++--------- miner/src/miner.rs | 18 +++---- network/src/network.rs | 46 ++++++----------- network/src/protocols/tests/mod.rs | 4 +- notify/src/lib.rs | 21 ++------ rpc/src/module/subscription.rs | 1 + rpc/src/tests/examples.rs | 3 +- rpc/src/tests/mod.rs | 5 +- shared/Cargo.toml | 1 - shared/src/shared.rs | 19 +++---- sync/src/relayer/tests/helper.rs | 7 ++- sync/src/synchronizer/mod.rs | 7 ++- sync/src/tests/net_time_checker.rs | 9 ++-- sync/src/types/header_map/mod.rs | 24 ++++----- test/src/net.rs | 7 ++- tx-pool/Cargo.toml | 1 + tx-pool/src/chunk_process.rs | 13 +++-- tx-pool/src/process.rs | 2 +- tx-pool/src/service.rs | 49 +++++++++---------- util/channel/src/lib.rs | 4 +- util/indexer/src/service.rs | 46 +++++------------ util/launcher/Cargo.toml | 1 - util/launcher/src/lib.rs | 14 ++---- util/launcher/src/shared_builder.rs | 10 ++-- .../src/tests/utils/chain.rs | 3 +- util/metrics-service/Cargo.toml | 1 + util/metrics-service/src/lib.rs | 10 +++- util/network-alert/Cargo.toml | 1 - util/network-alert/src/tests/test_notifier.rs | 10 ++-- util/runtime/Cargo.toml | 1 - util/runtime/src/lib.rs | 48 ++++++++++++------ util/stop-handler/Cargo.toml | 11 ++++- 42 files changed, 315 insertions(+), 354 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cdf443d006..4011129135 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -437,7 +437,6 @@ version = "0.111.0-rc8" dependencies = [ "ckb-logger", "ckb-spawn", - "ckb-stop-handler", "tokio", ] @@ -492,6 +491,7 @@ dependencies = [ "ckb-network", "ckb-resource", "ckb-shared", + "ckb-stop-handler", "ckb-store", "ckb-types", "ckb-util", @@ -804,7 +804,6 @@ dependencies = [ "ckb-rpc", "ckb-shared", "ckb-snapshot", - "ckb-stop-handler", "ckb-store", "ckb-sync", "ckb-systemtime", @@ -934,6 +933,7 @@ dependencies = [ "ckb-logger", "ckb-metrics", "ckb-metrics-config", + "ckb-stop-handler", "ckb-util", "hyper", "prometheus", @@ -1020,7 +1020,7 @@ dependencies = [ "tempfile", "tentacle", "tokio", - "tokio-util 0.7.7", + "tokio-util 0.7.8", "trust-dns-resolver", ] @@ -1037,7 +1037,6 @@ dependencies = [ "ckb-multisig", "ckb-network", "ckb-notify", - "ckb-stop-handler", "ckb-systemtime", "ckb-types", "ckb-util", @@ -1243,7 +1242,6 @@ dependencies = [ "arc-swap", "ckb-async-runtime", "ckb-chain-spec", - "ckb-channel", "ckb-constant", "ckb-db", "ckb-db-schema", @@ -1284,10 +1282,16 @@ version = "0.111.0-rc8" name = "ckb-stop-handler" version = "0.111.0-rc8" dependencies = [ + "ckb-async-runtime", "ckb-channel", "ckb-logger", - "parking_lot 0.12.1", + "ckb-util", + "ctrlc", + "libc", + "once_cell", + "rand 0.8.5", "tokio", + "tokio-util 0.7.8", ] [[package]] @@ -1429,6 +1433,7 @@ dependencies = [ "slab", "tempfile", "tokio", + "tokio-util 0.7.8", ] [[package]] @@ -2403,7 +2408,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util 0.7.7", + "tokio-util 0.7.8", "tracing", ] @@ -4479,7 +4484,7 @@ dependencies = [ "tentacle-secio", "thiserror", "tokio", - "tokio-util 0.7.7", + "tokio-util 0.7.8", "tokio-yamux", "wasm-bindgen", "wasm-bindgen-futures", @@ -4521,7 +4526,7 @@ dependencies = [ "secp256k1", "sha2", "tokio", - "tokio-util 0.7.7", + "tokio-util 0.7.8", "unsigned-varint", "x25519-dalek", ] @@ -4733,9 +4738,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes 1.4.0", "futures-core", @@ -4756,7 +4761,7 @@ dependencies = [ "log", "nohash-hasher", "tokio", - "tokio-util 0.7.7", + "tokio-util 0.7.8", ] [[package]] diff --git a/benches/benches/benchmarks/overall.rs b/benches/benches/benchmarks/overall.rs index af98fe6bae..15a76de599 100644 --- a/benches/benches/benchmarks/overall.rs +++ b/benches/benches/benchmarks/overall.rs @@ -6,7 +6,7 @@ use ckb_chain_spec::consensus::{ConsensusBuilder, ProposalWindow}; use ckb_dao_utils::genesis_dao_data; use ckb_jsonrpc_types::JsonBytes; use ckb_launcher::SharedBuilder; -use ckb_network::{DefaultExitHandler, Flags, NetworkController, NetworkService, NetworkState}; +use ckb_network::{Flags, NetworkController, NetworkService, NetworkState}; use ckb_shared::Shared; use ckb_store::ChainStore; use ckb_types::{ @@ -77,7 +77,6 @@ fn dummy_network(shared: &Shared) -> NetworkController { "test".to_string(), Flags::COMPATIBILITY, ), - DefaultExitHandler::default(), ) .start(shared.async_handle()) .expect("Start network service failed") diff --git a/block-filter/src/filter.rs b/block-filter/src/filter.rs index 71ffca1c80..56fcc92f6b 100644 --- a/block-filter/src/filter.rs +++ b/block-filter/src/filter.rs @@ -1,7 +1,7 @@ -use ckb_async_runtime::tokio::{self, sync::oneshot, task::block_in_place}; -use ckb_logger::{debug, warn}; +use ckb_async_runtime::tokio::{self, task::block_in_place}; +use ckb_logger::{debug, info, warn}; use ckb_shared::Shared; -use ckb_stop_handler::{SignalSender, StopHandler}; +use ckb_stop_handler::{new_tokio_exit_rx, CancellationToken}; use ckb_store::{ChainDB, ChainStore}; use ckb_types::{ core::HeaderView, @@ -43,10 +43,10 @@ impl BlockFilter { } /// start background single-threaded service to create block filter data - pub fn start(self) -> StopHandler<()> { + pub fn start(self) { let notify_controller = self.shared.notify_controller().clone(); let async_handle = self.shared.async_handle().clone(); - let (stop, mut stop_rx) = oneshot::channel::<()>(); + let stop_rx: CancellationToken = new_tokio_exit_rx(); let filter_data_builder = self.clone(); let build_filter_data = @@ -62,12 +62,14 @@ impl BlockFilter { block_in_place(|| self.build_filter_data()); new_block_watcher.borrow_and_update(); } - _ = &mut stop_rx => break, + _ = stop_rx.cancelled() => { + info!("BlockFilter received exit signal, exit now"); + break + }, else => break, } } }); - StopHandler::new(SignalSender::Tokio(stop), None, NAME.to_string()) } /// build block filter data to the latest block diff --git a/chain/src/chain.rs b/chain/src/chain.rs index b6291211d5..8f7e5d8e3c 100644 --- a/chain/src/chain.rs +++ b/chain/src/chain.rs @@ -12,7 +12,7 @@ use ckb_proposal_table::ProposalTable; #[cfg(debug_assertions)] use ckb_rust_unstable_port::IsSorted; use ckb_shared::shared::Shared; -use ckb_stop_handler::{SignalSender, StopHandler}; +use ckb_stop_handler::{new_crossbeam_exit_rx, register_thread}; use ckb_store::{attach_block_cell, detach_block_cell, ChainStore, StoreTransaction}; use ckb_systemtime::unix_time_as_millis; use ckb_types::{ @@ -22,7 +22,7 @@ use ckb_types::{ ResolvedTransaction, }, hardfork::HardForks, - service::{Request, DEFAULT_CHANNEL_SIZE, SIGNAL_CHANNEL_SIZE}, + service::{Request, DEFAULT_CHANNEL_SIZE}, BlockExt, BlockNumber, BlockView, Cycle, HeaderView, }, packed::{Byte32, ProposalShortId}, @@ -50,13 +50,6 @@ type TruncateRequest = Request>; pub struct ChainController { process_block_sender: Sender, truncate_sender: Sender, // Used for testing only - stop: Option>, -} - -impl Drop for ChainController { - fn drop(&mut self) { - self.try_stop(); - } } #[cfg_attr(feature = "mock", faux::methods)] @@ -64,12 +57,10 @@ impl ChainController { pub fn new( process_block_sender: Sender, truncate_sender: Sender, - stop: StopHandler<()>, ) -> Self { ChainController { process_block_sender, truncate_sender, - stop: Some(stop), } } /// Inserts the block into database. @@ -109,17 +100,10 @@ impl ChainController { }) } - pub fn try_stop(&mut self) { - if let Some(ref mut stop) = self.stop { - stop.try_send(()); - } - } - /// Since a non-owning reference does not count towards ownership, /// it will not prevent the value stored in the allocation from being dropped pub fn non_owning_clone(&self) -> Self { ChainController { - stop: None, truncate_sender: self.truncate_sender.clone(), process_block_sender: self.process_block_sender.clone(), } @@ -245,7 +229,7 @@ impl ChainService { /// start background single-threaded service with specified thread_name. pub fn start(mut self, thread_name: Option) -> ChainController { - let (signal_sender, signal_receiver) = channel::bounded::<()>(SIGNAL_CHANNEL_SIZE); + let signal_receiver = new_crossbeam_exit_rx(); let (process_block_sender, process_block_receiver) = channel::bounded(DEFAULT_CHANNEL_SIZE); let (truncate_sender, truncate_receiver) = channel::bounded(1); @@ -256,10 +240,11 @@ impl ChainService { } let tx_control = self.shared.tx_pool_controller().clone(); - let thread = thread_builder + let chain_jh = thread_builder .spawn(move || loop { select! { recv(signal_receiver) -> _ => { + info!("ChainService received exit signal, stopped"); break; }, recv(process_block_receiver) -> msg => match msg { @@ -287,13 +272,10 @@ impl ChainService { } }) .expect("Start ChainService failed"); - let stop = StopHandler::new( - SignalSender::Crossbeam(signal_sender), - Some(thread), - "chain".to_string(), - ); - ChainController::new(process_block_sender, truncate_sender, stop) + register_thread("ChainService", chain_jh); + + ChainController::new(process_block_sender, truncate_sender) } fn make_fork_for_truncate(&self, target: &HeaderView, current_tip: &HeaderView) -> ForkChanges { diff --git a/chain/src/tests/util.rs b/chain/src/tests/util.rs index 3051dd775f..7ade19bc53 100644 --- a/chain/src/tests/util.rs +++ b/chain/src/tests/util.rs @@ -6,7 +6,7 @@ use ckb_dao::DaoCalculator; use ckb_dao_utils::genesis_dao_data; use ckb_jsonrpc_types::ScriptHashType; use ckb_launcher::SharedBuilder; -use ckb_network::{DefaultExitHandler, Flags, NetworkController, NetworkService, NetworkState}; +use ckb_network::{Flags, NetworkController, NetworkService, NetworkState}; use ckb_shared::shared::Shared; use ckb_store::ChainStore; pub use ckb_test_chain_utils::MockStore; @@ -314,7 +314,6 @@ pub(crate) fn dummy_network(shared: &Shared) -> NetworkController { "test".to_string(), Flags::COMPATIBILITY, ), - DefaultExitHandler::default(), ) .start(shared.async_handle()) .expect("Start network service failed") diff --git a/ckb-bin/Cargo.toml b/ckb-bin/Cargo.toml index 2609ba6cef..27ee76fa04 100644 --- a/ckb-bin/Cargo.toml +++ b/ckb-bin/Cargo.toml @@ -43,6 +43,7 @@ rayon = "1.0" sentry = { version = "0.26.0", optional = true } is-terminal = "0.4.7" fdlimit = "0.2.1" +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc8" } [features] deadlock_detection = ["ckb-util/deadlock_detection"] diff --git a/ckb-bin/src/helper.rs b/ckb-bin/src/helper.rs index 142d06226c..21c93732b8 100644 --- a/ckb-bin/src/helper.rs +++ b/ckb-bin/src/helper.rs @@ -1,4 +1,5 @@ use ckb_logger::info; + use std::io::{stdin, stdout, Write}; #[cfg(not(feature = "deadlock_detection"))] @@ -6,27 +7,42 @@ pub fn deadlock_detection() {} #[cfg(feature = "deadlock_detection")] pub fn deadlock_detection() { + use ckb_channel::select; use ckb_logger::warn; + use ckb_stop_handler::{new_crossbeam_exit_rx, register_thread}; use ckb_util::parking_lot::deadlock; use std::{thread, time::Duration}; info!("deadlock_detection enable"); - thread::spawn(move || loop { - thread::sleep(Duration::from_secs(10)); - let deadlocks = deadlock::check_deadlock(); - if deadlocks.is_empty() { - continue; - } + let dead_lock_jh = thread::spawn({ + let ticker = ckb_channel::tick(Duration::from_secs(10)); + let stop_rx = new_crossbeam_exit_rx(); + move || loop { + select! { + recv(ticker) -> _ => { + let deadlocks = deadlock::check_deadlock(); + if deadlocks.is_empty() { + continue; + } + + warn!("{} deadlocks detected", deadlocks.len()); + for (i, threads) in deadlocks.iter().enumerate() { + warn!("Deadlock #{}", i); + for t in threads { + warn!("Thread Id {:#?}", t.thread_id()); + warn!("{:#?}", t.backtrace()); + } + } - warn!("{} deadlocks detected", deadlocks.len()); - for (i, threads) in deadlocks.iter().enumerate() { - warn!("Deadlock #{}", i); - for t in threads { - warn!("Thread Id {:#?}", t.thread_id()); - warn!("{:#?}", t.backtrace()); + }, + recv(stop_rx) -> _ =>{ + info!("deadlock_detection received exit signal, stopped"); + return; + } } } }); + register_thread("dead_lock_detect", dead_lock_jh); } pub fn prompt(msg: &str) -> String { diff --git a/ckb-bin/src/lib.rs b/ckb-bin/src/lib.rs index b047a14086..91c61b813d 100644 --- a/ckb-bin/src/lib.rs +++ b/ckb-bin/src/lib.rs @@ -8,13 +8,15 @@ mod subcommand; use ckb_app_config::{cli, ExitCode, Setup}; use ckb_async_runtime::new_global_runtime; use ckb_build_info::Version; +use ckb_logger::info; +use ckb_network::tokio; +use ckb_stop_handler::broadcast_exit_signals; use helper::raise_fd_limit; use setup_guard::SetupGuard; -use std::time::Duration; +use std::sync::Arc; #[cfg(feature = "with_sentry")] pub(crate) const LOG_TARGET_SENTRY: &str = "sentry"; -const RUNTIME_SHUTDOWN_TIMEOUT: Duration = Duration::from_secs(1); /// The executable main entry. /// @@ -58,25 +60,49 @@ pub fn run_app(version: Version) -> Result<(), ExitCode> { .expect("SubcommandRequiredElseHelp"); let is_silent_logging = is_silent_logging(cmd); - let (handle, runtime) = new_global_runtime(); + let (mut handle, mut handle_stop_rx, _runtime) = new_global_runtime(); let setup = Setup::from_matches(bin_name, cmd, matches)?; let _guard = SetupGuard::from_setup(&setup, &version, handle.clone(), is_silent_logging)?; raise_fd_limit(); + // indicate whether the process is terminated by an exit signal + let caught_exit_signal = Arc::new(std::sync::atomic::AtomicBool::new(false)); + + ctrlc::set_handler({ + let caught_exit_signal = Arc::clone(&caught_exit_signal); + move || { + broadcast_exit_signals(); + caught_exit_signal.store(true, std::sync::atomic::Ordering::SeqCst); + } + }) + .expect("Error setting Ctrl-C handler"); + let ret = match cmd { - cli::CMD_RUN => subcommand::run(setup.run(matches)?, version, handle), - cli::CMD_MINER => subcommand::miner(setup.miner(matches)?, handle), - cli::CMD_REPLAY => subcommand::replay(setup.replay(matches)?, handle), - cli::CMD_EXPORT => subcommand::export(setup.export(matches)?, handle), - cli::CMD_IMPORT => subcommand::import(setup.import(matches)?, handle), - cli::CMD_STATS => subcommand::stats(setup.stats(matches)?, handle), + cli::CMD_RUN => subcommand::run(setup.run(matches)?, version, handle.clone()), + cli::CMD_MINER => subcommand::miner(setup.miner(matches)?, handle.clone()), + cli::CMD_REPLAY => subcommand::replay(setup.replay(matches)?, handle.clone()), + cli::CMD_EXPORT => subcommand::export(setup.export(matches)?, handle.clone()), + cli::CMD_IMPORT => subcommand::import(setup.import(matches)?, handle.clone()), + cli::CMD_STATS => subcommand::stats(setup.stats(matches)?, handle.clone()), cli::CMD_RESET_DATA => subcommand::reset_data(setup.reset_data(matches)?), cli::CMD_MIGRATE => subcommand::migrate(setup.migrate(matches)?), _ => unreachable!(), }; - runtime.shutdown_timeout(RUNTIME_SHUTDOWN_TIMEOUT); + if !caught_exit_signal.load(std::sync::atomic::Ordering::SeqCst) { + // if `subcommand` finish normally, and we didn't catch exit signal, broadcast exit signals + broadcast_exit_signals(); + } + + handle.drop_guard(); + + tokio::task::block_in_place(|| { + info!("waiting all tokio tasks done"); + handle_stop_rx.blocking_recv(); + info!("all tokio tasks have been stopped"); + }); + ret } diff --git a/ckb-bin/src/subcommand/miner.rs b/ckb-bin/src/subcommand/miner.rs index dace1cc9a7..fd9a892abc 100644 --- a/ckb-bin/src/subcommand/miner.rs +++ b/ckb-bin/src/subcommand/miner.rs @@ -2,16 +2,15 @@ use ckb_app_config::{ExitCode, MinerArgs, MinerConfig}; use ckb_async_runtime::Handle; use ckb_channel::unbounded; use ckb_miner::{Client, Miner}; -use ckb_network::{DefaultExitHandler, ExitHandler}; +use ckb_stop_handler::{new_crossbeam_exit_rx, register_thread, wait_all_ckb_services_exit}; use std::thread; pub fn miner(args: MinerArgs, async_handle: Handle) -> Result<(), ExitCode> { let (new_work_tx, new_work_rx) = unbounded(); let MinerConfig { client, workers } = args.config; - let exit_handler = DefaultExitHandler::default(); let client = Client::new(new_work_tx, client, async_handle); - let (mut miner, miner_stop) = Miner::new( + let mut miner = Miner::new( args.pow_engine, client.clone(), new_work_rx, @@ -21,21 +20,17 @@ pub fn miner(args: MinerArgs, async_handle: Handle) -> Result<(), ExitCode> { ckb_memory_tracker::track_current_process_simple(args.memory_tracker.interval); - let client_stop = client.spawn_background(); + client.spawn_background(); - thread::Builder::new() - .name("client".to_string()) - .spawn(move || miner.run()) + let stop_rx = new_crossbeam_exit_rx(); + const THREAD_NAME: &str = "client"; + let miner_jh = thread::Builder::new() + .name(THREAD_NAME.into()) + .spawn(move || miner.run(stop_rx)) .expect("Start client failed!"); + register_thread(THREAD_NAME, miner_jh); - let exit_handler_clone = exit_handler.clone(); - ctrlc::set_handler(move || { - exit_handler_clone.notify_exit(); - }) - .expect("Error setting Ctrl-C handler"); - exit_handler.wait_for_exit(); + wait_all_ckb_services_exit(); - drop(client_stop); - drop(miner_stop); Ok(()) } diff --git a/ckb-bin/src/subcommand/run.rs b/ckb-bin/src/subcommand/run.rs index 7878b7b6de..cd7d8c6282 100644 --- a/ckb-bin/src/subcommand/run.rs +++ b/ckb-bin/src/subcommand/run.rs @@ -4,7 +4,8 @@ use ckb_async_runtime::Handle; use ckb_build_info::Version; use ckb_launcher::Launcher; use ckb_logger::info; -use ckb_network::{DefaultExitHandler, ExitHandler}; +use ckb_stop_handler::wait_all_ckb_services_exit; + use ckb_types::core::cell::setup_system_cell_cache; pub fn run(args: RunArgs, version: Version, async_handle: Handle) -> Result<(), ExitCode> { @@ -16,7 +17,6 @@ pub fn run(args: RunArgs, version: Version, async_handle: Handle) -> Result<(), let block_assembler_config = launcher.sanitize_block_assembler_config()?; let miner_enable = block_assembler_config.is_some(); - let exit_handler = DefaultExitHandler::default(); let (shared, mut pack) = launcher.build_shared(block_assembler_config)?; @@ -43,12 +43,11 @@ pub fn run(args: RunArgs, version: Version, async_handle: Handle) -> Result<(), let chain_controller = launcher.start_chain_service(&shared, pack.take_proposal_table()); - let block_filter = launcher.start_block_filter(&shared); + launcher.start_block_filter(&shared); - let (network_controller, rpc_server) = launcher.start_network_and_rpc( + let (network_controller, _rpc_server) = launcher.start_network_and_rpc( &shared, chain_controller.non_owning_clone(), - &exit_handler, miner_enable, pack.take_relay_tx_receiver(), ); @@ -56,22 +55,7 @@ pub fn run(args: RunArgs, version: Version, async_handle: Handle) -> Result<(), let tx_pool_builder = pack.take_tx_pool_builder(); tx_pool_builder.start(network_controller.non_owning_clone()); - let exit_handler_clone = exit_handler.clone(); - ctrlc::set_handler(move || { - exit_handler_clone.notify_exit(); - }) - .expect("Error setting Ctrl-C handler"); - exit_handler.wait_for_exit(); - - info!("Finishing work, please wait..."); - shared.tx_pool_controller().save_pool().map_err(|err| { - eprintln!("TxPool Error: {err}"); - ExitCode::Failure - })?; - - drop(rpc_server); - drop(block_filter); - drop(network_controller); - drop(chain_controller); + wait_all_ckb_services_exit(); + Ok(()) } diff --git a/miner/src/client.rs b/miner/src/client.rs index 57d8e87cb0..dda47570a7 100644 --- a/miner/src/client.rs +++ b/miner/src/client.rs @@ -4,8 +4,8 @@ use ckb_app_config::MinerClientConfig; use ckb_async_runtime::Handle; use ckb_channel::Sender; use ckb_jsonrpc_types::{Block as JsonBlock, BlockTemplate}; -use ckb_logger::{debug, error}; -use ckb_stop_handler::{SignalSender, StopHandler}; +use ckb_logger::{debug, error, info}; +use ckb_stop_handler::{new_tokio_exit_rx, CancellationToken}; use ckb_types::{ packed::{Block, Byte32}, H256, @@ -45,13 +45,12 @@ pub enum RpcError { #[derive(Debug, Clone)] pub struct Rpc { sender: mpsc::Sender, - stop: StopHandler<()>, } impl Rpc { pub fn new(url: Uri, handle: Handle) -> Rpc { let (sender, mut receiver) = mpsc::channel(65_535); - let (stop, mut stop_rx) = oneshot::channel::<()>(); + let stop_rx: CancellationToken = new_tokio_exit_rx(); let https = hyper_tls::HttpsConnector::new(); let client = HttpClient::builder().build(https); @@ -87,16 +86,16 @@ impl Rpc { } }); }, - _ = &mut stop_rx => break, + _ = stop_rx.cancelled() => { + info!("Rpc server received exit signal, exit now"); + break + }, else => break } } }); - Rpc { - sender, - stop: StopHandler::new(SignalSender::Tokio(stop), None, "miner-rpc".to_string()), - } + Rpc { sender } } pub fn request( @@ -128,12 +127,6 @@ impl Rpc { } } -impl Drop for Rpc { - fn drop(&mut self) { - self.stop.try_send(()); - } -} - pub enum Works { New(Work), FailSubmit(Byte32), @@ -200,8 +193,7 @@ impl Client { } /// spawn background update process - pub fn spawn_background(self) -> StopHandler<()> { - let (stop, stop_rx) = oneshot::channel::<()>(); + pub fn spawn_background(self) { let client = self.clone(); if let Some(addr) = self.config.listen { ckb_logger::info!("listen notify mode : {}", addr); @@ -220,19 +212,18 @@ Otherwise ckb-miner does not work properly and will behave as it stopped committ addr ); self.handle.spawn(async move { - client.listen_block_template_notify(addr, stop_rx).await; + client.listen_block_template_notify(addr).await; }); - self.blocking_fetch_block_template() + self.blocking_fetch_block_template(); } else { ckb_logger::info!("loop poll mode: interval {}ms", self.config.poll_interval); self.handle.spawn(async move { - client.poll_block_template(stop_rx).await; + client.poll_block_template().await; }); } - StopHandler::new(SignalSender::Tokio(stop), None, "miner-updater".to_string()) } - async fn listen_block_template_notify(&self, addr: SocketAddr, stop_rx: oneshot::Receiver<()>) { + async fn listen_block_template_notify(&self, addr: SocketAddr) { let client = self.clone(); let make_service = make_service_fn(move |_conn| { let client = client.clone(); @@ -241,8 +232,10 @@ Otherwise ckb-miner does not work properly and will behave as it stopped committ }); let server = Server::bind(&addr).serve(make_service); + let stop_rx: CancellationToken = new_tokio_exit_rx(); let graceful = server.with_graceful_shutdown(async move { - stop_rx.await.ok(); + stop_rx.cancelled().await; + info!("Miner client received exit signal, exit now"); }); if let Err(e) = graceful.await { @@ -250,17 +243,21 @@ Otherwise ckb-miner does not work properly and will behave as it stopped committ } } - async fn poll_block_template(&self, mut stop_rx: oneshot::Receiver<()>) { + async fn poll_block_template(&self) { let poll_interval = time::Duration::from_millis(self.config.poll_interval); let mut interval = tokio::time::interval(poll_interval); interval.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip); + let stop_rx: CancellationToken = new_tokio_exit_rx(); loop { tokio::select! { _ = interval.tick() => { debug!("poll block template..."); self.fetch_block_template().await; } - _ = &mut stop_rx => break, + _ = stop_rx.cancelled() => { + info!("Miner client pool_block_template received exit signal, exit now"); + break + }, else => break, } } diff --git a/miner/src/miner.rs b/miner/src/miner.rs index 8119a7bea9..e14ffef72f 100644 --- a/miner/src/miner.rs +++ b/miner/src/miner.rs @@ -5,7 +5,6 @@ use ckb_app_config::MinerWorkerConfig; use ckb_channel::{select, unbounded, Receiver}; use ckb_logger::{debug, error, info}; use ckb_pow::PowEngine; -use ckb_stop_handler::{SignalSender, StopHandler}; use ckb_types::{ packed::{Byte32, Header}, prelude::*, @@ -27,7 +26,6 @@ pub struct Miner { pub(crate) worker_controllers: Vec, pub(crate) work_rx: Receiver, pub(crate) nonce_rx: Receiver<(Byte32, Work, u128)>, - pub(crate) stop_rx: Receiver<()>, pub(crate) pb: ProgressBar, pub(crate) nonces_found: u128, pub(crate) stderr_is_tty: bool, @@ -42,9 +40,8 @@ impl Miner { work_rx: Receiver, workers: &[MinerWorkerConfig], limit: u128, - ) -> (Miner, StopHandler<()>) { + ) -> Miner { let (nonce_tx, nonce_rx) = unbounded(); - let (stop, stop_rx) = unbounded(); let mp = MultiProgress::new(); let worker_controllers = workers @@ -61,9 +58,7 @@ impl Miner { mp.join().expect("MultiProgress join failed"); }); - let stop = StopHandler::new(SignalSender::Crossbeam(stop), None, "miner".to_string()); - - let miner = Miner { + Miner { legacy_work: LruCache::new(WORK_CACHE_SIZE), nonces_found: 0, _pow: pow, @@ -71,16 +66,14 @@ impl Miner { worker_controllers, work_rx, nonce_rx, - stop_rx, pb, stderr_is_tty, limit, - }; - (miner, stop) + } } /// TODO(doc): @quake - pub fn run(&mut self) { + pub fn run(&mut self, stop_rx: Receiver<()>) { loop { select! { recv(self.work_rx) -> msg => match msg { @@ -109,7 +102,8 @@ impl Miner { break; }, }, - recv(self.stop_rx) -> _msg => { + recv(stop_rx) -> _msg => { + info!("miner received exit signal, stopped"); break; } }; diff --git a/network/src/network.rs b/network/src/network.rs index cbe84e2cf2..89bc527652 100644 --- a/network/src/network.rs +++ b/network/src/network.rs @@ -21,7 +21,7 @@ use crate::{Behaviour, CKBProtocol, Peer, PeerIndex, ProtocolId, ServiceControl} use ckb_app_config::{default_support_all_protocols, NetworkConfig, SupportProtocol}; use ckb_logger::{debug, error, info, trace, warn}; use ckb_spawn::Spawn; -use ckb_stop_handler::{SignalSender, StopHandler}; +use ckb_stop_handler::{broadcast_exit_signals, new_tokio_exit_rx, CancellationToken}; use ckb_util::{Condvar, Mutex, RwLock}; use futures::{channel::mpsc::Sender, Future}; use ipnetwork::IpNetwork; @@ -490,18 +490,14 @@ impl NetworkState { } /// Used to handle global events of tentacle, such as session open/close -pub struct EventHandler { +pub struct EventHandler { pub(crate) network_state: Arc, - pub(crate) exit_handler: T, } -impl EventHandler { +impl EventHandler { /// init an event handler - pub fn new(network_state: Arc, exit_handler: T) -> Self { - Self { - network_state, - exit_handler, - } + pub fn new(network_state: Arc) -> Self { + Self { network_state } } } @@ -531,7 +527,7 @@ impl ExitHandler for DefaultExitHandler { } } -impl EventHandler { +impl EventHandler { fn inbound_eviction(&self) -> Vec { if self.network_state.config.bootnode_mode { let status = self.network_state.connection_status(); @@ -560,7 +556,7 @@ impl EventHandler { } #[async_trait] -impl ServiceHandle for EventHandler { +impl ServiceHandle for EventHandler { async fn handle_error(&mut self, context: &mut ServiceContext, error: ServiceError) { match error { ServiceError::DialerError { address, error } => { @@ -658,7 +654,8 @@ impl ServiceHandle for EventHandler { ) }, ); - self.exit_handler.notify_exit(); + + broadcast_exit_signals(); } } } @@ -763,8 +760,8 @@ impl ServiceHandle for EventHandler { } /// Ckb network service, use to start p2p network -pub struct NetworkService { - p2p_service: Service>, +pub struct NetworkService { + p2p_service: Service, network_state: Arc, ping_controller: Option>, // Background services @@ -772,7 +769,7 @@ pub struct NetworkService { version: String, } -impl NetworkService { +impl NetworkService { /// init with all config pub fn new( network_state: Arc, @@ -780,7 +777,6 @@ impl NetworkService { required_protocol_ids: Vec, // name, version, flags identify_announce: (String, String, Flags), - exit_handler: T, ) -> Self { let config = &network_state.config; @@ -891,7 +887,6 @@ impl NetworkService { } let event_handler = EventHandler { network_state: Arc::clone(&network_state), - exit_handler, }; service_builder = service_builder .key_pair(network_state.local_private_key.clone()) @@ -1098,7 +1093,7 @@ impl NetworkService { }) .unzip(); - let (sender, mut receiver) = oneshot::channel(); + let receiver: CancellationToken = new_tokio_exit_rx(); let (start_sender, start_receiver) = mpsc::channel(); { let network_state = Arc::clone(&network_state); @@ -1130,7 +1125,8 @@ impl NetworkService { tokio::spawn(async move { p2p_service.run().await }); loop { tokio::select! { - _ = &mut receiver => { + _ = receiver.cancelled() => { + info!("NetworkService receive exit signal, start shutdown..."); let _ = p2p_control.shutdown().await; // Drop senders to stop all corresponding background task drop(bg_signals); @@ -1163,13 +1159,11 @@ impl NetworkService { return Err(e); } - let stop = StopHandler::new(SignalSender::Tokio(sender), None, "network".to_string()); Ok(NetworkController { version, network_state, p2p_control, ping_controller, - stop: Some(stop), }) } } @@ -1181,7 +1175,6 @@ pub struct NetworkController { network_state: Arc, p2p_control: ServiceControl, ping_controller: Option>, - stop: Option>, } impl NetworkController { @@ -1397,7 +1390,6 @@ impl NetworkController { /// it will not prevent the value stored in the allocation from being dropped pub fn non_owning_clone(&self) -> Self { NetworkController { - stop: None, version: self.version.clone(), network_state: Arc::clone(&self.network_state), p2p_control: self.p2p_control.clone(), @@ -1406,14 +1398,6 @@ impl NetworkController { } } -impl Drop for NetworkController { - fn drop(&mut self) { - if let Some(ref mut stop) = self.stop { - stop.try_send(()); - } - } -} - // Send an optional message before disconnect a peer pub(crate) fn disconnect_with_message( control: &ServiceControl, diff --git a/network/src/protocols/tests/mod.rs b/network/src/protocols/tests/mod.rs index db72949dda..140e9625d8 100644 --- a/network/src/protocols/tests/mod.rs +++ b/network/src/protocols/tests/mod.rs @@ -7,8 +7,7 @@ use super::{ }; use crate::{ - network::{DefaultExitHandler, EventHandler}, - services::protocol_type_checker::ProtocolTypeCheckerService, + network::EventHandler, services::protocol_type_checker::ProtocolTypeCheckerService, NetworkState, PeerIdentifyInfo, SupportProtocols, }; @@ -224,7 +223,6 @@ fn net_service_start( .forever(true) .build(EventHandler { network_state: Arc::clone(&network_state), - exit_handler: DefaultExitHandler::default(), }); let peer_id = network_state.local_peer_id().clone(); diff --git a/notify/src/lib.rs b/notify/src/lib.rs index 9a95336a3a..2b9969ba96 100644 --- a/notify/src/lib.rs +++ b/notify/src/lib.rs @@ -1,8 +1,8 @@ //! TODO(doc): @quake use ckb_app_config::NotifyConfig; use ckb_async_runtime::Handle; -use ckb_logger::{debug, error, trace}; -use ckb_stop_handler::{SignalSender, StopHandler}; +use ckb_logger::{debug, error, info, trace}; +use ckb_stop_handler::{new_tokio_exit_rx, CancellationToken}; use ckb_types::packed::Byte32; use ckb_types::{ core::{tx_pool::Reject, BlockView}, @@ -88,7 +88,6 @@ impl NotifyTimeout { /// TODO(doc): @quake #[derive(Clone)] pub struct NotifyController { - stop: StopHandler<()>, new_block_register: NotifyRegister, new_block_watcher: NotifyWatcher, new_block_notifier: Sender, @@ -103,12 +102,6 @@ pub struct NotifyController { handle: Handle, } -impl Drop for NotifyController { - fn drop(&mut self) { - self.stop.try_send(()); - } -} - /// TODO(doc): @quake pub struct NotifyService { config: NotifyConfig, @@ -142,7 +135,7 @@ impl NotifyService { /// start background tokio spawned task. pub fn start(mut self) -> NotifyController { - let (signal_sender, mut signal_receiver) = oneshot::channel(); + let signal_receiver: CancellationToken = new_tokio_exit_rx(); let handle = self.handle.clone(); let (new_block_register, mut new_block_register_receiver) = @@ -173,7 +166,8 @@ impl NotifyService { handle.spawn(async move { loop { tokio::select! { - _ = &mut signal_receiver => { + _ = signal_receiver.cancelled() => { + info!("NotifyService received exit signal, exit now"); break; } Some(msg) = new_block_register_receiver.recv() => { self.handle_register_new_block(msg) }, @@ -204,11 +198,6 @@ impl NotifyService { reject_transaction_notifier: reject_transaction_sender, network_alert_register, network_alert_notifier: network_alert_sender, - stop: StopHandler::new( - SignalSender::Tokio(signal_sender), - None, - "notify".to_string(), - ), handle, } } diff --git a/rpc/src/module/subscription.rs b/rpc/src/module/subscription.rs index 69d7cc0c88..c5ca5e5160 100644 --- a/rpc/src/module/subscription.rs +++ b/rpc/src/module/subscription.rs @@ -1,5 +1,6 @@ use ckb_jsonrpc_types::Topic; use ckb_notify::NotifyController; + use jsonrpc_core::{Metadata, Result}; use jsonrpc_derive::rpc; use jsonrpc_pubsub::{ diff --git a/rpc/src/tests/examples.rs b/rpc/src/tests/examples.rs index 1164278acd..f134f22e16 100644 --- a/rpc/src/tests/examples.rs +++ b/rpc/src/tests/examples.rs @@ -10,7 +10,7 @@ use ckb_chain_spec::consensus::{Consensus, ConsensusBuilder}; use ckb_chain_spec::versionbits::{ActiveMode, Deployment, DeploymentPos}; use ckb_dao_utils::genesis_dao_data; use ckb_launcher::SharedBuilder; -use ckb_network::{DefaultExitHandler, Flags, NetworkService, NetworkState}; +use ckb_network::{Flags, NetworkService, NetworkState}; use ckb_network_alert::alert_relayer::AlertRelayer; use ckb_notify::NotifyService; use ckb_sync::SyncShared; @@ -151,7 +151,6 @@ fn setup_rpc_test_suite(height: u64) -> RpcTestSuite { "0.1.0".to_string(), Flags::COMPATIBILITY, ), - DefaultExitHandler::default(), ) .start(shared.async_handle()) .expect("Start network service failed") diff --git a/rpc/src/tests/mod.rs b/rpc/src/tests/mod.rs index b35c80844b..70ba66762c 100644 --- a/rpc/src/tests/mod.rs +++ b/rpc/src/tests/mod.rs @@ -4,7 +4,7 @@ use ckb_chain::chain::{ChainController, ChainService}; use ckb_dao::DaoCalculator; use ckb_jsonrpc_types::ScriptHashType; use ckb_launcher::SharedBuilder; -use ckb_network::{DefaultExitHandler, Flags, NetworkService, NetworkState}; +use ckb_network::{Flags, NetworkService, NetworkState}; use ckb_reward_calculator::RewardCalculator; use ckb_shared::{Shared, Snapshot}; use ckb_store::ChainStore; @@ -80,7 +80,7 @@ impl RpcTestResponse { #[allow(dead_code)] struct RpcTestSuite { - rpc_client: reqwest::blocking::Client, + rpc_client: Client, rpc_uri: String, shared: Shared, chain_controller: ChainController, @@ -249,7 +249,6 @@ fn setup() -> RpcTestSuite { "0.1.0".to_string(), Flags::COMPATIBILITY, ), - DefaultExitHandler::default(), ) .start(shared.async_handle()) .expect("Start network service failed") diff --git a/shared/Cargo.toml b/shared/Cargo.toml index f8f7677061..a33b65c3b0 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -24,7 +24,6 @@ ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8" } ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc8" } ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc8" } ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc8" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc8" } ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc8" } ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc8" } diff --git a/shared/src/shared.rs b/shared/src/shared.rs index 0ec83eb888..377b941df7 100644 --- a/shared/src/shared.rs +++ b/shared/src/shared.rs @@ -10,12 +10,12 @@ use ckb_db_schema::{COLUMN_BLOCK_BODY, COLUMN_NUMBER_HASH}; use ckb_error::{AnyError, Error}; use ckb_notify::NotifyController; use ckb_proposal_table::ProposalView; -use ckb_stop_handler::{SignalSender, StopHandler}; +use ckb_stop_handler::{new_crossbeam_exit_rx, register_thread}; use ckb_store::{ChainDB, ChainStore}; use ckb_systemtime::unix_time_as_millis; use ckb_tx_pool::{BlockTemplate, TokioRwLock, TxPoolController}; use ckb_types::{ - core::{service, BlockNumber, EpochExt, EpochNumber, HeaderView, Version}, + core::{BlockNumber, EpochExt, EpochNumber, HeaderView, Version}, packed::{self, Byte32}, prelude::*, U256, @@ -35,13 +35,11 @@ const MAX_FREEZE_LIMIT: BlockNumber = 30_000; /// An owned permission to close on a freezer thread pub struct FreezerClose { stopped: Arc, - stop: StopHandler<()>, } impl Drop for FreezerClose { fn drop(&mut self) { self.stopped.store(true, Ordering::SeqCst); - self.stop.try_send(()); } } @@ -86,10 +84,9 @@ impl Shared { pub fn spawn_freeze(&self) -> Option { if let Some(freezer) = self.store.freezer() { ckb_logger::info!("Freezer enable"); - let (signal_sender, signal_receiver) = - ckb_channel::bounded::<()>(service::SIGNAL_CHANNEL_SIZE); + let signal_receiver = new_crossbeam_exit_rx(); let shared = self.clone(); - let thread = thread::Builder::new() + let freeze_jh = thread::Builder::new() .spawn(move || loop { match signal_receiver.recv_timeout(FREEZER_INTERVAL) { Err(_) => { @@ -106,14 +103,10 @@ impl Shared { }) .expect("Start FreezerService failed"); - let stop = StopHandler::new( - SignalSender::Crossbeam(signal_sender), - Some(thread), - "freezer".to_string(), - ); + register_thread("freeze", freeze_jh); + return Some(FreezerClose { stopped: Arc::clone(&freezer.stopped), - stop, }); } None diff --git a/sync/src/relayer/tests/helper.rs b/sync/src/relayer/tests/helper.rs index 2f738f66f2..eb6b3c0a08 100644 --- a/sync/src/relayer/tests/helper.rs +++ b/sync/src/relayer/tests/helper.rs @@ -4,9 +4,9 @@ use ckb_chain::chain::ChainService; use ckb_chain_spec::consensus::{build_genesis_epoch_ext, ConsensusBuilder}; use ckb_launcher::SharedBuilder; use ckb_network::{ - async_trait, bytes::Bytes as P2pBytes, Behaviour, CKBProtocolContext, DefaultExitHandler, - Error, Flags, NetworkController, NetworkService, NetworkState, Peer, PeerIndex, ProtocolId, - SupportProtocols, TargetSession, + async_trait, bytes::Bytes as P2pBytes, Behaviour, CKBProtocolContext, Error, Flags, + NetworkController, NetworkService, NetworkState, Peer, PeerIndex, ProtocolId, SupportProtocols, + TargetSession, }; use ckb_shared::Shared; use ckb_store::ChainStore; @@ -122,7 +122,6 @@ pub(crate) fn dummy_network(shared: &Shared) -> NetworkController { "test".to_string(), Flags::COMPATIBILITY, ), - DefaultExitHandler::default(), ) .start(shared.async_handle()) .expect("Start network service failed") diff --git a/sync/src/synchronizer/mod.rs b/sync/src/synchronizer/mod.rs index 55e8edf394..a2ab6cf46b 100644 --- a/sync/src/synchronizer/mod.rs +++ b/sync/src/synchronizer/mod.rs @@ -37,6 +37,7 @@ use ckb_network::{ async_trait, bytes::Bytes, tokio, CKBProtocolContext, CKBProtocolHandler, PeerIndex, ServiceControl, SupportProtocols, }; +use ckb_stop_handler::register_thread; use ckb_systemtime::unix_time_as_millis; use ckb_types::{ core::{self, BlockNumber}, @@ -625,8 +626,9 @@ impl Synchronizer { self.fetch_channel = Some(sender); let thread = ::std::thread::Builder::new(); let number = self.shared.state().shared_best_header_ref().number(); - thread - .name("BlockDownload".to_string()) + const THREAD_NAME: &str = "BlockDownload"; + let blockdownload_jh = thread + .name(THREAD_NAME.into()) .spawn(move || { BlockFetchCMD { sync, @@ -638,6 +640,7 @@ impl Synchronizer { .run(); }) .expect("download thread can't start"); + register_thread(THREAD_NAME, blockdownload_jh); } }, None => { diff --git a/sync/src/tests/net_time_checker.rs b/sync/src/tests/net_time_checker.rs index 890e0e218b..d849458754 100644 --- a/sync/src/tests/net_time_checker.rs +++ b/sync/src/tests/net_time_checker.rs @@ -2,8 +2,8 @@ use crate::net_time_checker::{NetTimeChecker, NetTimeProtocol, TOLERANT_OFFSET}; use ckb_app_config::NetworkConfig; use ckb_network::{ multiaddr::{Multiaddr, Protocol}, - CKBProtocol, DefaultExitHandler, EventHandler, NetworkState, ServiceBuilder, ServiceControl, - SessionId, SupportProtocols, TargetProtocol, + CKBProtocol, EventHandler, NetworkState, ServiceBuilder, ServiceControl, SessionId, + SupportProtocols, TargetProtocol, }; use std::{ borrow::Cow, @@ -102,10 +102,7 @@ fn net_service_start() -> Node { .key_pair(network_state.local_private_key().clone()) .upnp(config.upnp) .forever(true) - .build(EventHandler::new( - Arc::clone(&network_state), - DefaultExitHandler::default(), - )); + .build(EventHandler::new(Arc::clone(&network_state))); let peer_id = network_state.local_peer_id().clone(); diff --git a/sync/src/types/header_map/mod.rs b/sync/src/types/header_map/mod.rs index 5210e482f6..78939164b6 100644 --- a/sync/src/types/header_map/mod.rs +++ b/sync/src/types/header_map/mod.rs @@ -1,10 +1,11 @@ use ckb_async_runtime::Handle; -use ckb_stop_handler::{SignalSender, StopHandler}; +use ckb_logger::info; +use ckb_stop_handler::{new_tokio_exit_rx, CancellationToken}; use ckb_types::packed::Byte32; use std::sync::Arc; use std::time::Duration; use std::{mem::size_of, path}; -use tokio::sync::oneshot; + use tokio::time::MissedTickBehavior; mod backend; @@ -21,13 +22,6 @@ use super::HeaderIndexView; pub struct HeaderMap { inner: Arc>, - stop: StopHandler<()>, -} - -impl Drop for HeaderMap { - fn drop(&mut self) { - self.stop.try_send(()); - } } const INTERVAL: Duration = Duration::from_millis(500); @@ -51,7 +45,7 @@ impl HeaderMap { let size_limit = memory_limit / ITEM_BYTES_SIZE; let inner = Arc::new(HeaderMapKernel::new(tmpdir, size_limit)); let map = Arc::clone(&inner); - let (stop, mut stop_rx) = oneshot::channel::<()>(); + let stop_rx: CancellationToken = new_tokio_exit_rx(); async_handle.spawn(async move { let mut interval = tokio::time::interval(INTERVAL); @@ -61,15 +55,15 @@ impl HeaderMap { _ = interval.tick() => { map.limit_memory(); } - _ = &mut stop_rx => break, + _ = stop_rx.cancelled() => { + info!("HeaderMap limit_memory received exit signal, exit now"); + break + }, } } }); - Self { - inner, - stop: StopHandler::new(SignalSender::Tokio(stop), None, "HeaderMap".to_string()), - } + Self { inner } } pub(crate) fn contains_key(&self, hash: &Byte32) -> bool { diff --git a/test/src/net.rs b/test/src/net.rs index 5cf87930ad..56c4f5676e 100644 --- a/test/src/net.rs +++ b/test/src/net.rs @@ -7,8 +7,8 @@ use ckb_channel::{self as channel, unbounded, Receiver, RecvTimeoutError, Sender use ckb_logger::info; use ckb_network::{ async_trait, bytes::Bytes, extract_peer_id, CKBProtocol, CKBProtocolContext, - CKBProtocolHandler, DefaultExitHandler, Flags, NetworkController, NetworkService, NetworkState, - PeerIndex, ProtocolId, SupportProtocols, + CKBProtocolHandler, Flags, NetworkController, NetworkService, NetworkState, PeerIndex, + ProtocolId, SupportProtocols, }; use ckb_util::Mutex; use std::collections::HashMap; @@ -63,7 +63,7 @@ impl Net { ) }) .collect(); - let (async_handle, async_runtime) = new_global_runtime(); + let (async_handle, _handle_recv, async_runtime) = new_global_runtime(); let controller = NetworkService::new( Arc::clone(&network_state), ckb_protocols, @@ -73,7 +73,6 @@ impl Net { "0.1.0".to_string(), Flags::COMPATIBILITY, ), - DefaultExitHandler::default(), ) .start(&async_handle) .unwrap(); diff --git a/tx-pool/Cargo.toml b/tx-pool/Cargo.toml index 1ed8428ccf..95e4aa1294 100644 --- a/tx-pool/Cargo.toml +++ b/tx-pool/Cargo.toml @@ -39,6 +39,7 @@ hyper = { version = "0.14", features = ["http1", "client", "tcp"] } multi_index_map = "0.5.0" slab = "0.4" rustc-hash = "1.1" +tokio-util = "0.7.8" [dev-dependencies] tempfile.workspace = true diff --git a/tx-pool/src/chunk_process.rs b/tx-pool/src/chunk_process.rs index c86a2966cb..b35e547a21 100644 --- a/tx-pool/src/chunk_process.rs +++ b/tx-pool/src/chunk_process.rs @@ -4,6 +4,7 @@ use crate::try_or_return_with_snapshot; use crate::{error::Reject, service::TxPoolService}; use ckb_chain_spec::consensus::Consensus; use ckb_error::Error; +use ckb_logger::info; use ckb_snapshot::Snapshot; use ckb_store::data_loader_wrapper::AsDataLoader; use ckb_traits::{CellDataProvider, ExtensionProvider, HeaderProvider}; @@ -21,6 +22,7 @@ use std::sync::Arc; use tokio::sync::watch; use tokio::sync::RwLock; use tokio::task::block_in_place; +use tokio_util::sync::CancellationToken; const MIN_STEP_CYCLE: Cycle = 10_000_000; @@ -41,15 +43,15 @@ enum State { pub(crate) struct ChunkProcess { service: TxPoolService, recv: watch::Receiver, - signal: watch::Receiver, current_state: ChunkCommand, + signal: CancellationToken, } impl ChunkProcess { pub fn new( service: TxPoolService, recv: watch::Receiver, - signal: watch::Receiver, + signal: CancellationToken, ) -> Self { ChunkProcess { service, @@ -73,7 +75,10 @@ impl ChunkProcess { } } }, - _ = self.signal.changed() => break, + _ = self.signal.cancelled() => { + info!("TxPool received exit signal, exit now"); + break + }, _ = interval.tick() => { if matches!(self.current_state, ChunkCommand::Resume) { let stop = self.try_process().await; @@ -136,7 +141,7 @@ impl ChunkProcess { let mut tmp_state: Option = None; let completed: Cycle = loop { - if self.signal.has_changed().unwrap_or(false) { + if self.signal.is_cancelled() { return Ok(State::Stopped); } if self.recv.has_changed().unwrap_or(false) { diff --git a/tx-pool/src/process.rs b/tx-pool/src/process.rs index 678a9fbad5..0013d5cf33 100644 --- a/tx-pool/src/process.rs +++ b/tx-pool/src/process.rs @@ -916,7 +916,7 @@ impl TxPoolService { } } - pub(crate) async fn save_pool(&mut self) { + pub(crate) async fn save_pool(&self) { let mut tx_pool = self.tx_pool.write().await; if let Err(err) = tx_pool.save_into_file() { error!("failed to save pool, error: {:?}", err) diff --git a/tx-pool/src/service.rs b/tx-pool/src/service.rs index a4184809a1..f405129201 100644 --- a/tx-pool/src/service.rs +++ b/tx-pool/src/service.rs @@ -17,7 +17,7 @@ use ckb_logger::error; use ckb_logger::info; use ckb_network::{NetworkController, PeerIndex}; use ckb_snapshot::Snapshot; -use ckb_stop_handler::{SignalSender, StopHandler, WATCH_INIT}; +use ckb_stop_handler::new_tokio_exit_rx; use ckb_types::core::tx_pool::{TransactionWithStatus, TxStatus}; use ckb_types::{ core::{ @@ -37,6 +37,7 @@ use std::time::Duration; use tokio::sync::watch; use tokio::sync::{mpsc, RwLock}; use tokio::task::block_in_place; +use tokio_util::sync::CancellationToken; #[cfg(feature = "internal")] use crate::{component::entry::TxEntry, process::PlugTarget}; @@ -128,18 +129,9 @@ pub struct TxPoolController { reorg_sender: mpsc::Sender>, chunk_tx: Arc>, handle: Handle, - stop: StopHandler<()>, started: Arc, } -impl Drop for TxPoolController { - fn drop(&mut self) { - if self.service_started() { - self.stop.try_send(()); - } - } -} - macro_rules! send_message { ($self:ident, $msg_type:ident, $args:expr) => {{ let (responder, response) = oneshot::channel(); @@ -378,7 +370,7 @@ pub struct TxPoolServiceBuilder { pub(crate) callbacks: Callbacks, pub(crate) receiver: mpsc::Receiver, pub(crate) reorg_receiver: mpsc::Receiver>, - pub(crate) signal_receiver: watch::Receiver, + pub(crate) signal_receiver: CancellationToken, pub(crate) handle: Handle, pub(crate) tx_relay_sender: ckb_channel::Sender, pub(crate) chunk_rx: watch::Receiver, @@ -403,22 +395,16 @@ impl TxPoolServiceBuilder { let (sender, receiver) = mpsc::channel(DEFAULT_CHANNEL_SIZE); let block_assembler_channel = mpsc::channel(BLOCK_ASSEMBLER_CHANNEL_SIZE); let (reorg_sender, reorg_receiver) = mpsc::channel(DEFAULT_CHANNEL_SIZE); - let (signal_sender, signal_receiver) = watch::channel(WATCH_INIT); + let signal_receiver: CancellationToken = new_tokio_exit_rx(); let (chunk_tx, chunk_rx) = watch::channel(ChunkCommand::Resume); let chunk = Arc::new(RwLock::new(ChunkQueue::new())); let started = Arc::new(AtomicBool::new(false)); - let stop = StopHandler::new( - SignalSender::Watch(signal_sender), - None, - "tx-pool".to_string(), - ); let controller = TxPoolController { sender, reorg_sender, handle: handle.clone(), chunk_tx: Arc::new(chunk_tx), - stop, started: Arc::clone(&started), }; @@ -515,7 +501,7 @@ impl TxPoolServiceBuilder { let handle_clone = self.handle.clone(); let process_service = service.clone(); - let mut signal_receiver = self.signal_receiver.clone(); + let signal_receiver = self.signal_receiver.clone(); self.handle.spawn(async move { loop { tokio::select! { @@ -523,7 +509,11 @@ impl TxPoolServiceBuilder { let service_clone = process_service.clone(); handle_clone.spawn(process(service_clone, message)); }, - _ = signal_receiver.changed() => break, + _ = signal_receiver.cancelled() => { + info!("TxPool is saving, please wait..."); + process_service.save_pool().await; + break + }, else => break, } } @@ -531,7 +521,7 @@ impl TxPoolServiceBuilder { let process_service = service.clone(); if let Some(ref block_assembler) = service.block_assembler { - let mut signal_receiver = self.signal_receiver.clone(); + let signal_receiver = self.signal_receiver.clone(); let interval = Duration::from_millis(block_assembler.config.update_interval_millis); if interval.is_zero() { // block_assembler.update_interval_millis set zero interval should only be used for tests, @@ -547,7 +537,10 @@ impl TxPoolServiceBuilder { let service_clone = process_service.clone(); block_assembler::process(service_clone, &message).await; }, - _ = signal_receiver.changed() => break, + _ = signal_receiver.cancelled() => { + info!("TxPool received exit signal, exit now"); + break + }, else => break, } } @@ -579,7 +572,10 @@ impl TxPoolServiceBuilder { } queue.clear(); } - _ = signal_receiver.changed() => break, + _ = signal_receiver.cancelled() => { + info!("TxPool received exit signal, exit now"); + break + }, else => break, } } @@ -587,7 +583,7 @@ impl TxPoolServiceBuilder { } } - let mut signal_receiver = self.signal_receiver; + let signal_receiver = self.signal_receiver; self.handle.spawn(async move { loop { tokio::select! { @@ -614,7 +610,10 @@ impl TxPoolServiceBuilder { service.update_block_assembler_after_tx_pool_reorg().await; }, - _ = signal_receiver.changed() => break, + _ = signal_receiver.cancelled() => { + info!("TxPool received exit signal, exit now"); + break + }, else => break, } } diff --git a/util/channel/src/lib.rs b/util/channel/src/lib.rs index 90755a11f3..a250f5f104 100644 --- a/util/channel/src/lib.rs +++ b/util/channel/src/lib.rs @@ -1,7 +1,7 @@ //! Reexports `crossbeam_channel` to uniform the dependency version. pub use crossbeam_channel::{ - bounded, select, unbounded, Receiver, RecvError, RecvTimeoutError, Select, SendError, Sender, - TrySendError, + after, bounded, select, tick, unbounded, Receiver, RecvError, RecvTimeoutError, Select, + SendError, Sender, TrySendError, }; pub mod oneshot { diff --git a/util/indexer/src/service.rs b/util/indexer/src/service.rs index d104eb3646..ef8f876aee 100644 --- a/util/indexer/src/service.rs +++ b/util/indexer/src/service.rs @@ -7,7 +7,7 @@ use crate::store::{IteratorDirection, RocksdbStore, SecondaryDB, Store}; use crate::error::Error; use ckb_app_config::{DBConfig, IndexerConfig}; use ckb_async_runtime::{ - tokio::{self, sync::watch, time}, + tokio::{self, time}, Handle, }; use ckb_db_schema::{COLUMN_BLOCK_BODY, COLUMN_BLOCK_HEADER, COLUMN_INDEX, COLUMN_META}; @@ -18,7 +18,7 @@ use ckb_jsonrpc_types::{ }; use ckb_logger::{error, info}; use ckb_notify::NotifyController; -use ckb_stop_handler::{SignalSender, StopHandler, WATCH_INIT}; +use ckb_stop_handler::{new_tokio_exit_rx, CancellationToken}; use ckb_store::ChainStore; use ckb_types::{core, packed, prelude::*, H256}; use rocksdb::{prelude::*, Direction, IteratorMode}; @@ -39,8 +39,6 @@ pub struct IndexerService { pool: Option>>, poll_interval: Duration, async_handle: Handle, - stop_handler: StopHandler<()>, - stop: watch::Receiver, block_filter: Option, cell_filter: Option, } @@ -48,13 +46,6 @@ pub struct IndexerService { impl IndexerService { /// Construct new Indexer service instance from DBConfig and IndexerConfig pub fn new(ckb_db_config: &DBConfig, config: &IndexerConfig, async_handle: Handle) -> Self { - let (stop_sender, stop) = watch::channel(WATCH_INIT); - let stop_handler = StopHandler::new( - SignalSender::Watch(stop_sender), - None, - "indexer".to_string(), - ); - let store_opts = Self::indexer_store_options(config); let store = RocksdbStore::new(&store_opts, &config.store); let pool = if config.index_tx_pool { @@ -82,8 +73,6 @@ impl IndexerService { secondary_db, pool, async_handle, - stop_handler, - stop, poll_interval: Duration::from_secs(config.poll_interval), block_filter: config.block_filter.clone(), cell_filter: config.cell_filter.clone(), @@ -98,14 +87,13 @@ impl IndexerService { IndexerHandle { store: self.store.clone(), pool: self.pool.clone(), - stop_handler: self.stop_handler.clone(), } } /// Processes that handle index pool transaction and expect to be spawned to run in tokio runtime pub fn index_tx_pool(&self, notify_controller: NotifyController) { let service = self.clone(); - let mut stop = self.stop.clone(); + let stop: CancellationToken = new_tokio_exit_rx(); self.async_handle.spawn(async move { let mut new_transaction_receiver = notify_controller @@ -129,7 +117,10 @@ impl IndexerService { .transaction_rejected(&tx_entry.transaction); } } - _ = stop.changed() => break, + _ = stop.cancelled() => { + info!("Indexer received exit signal, exit now"); + break + }, else => break, } } @@ -183,7 +174,7 @@ impl IndexerService { let initial_syncing = self .async_handle .spawn_blocking(move || initial_service.try_loop_sync()); - let mut stop = self.stop.clone(); + let stop: CancellationToken = new_tokio_exit_rx(); let async_handle = self.async_handle.clone(); let poll_service = self.clone(); self.async_handle.spawn(async move { @@ -212,7 +203,10 @@ impl IndexerService { error!("ckb indexer syncing join error {:?}", e); } } - _ = stop.changed() => break, + _ = stop.cancelled() => { + info!("Indexer received exit signal, exit now"); + break + }, } } }); @@ -262,13 +256,6 @@ impl IndexerService { pub struct IndexerHandle { pub(crate) store: RocksdbStore, pub(crate) pool: Option>>, - stop_handler: StopHandler<()>, -} - -impl Drop for IndexerHandle { - fn drop(&mut self) { - self.stop_handler.try_send(()); - } } impl IndexerHandle { @@ -984,11 +971,9 @@ mod tests { let store = new_store("rpc"); let pool = Arc::new(RwLock::new(Pool::default())); let indexer = Indexer::new(store.clone(), 10, 100, None, CustomFilters::new(None, None)); - let stop_handler = StopHandler::new(SignalSender::Dummy, None, "indexer-test".to_string()); let rpc = IndexerHandle { store, pool: Some(Arc::clone(&pool)), - stop_handler, }; // setup test data @@ -1573,12 +1558,7 @@ mod tests { fn script_search_mode_rpc() { let store = new_store("script_search_mode_rpc"); let indexer = Indexer::new(store.clone(), 10, 100, None, CustomFilters::new(None, None)); - let stop_handler = StopHandler::new(SignalSender::Dummy, None, "indexer-test".to_string()); - let rpc = IndexerHandle { - store, - pool: None, - stop_handler, - }; + let rpc = IndexerHandle { store, pool: None }; // setup test data let lock_script1 = ScriptBuilder::default() diff --git a/util/launcher/Cargo.toml b/util/launcher/Cargo.toml index d9577d93db..aafb19269a 100644 --- a/util/launcher/Cargo.toml +++ b/util/launcher/Cargo.toml @@ -39,7 +39,6 @@ ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc8" } ckb-notify = { path = "../../notify", version = "= 0.111.0-rc8" } ckb-snapshot = { path = "../snapshot", version = "= 0.111.0-rc8" } ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc8" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc8" } ckb-light-client-protocol-server = { path = "../light-client-protocol-server", version = "= 0.111.0-rc8" } ckb-block-filter = { path = "../../block-filter", version = "= 0.111.0-rc8" } ckb-hash = { path = "../hash", version = "= 0.111.0-rc8" } diff --git a/util/launcher/src/lib.rs b/util/launcher/src/lib.rs index 96259acb5b..ad56947f35 100644 --- a/util/launcher/src/lib.rs +++ b/util/launcher/src/lib.rs @@ -23,15 +23,15 @@ use ckb_jsonrpc_types::ScriptHashType; use ckb_light_client_protocol_server::LightClientProtocol; use ckb_logger::info; use ckb_network::{ - observe_listen_port_occupancy, CKBProtocol, DefaultExitHandler, Flags, NetworkController, - NetworkService, NetworkState, SupportProtocols, + observe_listen_port_occupancy, CKBProtocol, Flags, NetworkController, NetworkService, + NetworkState, SupportProtocols, }; use ckb_network_alert::alert_relayer::AlertRelayer; use ckb_proposal_table::ProposalTable; use ckb_resource::Resource; use ckb_rpc::{RpcServer, ServiceBuilder}; use ckb_shared::Shared; -use ckb_stop_handler::StopHandler; + use ckb_store::{ChainDB, ChainStore}; use ckb_sync::{BlockFilter, NetTimeProtocol, Relayer, SyncShared, Synchronizer}; use ckb_tx_pool::service::TxVerificationResult; @@ -250,7 +250,7 @@ impl Launcher { } /// start block filter service - pub fn start_block_filter(&self, shared: &Shared) -> Option> { + pub fn start_block_filter(&self, shared: &Shared) { if self .args .config @@ -258,9 +258,7 @@ impl Launcher { .support_protocols .contains(&SupportProtocol::Filter) { - Some(BlockFilterService::new(shared.clone()).start()) - } else { - None + BlockFilterService::new(shared.clone()).start(); } } @@ -269,7 +267,6 @@ impl Launcher { &self, shared: &Shared, chain_controller: ChainController, - exit_handler: &DefaultExitHandler, miner_enable: bool, relay_tx_receiver: Receiver, ) -> (NetworkController, RpcServer) { @@ -383,7 +380,6 @@ impl Launcher { self.version.to_string(), flags, ), - exit_handler.clone(), ) .start(shared.async_handle()) .expect("Start network service failed"); diff --git a/util/launcher/src/shared_builder.rs b/util/launcher/src/shared_builder.rs index 7c1a096953..09f9fd862c 100644 --- a/util/launcher/src/shared_builder.rs +++ b/util/launcher/src/shared_builder.rs @@ -19,7 +19,7 @@ use ckb_proposal_table::ProposalTable; use ckb_proposal_table::ProposalView; use ckb_shared::Shared; use ckb_snapshot::{Snapshot, SnapshotMgr}; -use ckb_stop_handler::StopHandler; + use ckb_store::ChainDB; use ckb_store::ChainStore; use ckb_tx_pool::{ @@ -151,7 +151,7 @@ impl SharedBuilder { thread_local! { // NOTICE：we can't put the runtime directly into thread_local here, // on windows the runtime in thread_local will get stuck when dropping - static RUNTIME_HANDLE: unsync::OnceCell<(Handle, StopHandler<()>)> = unsync::OnceCell::new(); + static RUNTIME_HANDLE: unsync::OnceCell = unsync::OnceCell::new(); } static DB_COUNT: AtomicUsize = AtomicUsize::new(0); @@ -177,11 +177,7 @@ impl SharedBuilder { notify_config: None, store_config: None, block_assembler_config: None, - async_handle: runtime - .borrow() - .get_or_init(new_background_runtime) - .0 - .clone(), + async_handle: runtime.borrow().get_or_init(new_background_runtime).clone(), }) } } diff --git a/util/light-client-protocol-server/src/tests/utils/chain.rs b/util/light-client-protocol-server/src/tests/utils/chain.rs index a87805c486..fcfd483a86 100644 --- a/util/light-client-protocol-server/src/tests/utils/chain.rs +++ b/util/light-client-protocol-server/src/tests/utils/chain.rs @@ -9,7 +9,7 @@ use ckb_chain_spec::consensus::{build_genesis_epoch_ext, ConsensusBuilder}; use ckb_dao_utils::genesis_dao_data; use ckb_jsonrpc_types::ScriptHashType; use ckb_launcher::SharedBuilder; -use ckb_network::{DefaultExitHandler, Flags, NetworkController, NetworkService, NetworkState}; +use ckb_network::{Flags, NetworkController, NetworkService, NetworkState}; use ckb_shared::Shared; use ckb_systemtime::unix_time_as_millis; use ckb_test_chain_utils::always_success_cell; @@ -242,7 +242,6 @@ fn dummy_network(shared: &Shared) -> NetworkController { "test".to_string(), Flags::all(), ), - DefaultExitHandler::default(), ) .start(shared.async_handle()) .expect("Start network service failed") diff --git a/util/metrics-service/Cargo.toml b/util/metrics-service/Cargo.toml index cb757ee005..7dd9ff098f 100644 --- a/util/metrics-service/Cargo.toml +++ b/util/metrics-service/Cargo.toml @@ -16,3 +16,4 @@ ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc8" } ckb-util = { path = "..", version = "= 0.111.0-rc8" } prometheus = "0.13.3" hyper = { version = "0.14", features = ["http1", "tcp", "server"] } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc8" } diff --git a/util/metrics-service/src/lib.rs b/util/metrics-service/src/lib.rs index 6d7fb3ebfc..1b88171de0 100644 --- a/util/metrics-service/src/lib.rs +++ b/util/metrics-service/src/lib.rs @@ -10,7 +10,9 @@ use hyper::{ use prometheus::Encoder as _; use ckb_async_runtime::Handle; +use ckb_logger::info; use ckb_metrics_config::{Config, Exporter, Target}; +use ckb_stop_handler::{new_tokio_exit_rx, CancellationToken}; use ckb_util::strings; /// Ensures the metrics service can shutdown gracefully. @@ -59,7 +61,13 @@ fn run_exporter(exporter: Exporter, handle: &Handle) -> Result<(), String> { }); ckb_logger::info!("start prometheus exporter at {}", addr); handle.spawn(async move { - let server = Server::bind(&addr).serve(make_svc); + let server = Server::bind(&addr) + .serve(make_svc) + .with_graceful_shutdown(async { + let exit_rx: CancellationToken = new_tokio_exit_rx(); + exit_rx.cancelled().await; + info!("prometheus server received exit signal, exit now"); + }); if let Err(err) = server.await { ckb_logger::error!("prometheus server error: {}", err); } diff --git a/util/network-alert/Cargo.toml b/util/network-alert/Cargo.toml index 747236dcd4..4a3cfeaa99 100644 --- a/util/network-alert/Cargo.toml +++ b/util/network-alert/Cargo.toml @@ -25,7 +25,6 @@ semver = "1.0" [dev-dependencies] ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc8" } ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc8" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc8" } once_cell = "1.8.0" ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc8", features = ["enable_faketime"]} faster-hex = "0.6" diff --git a/util/network-alert/src/tests/test_notifier.rs b/util/network-alert/src/tests/test_notifier.rs index 6b6a1f9bd8..fc793dc5e8 100644 --- a/util/network-alert/src/tests/test_notifier.rs +++ b/util/network-alert/src/tests/test_notifier.rs @@ -1,7 +1,7 @@ use crate::notifier::Notifier; use ckb_async_runtime::{new_background_runtime, Handle}; use ckb_notify::NotifyService; -use ckb_stop_handler::StopHandler; + use ckb_types::{packed, prelude::*}; use once_cell::unsync; use std::borrow::Borrow; @@ -27,17 +27,13 @@ fn new_notifier(version: &str) -> Notifier { thread_local! { // NOTICE：we can't put the runtime directly into thread_local here, // on windows the runtime in thread_local will get stuck when dropping - static RUNTIME_HANDLE: unsync::OnceCell<(Handle, StopHandler<()>)> = unsync::OnceCell::new(); + static RUNTIME_HANDLE: unsync::OnceCell = unsync::OnceCell::new(); } let notify_controller = RUNTIME_HANDLE.with(|runtime| { NotifyService::new( Default::default(), - runtime - .borrow() - .get_or_init(new_background_runtime) - .0 - .clone(), + runtime.borrow().get_or_init(new_background_runtime).clone(), ) .start() }); diff --git a/util/runtime/Cargo.toml b/util/runtime/Cargo.toml index 3cf4c0d88b..0588089a23 100644 --- a/util/runtime/Cargo.toml +++ b/util/runtime/Cargo.toml @@ -10,6 +10,5 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] tokio = { version = "1", features = ["full"] } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc8" } ckb-logger = { path = "../logger", version = "= 0.111.0-rc8" } ckb-spawn = { path = "../spawn", version = "= 0.111.0-rc8" } diff --git a/util/runtime/src/lib.rs b/util/runtime/src/lib.rs index 6984ded8e4..17a60a9d53 100644 --- a/util/runtime/src/lib.rs +++ b/util/runtime/src/lib.rs @@ -1,17 +1,17 @@ //! Utilities for tokio runtime. use ckb_spawn::Spawn; -use ckb_stop_handler::{SignalSender, StopHandler}; use core::future::Future; use std::sync::atomic::{AtomicU32, Ordering}; -use std::thread; + use tokio::runtime::Builder; use tokio::runtime::Handle as TokioHandle; -use tokio::sync::oneshot; + use tokio::task::JoinHandle; pub use tokio; pub use tokio::runtime::Runtime; +use tokio::sync::mpsc::{Receiver, Sender}; // Handle is a newtype wrap and unwrap tokio::Handle, it is workaround with Rust Orphan Rules. // We need `Handle` impl ckb spawn trait decouple tokio dependence @@ -20,6 +20,19 @@ pub use tokio::runtime::Runtime; #[derive(Debug, Clone)] pub struct Handle { pub(crate) inner: TokioHandle, + guard: Option>, +} + +impl Handle { + /// Create a new Handle + pub fn new(inner: TokioHandle, guard: Option>) -> Self { + Self { inner, guard } + } + + /// Drop the guard + pub fn drop_guard(&mut self) { + let _ = self.guard.take(); + } } impl Handle { @@ -42,7 +55,15 @@ impl Handle { F: Future + Send + 'static, F::Output: Send + 'static, { - self.inner.spawn(future) + let tokio_task_guard = self.guard.clone(); + + self.inner.spawn(async move { + // move tokio_task_guard into the spawned future + // so that it will be dropped when the future is finished + let _guard = tokio_task_guard; + + future.await + }) } /// Run a future to completion on the Tokio runtime from a synchronous context. @@ -101,32 +122,31 @@ fn new_runtime() -> Runtime { } /// Create new threaded_scheduler tokio Runtime, return `Runtime` -pub fn new_global_runtime() -> (Handle, Runtime) { +pub fn new_global_runtime() -> (Handle, Receiver<()>, Runtime) { let runtime = new_runtime(); let handle = runtime.handle().clone(); + let (guard, handle_stop_rx): (Sender<()>, Receiver<()>) = tokio::sync::mpsc::channel::<()>(1); - (Handle { inner: handle }, runtime) + (Handle::new(handle, Some(guard)), handle_stop_rx, runtime) } /// Create new threaded_scheduler tokio Runtime, return `Handle` and background thread join handle, /// NOTICE: This is only used in testing -pub fn new_background_runtime() -> (Handle, StopHandler<()>) { +pub fn new_background_runtime() -> Handle { let runtime = new_runtime(); let handle = runtime.handle().clone(); - let (tx, rx) = oneshot::channel(); - let thread = thread::Builder::new() + let (guard, mut handle_stop_rx): (Sender<()>, Receiver<()>) = + tokio::sync::mpsc::channel::<()>(1); + let _thread = std::thread::Builder::new() .name("GlobalRtBuilder".to_string()) .spawn(move || { - let ret = runtime.block_on(rx); + let ret = runtime.block_on(async move { handle_stop_rx.recv().await }); ckb_logger::debug!("global runtime finish {:?}", ret); }) .expect("tokio runtime started"); - ( - Handle { inner: handle }, - StopHandler::new(SignalSender::Tokio(tx), Some(thread), "GT".to_string()), - ) + Handle::new(handle, Some(guard)) } impl Spawn for Handle { diff --git a/util/stop-handler/Cargo.toml b/util/stop-handler/Cargo.toml index 1d300c494a..2245ddfdcf 100644 --- a/util/stop-handler/Cargo.toml +++ b/util/stop-handler/Cargo.toml @@ -9,7 +9,16 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -parking_lot = "0.12" ckb-logger = { path = "../logger", version = "= 0.111.0-rc8" } tokio = { version = "1", features = ["sync", "rt-multi-thread"] } ckb-channel = { path = "../channel", version = "= 0.111.0-rc8" } +ckb-util = { path = "..", version = "= 0.111.0-rc8" } +once_cell = "1.8.0" +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc8" } +tokio-util = "0.7.8" + + +[dev-dependencies] +ctrlc = { version = "3.1", features = ["termination"] } +libc = "0.2" +rand = "0.8.5" From daefd226f8ffa1fc6c51f05fd9e39c23f3ff819c Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Tue, 20 Jun 2023 17:04:55 +0800 Subject: [PATCH 042/125] exit when `ProtocolHandleErrorKind::AbnormallyClosed` received Signed-off-by: Eval EXEC --- network/src/network.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/network/src/network.rs b/network/src/network.rs index 89bc527652..eaf3f7576b 100644 --- a/network/src/network.rs +++ b/network/src/network.rs @@ -654,6 +654,7 @@ impl ServiceHandle for EventHandler { ) }, ); + error!("ProtocolHandleError: AbnormallyClosed, proto_id: {opt_session_id:?}, session id: {opt_session_id:?}"); broadcast_exit_signals(); } From 5108122270e360ad337650d767259f47c74a779d Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Tue, 20 Jun 2023 17:55:56 +0800 Subject: [PATCH 043/125] Fix BlockDownload thread exit Signed-off-by: Eval EXEC --- sync/src/synchronizer/mod.rs | 104 ++++++++++++++----------- util/stop-handler/src/stop_register.rs | 20 +++-- 2 files changed, 71 insertions(+), 53 deletions(-) diff --git a/sync/src/synchronizer/mod.rs b/sync/src/synchronizer/mod.rs index a2ab6cf46b..7341ce4bc8 100644 --- a/sync/src/synchronizer/mod.rs +++ b/sync/src/synchronizer/mod.rs @@ -27,6 +27,7 @@ use crate::{Status, StatusCode}; use ckb_chain::chain::ChainController; use ckb_channel as channel; +use ckb_channel::{select, Receiver}; use ckb_constant::sync::{ BAD_MESSAGE_BAN_TIME, CHAIN_SYNC_TIMEOUT, EVICTION_HEADERS_RESPONSE_TIME, INIT_BLOCKS_IN_TRANSIT_PER_PEER, MAX_TIP_AGE, @@ -37,7 +38,7 @@ use ckb_network::{ async_trait, bytes::Bytes, tokio, CKBProtocolContext, CKBProtocolHandler, PeerIndex, ServiceControl, SupportProtocols, }; -use ckb_stop_handler::register_thread; +use ckb_stop_handler::{new_crossbeam_exit_rx, register_thread}; use ckb_systemtime::unix_time_as_millis; use ckb_types::{ core::{self, BlockNumber}, @@ -87,58 +88,70 @@ struct BlockFetchCMD { } impl BlockFetchCMD { - fn run(&mut self) { - while let Ok(cmd) = self.recv.recv() { - match cmd { - FetchCMD::Fetch((peers, state)) => match self.can_start() { - CanStart::Ready => { - for peer in peers { - if let Some(fetch) = BlockFetcher::new(&self.sync, peer, state).fetch() - { - for item in fetch { - BlockFetchCMD::send_getblocks(item, &self.p2p_control, peer); - } + fn process_fetch_cmd(&mut self, cmd: FetchCMD) { + match cmd { + FetchCMD::Fetch((peers, state)) => match self.can_start() { + CanStart::Ready => { + for peer in peers { + if let Some(fetch) = BlockFetcher::new(&self.sync, peer, state).fetch() { + for item in fetch { + BlockFetchCMD::send_getblocks(item, &self.p2p_control, peer); } } } - CanStart::MinWorkNotReach => { - let best_known = self.sync.shared.state().shared_best_header_ref(); - let number = best_known.number(); - if number != self.number && (number - self.number) % 10000 == 0 { - self.number = number; - info!( - "best known header number: {}, total difficulty: {:#x}, \ + } + CanStart::MinWorkNotReach => { + let best_known = self.sync.shared.state().shared_best_header_ref(); + let number = best_known.number(); + if number != self.number && (number - self.number) % 10000 == 0 { + self.number = number; + info!( + "best known header number: {}, total difficulty: {:#x}, \ require min header number on 500_000, min total difficulty: {:#x}, \ then start to download block", - number, - best_known.total_difficulty(), - self.sync.shared.state().min_chain_work() - ); - } + number, + best_known.total_difficulty(), + self.sync.shared.state().min_chain_work() + ); } - CanStart::AssumeValidNotFound => { - let state = self.sync.shared.state(); - let best_known = state.shared_best_header_ref(); - let number = best_known.number(); - let assume_valid_target: Byte32 = state - .assume_valid_target() - .as_ref() - .map(Pack::pack) - .expect("assume valid target must exist"); - - if number != self.number && (number - self.number) % 10000 == 0 { - self.number = number; - info!( - "best known header number: {}, hash: {:#?}, \ + } + CanStart::AssumeValidNotFound => { + let state = self.sync.shared.state(); + let best_known = state.shared_best_header_ref(); + let number = best_known.number(); + let assume_valid_target: Byte32 = state + .assume_valid_target() + .as_ref() + .map(Pack::pack) + .expect("assume valid target must exist"); + + if number != self.number && (number - self.number) % 10000 == 0 { + self.number = number; + info!( + "best known header number: {}, hash: {:#?}, \ can't find assume valid target temporarily, hash: {:#?} \ please wait", - number, - best_known.hash(), - assume_valid_target - ); - } + number, + best_known.hash(), + assume_valid_target + ); } - }, + } + }, + } + } + fn run(&mut self, stop_signal: Receiver<()>) { + loop { + select! { + recv(self.recv) -> msg => { + if let Ok(cmd) = msg { + self.process_fetch_cmd(cmd) + } + } + recv(stop_signal) -> _ => { + info!("thread BlockDownload received exit signal, exit now"); + return; + } } } } @@ -630,6 +643,7 @@ impl Synchronizer { let blockdownload_jh = thread .name(THREAD_NAME.into()) .spawn(move || { + let stop_signal = new_crossbeam_exit_rx(); BlockFetchCMD { sync, p2p_control, @@ -637,7 +651,7 @@ impl Synchronizer { number, can_start: CanStart::MinWorkNotReach, } - .run(); + .run(stop_signal); }) .expect("download thread can't start"); register_thread(THREAD_NAME, blockdownload_jh); diff --git a/util/stop-handler/src/stop_register.rs b/util/stop-handler/src/stop_register.rs index e329565ae8..e496866383 100644 --- a/util/stop-handler/src/stop_register.rs +++ b/util/stop-handler/src/stop_register.rs @@ -1,4 +1,5 @@ -use ckb_logger::{info, trace, warn}; +use ckb_channel::TrySendError; +use ckb_logger::{error, info, trace, warn}; use ckb_util::Mutex; use tokio_util::sync::CancellationToken; @@ -54,13 +55,16 @@ pub fn new_crossbeam_exit_rx() -> ckb_channel::Receiver<()> { /// Broadcast exit signals to all threads and all tokio tasks pub fn broadcast_exit_signals() { TOKIO_EXIT.cancel(); - CROSSBEAM_EXIT_SENDERS.lock().iter().for_each(|tx| { - if let Err(e) = tx.try_send(()) { - println!("broadcast thread: ERROR: {:?}", e) - } else { - println!("send a crossbeam exit signal"); - } - }); + CROSSBEAM_EXIT_SENDERS + .lock() + .iter() + .for_each(|tx| match tx.try_send(()) { + Ok(_) => {} + Err(TrySendError::Full(_)) => error!("send exit signal to channel failed since the channel is full, this should not happen"), + Err(TrySendError::Disconnected(_)) => { + info!("broadcast thread: channel is disconnected") + } + }); } /// Register a thread `JoinHandle` to `CKB_HANDLES` From 8358b268ba056f2541a66d75d376c490ace22d8e Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Mon, 26 Jun 2023 10:48:38 +0800 Subject: [PATCH 044/125] Re-order ckb workspace members --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index b280ac8d31..d6b1cb20d3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,8 +40,8 @@ members = [ "util/occupied-capacity/macros", "util/fixed-hash/macros", "util/logger-service", - "util/stop-handler", "util/runtime", + "util/stop-handler", "util/metrics", "util/metrics-service", "util/fixed-hash", From 37f2482aa5a824c039709f62d9e69226cd68b9c7 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Mon, 3 Jul 2023 15:34:48 +0800 Subject: [PATCH 045/125] Fix bats test for ckb run Signed-off-by: Eval EXEC --- util/app-config/src/tests/ckb_run_replay.bats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/app-config/src/tests/ckb_run_replay.bats b/util/app-config/src/tests/ckb_run_replay.bats index 6ca4dd5405..dc9f87ef18 100644 --- a/util/app-config/src/tests/ckb_run_replay.bats +++ b/util/app-config/src/tests/ckb_run_replay.bats @@ -24,7 +24,7 @@ function ckb_run { #@test run _ckb_run [ "$status" -eq 0 ] # assert_output --regexp "ckb_chain::chain.*block number:.*, hash:.*, size:.*, cycles:.*" - assert_output --regexp "ckb_bin::subcommand::run Finishing work, please wait" + assert_output --regexp "ckb_bin all tokio tasks have been stopped" } function ckb_replay { #@test From e95b8c70a621a2307b68623a3ed93c0bab1cf638 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 12 Jul 2023 09:31:05 +0800 Subject: [PATCH 046/125] Only catch exit signal for `ckb run` --- ckb-bin/src/lib.rs | 33 ++++++++------------------------- ckb-bin/src/subcommand/run.rs | 7 ++++++- notify/src/lib.rs | 8 ++++---- 3 files changed, 18 insertions(+), 30 deletions(-) diff --git a/ckb-bin/src/lib.rs b/ckb-bin/src/lib.rs index 91c61b813d..c8373224d7 100644 --- a/ckb-bin/src/lib.rs +++ b/ckb-bin/src/lib.rs @@ -10,10 +10,8 @@ use ckb_async_runtime::new_global_runtime; use ckb_build_info::Version; use ckb_logger::info; use ckb_network::tokio; -use ckb_stop_handler::broadcast_exit_signals; use helper::raise_fd_limit; use setup_guard::SetupGuard; -use std::sync::Arc; #[cfg(feature = "with_sentry")] pub(crate) const LOG_TARGET_SENTRY: &str = "sentry"; @@ -66,18 +64,6 @@ pub fn run_app(version: Version) -> Result<(), ExitCode> { raise_fd_limit(); - // indicate whether the process is terminated by an exit signal - let caught_exit_signal = Arc::new(std::sync::atomic::AtomicBool::new(false)); - - ctrlc::set_handler({ - let caught_exit_signal = Arc::clone(&caught_exit_signal); - move || { - broadcast_exit_signals(); - caught_exit_signal.store(true, std::sync::atomic::Ordering::SeqCst); - } - }) - .expect("Error setting Ctrl-C handler"); - let ret = match cmd { cli::CMD_RUN => subcommand::run(setup.run(matches)?, version, handle.clone()), cli::CMD_MINER => subcommand::miner(setup.miner(matches)?, handle.clone()), @@ -90,18 +76,15 @@ pub fn run_app(version: Version) -> Result<(), ExitCode> { _ => unreachable!(), }; - if !caught_exit_signal.load(std::sync::atomic::Ordering::SeqCst) { - // if `subcommand` finish normally, and we didn't catch exit signal, broadcast exit signals - broadcast_exit_signals(); - } - - handle.drop_guard(); + if matches!(cmd, cli::CMD_RUN) { + handle.drop_guard(); - tokio::task::block_in_place(|| { - info!("waiting all tokio tasks done"); - handle_stop_rx.blocking_recv(); - info!("all tokio tasks have been stopped"); - }); + tokio::task::block_in_place(|| { + info!("waiting all tokio tasks done"); + handle_stop_rx.blocking_recv(); + info!("all tokio tasks have been stopped"); + }); + } ret } diff --git a/ckb-bin/src/subcommand/run.rs b/ckb-bin/src/subcommand/run.rs index cd7d8c6282..2ce70792b9 100644 --- a/ckb-bin/src/subcommand/run.rs +++ b/ckb-bin/src/subcommand/run.rs @@ -4,7 +4,7 @@ use ckb_async_runtime::Handle; use ckb_build_info::Version; use ckb_launcher::Launcher; use ckb_logger::info; -use ckb_stop_handler::wait_all_ckb_services_exit; +use ckb_stop_handler::{broadcast_exit_signals, wait_all_ckb_services_exit}; use ckb_types::core::cell::setup_system_cell_cache; @@ -55,6 +55,11 @@ pub fn run(args: RunArgs, version: Version, async_handle: Handle) -> Result<(), let tx_pool_builder = pack.take_tx_pool_builder(); tx_pool_builder.start(network_controller.non_owning_clone()); + ctrlc::set_handler(|| { + broadcast_exit_signals(); + }) + .expect("Error setting Ctrl-C handler"); + wait_all_ckb_services_exit(); Ok(()) diff --git a/notify/src/lib.rs b/notify/src/lib.rs index 2b9969ba96..b6a0172a8a 100644 --- a/notify/src/lib.rs +++ b/notify/src/lib.rs @@ -166,10 +166,6 @@ impl NotifyService { handle.spawn(async move { loop { tokio::select! { - _ = signal_receiver.cancelled() => { - info!("NotifyService received exit signal, exit now"); - break; - } Some(msg) = new_block_register_receiver.recv() => { self.handle_register_new_block(msg) }, Some(msg) = new_block_watcher_receiver.recv() => { self.handle_watch_new_block(msg) }, Some(msg) = new_block_receiver.recv() => { self.handle_notify_new_block(msg) }, @@ -181,6 +177,10 @@ impl NotifyService { Some(msg) = reject_transaction_receiver.recv() => { self.handle_notify_reject_transaction(msg) }, Some(msg) = network_alert_register_receiver.recv() => { self.handle_register_network_alert(msg) }, Some(msg) = network_alert_receiver.recv() => { self.handle_notify_network_alert(msg) }, + _ = signal_receiver.cancelled() => { + info!("NotifyService received exit signal, exit now"); + break; + } else => break, } } From 7012fbabc6cad90835c84b70d70176d9b46c4e38 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 12 Jul 2023 09:54:28 +0800 Subject: [PATCH 047/125] Use debug level to print exit signal log --- block-filter/src/filter.rs | 4 ++-- chain/src/chain.rs | 8 ++++---- ckb-bin/src/helper.rs | 4 ++-- ckb-bin/src/lib.rs | 6 +++--- ckb-bin/src/subcommand/run.rs | 1 + miner/src/client.rs | 8 ++++---- miner/src/miner.rs | 2 +- network/src/network.rs | 2 +- notify/src/lib.rs | 4 ++-- sync/src/synchronizer/mod.rs | 2 +- sync/src/tests/synchronizer/functions.rs | 2 -- sync/src/types/header_map/mod.rs | 4 ++-- tx-pool/src/chunk_process.rs | 10 +++++----- tx-pool/src/process.rs | 2 ++ tx-pool/src/service.rs | 8 ++++---- util/indexer/src/service.rs | 6 +++--- util/metrics-service/src/lib.rs | 4 ++-- util/stop-handler/src/stop_register.rs | 8 ++++---- 18 files changed, 43 insertions(+), 42 deletions(-) diff --git a/block-filter/src/filter.rs b/block-filter/src/filter.rs index 56fcc92f6b..04e8a6566b 100644 --- a/block-filter/src/filter.rs +++ b/block-filter/src/filter.rs @@ -1,5 +1,5 @@ use ckb_async_runtime::tokio::{self, task::block_in_place}; -use ckb_logger::{debug, info, warn}; +use ckb_logger::{debug, warn}; use ckb_shared::Shared; use ckb_stop_handler::{new_tokio_exit_rx, CancellationToken}; use ckb_store::{ChainDB, ChainStore}; @@ -63,7 +63,7 @@ impl BlockFilter { new_block_watcher.borrow_and_update(); } _ = stop_rx.cancelled() => { - info!("BlockFilter received exit signal, exit now"); + debug!("BlockFilter received exit signal, exit now"); break }, else => break, diff --git a/chain/src/chain.rs b/chain/src/chain.rs index 8f7e5d8e3c..3323492032 100644 --- a/chain/src/chain.rs +++ b/chain/src/chain.rs @@ -243,10 +243,6 @@ impl ChainService { let chain_jh = thread_builder .spawn(move || loop { select! { - recv(signal_receiver) -> _ => { - info!("ChainService received exit signal, stopped"); - break; - }, recv(process_block_receiver) -> msg => match msg { Ok(Request { responder, arguments: (block, verify) }) => { let _ = tx_control.suspend_chunk_process(); @@ -268,6 +264,10 @@ impl ChainService { error!("truncate_receiver closed"); break; }, + }, + recv(signal_receiver) -> _ => { + debug!("ChainService received exit signal, exit now"); + break; } } }) diff --git a/ckb-bin/src/helper.rs b/ckb-bin/src/helper.rs index 21c93732b8..7dee9de15d 100644 --- a/ckb-bin/src/helper.rs +++ b/ckb-bin/src/helper.rs @@ -8,7 +8,7 @@ pub fn deadlock_detection() {} #[cfg(feature = "deadlock_detection")] pub fn deadlock_detection() { use ckb_channel::select; - use ckb_logger::warn; + use ckb_logger::{debug, warn}; use ckb_stop_handler::{new_crossbeam_exit_rx, register_thread}; use ckb_util::parking_lot::deadlock; use std::{thread, time::Duration}; @@ -36,7 +36,7 @@ pub fn deadlock_detection() { }, recv(stop_rx) -> _ =>{ - info!("deadlock_detection received exit signal, stopped"); + debug!("deadlock_detection received exit signal, stopped"); return; } } diff --git a/ckb-bin/src/lib.rs b/ckb-bin/src/lib.rs index c8373224d7..8596f504d0 100644 --- a/ckb-bin/src/lib.rs +++ b/ckb-bin/src/lib.rs @@ -8,7 +8,7 @@ mod subcommand; use ckb_app_config::{cli, ExitCode, Setup}; use ckb_async_runtime::new_global_runtime; use ckb_build_info::Version; -use ckb_logger::info; +use ckb_logger::{debug, info}; use ckb_network::tokio; use helper::raise_fd_limit; use setup_guard::SetupGuard; @@ -80,9 +80,9 @@ pub fn run_app(version: Version) -> Result<(), ExitCode> { handle.drop_guard(); tokio::task::block_in_place(|| { - info!("waiting all tokio tasks done"); + debug!("waiting all tokio tasks done"); handle_stop_rx.blocking_recv(); - info!("all tokio tasks have been stopped"); + info!("ckb shutdown"); }); } diff --git a/ckb-bin/src/subcommand/run.rs b/ckb-bin/src/subcommand/run.rs index 2ce70792b9..726a415944 100644 --- a/ckb-bin/src/subcommand/run.rs +++ b/ckb-bin/src/subcommand/run.rs @@ -56,6 +56,7 @@ pub fn run(args: RunArgs, version: Version, async_handle: Handle) -> Result<(), tx_pool_builder.start(network_controller.non_owning_clone()); ctrlc::set_handler(|| { + info!("Trapped exit signal, exiting..."); broadcast_exit_signals(); }) .expect("Error setting Ctrl-C handler"); diff --git a/miner/src/client.rs b/miner/src/client.rs index dda47570a7..c598f5af9a 100644 --- a/miner/src/client.rs +++ b/miner/src/client.rs @@ -4,7 +4,7 @@ use ckb_app_config::MinerClientConfig; use ckb_async_runtime::Handle; use ckb_channel::Sender; use ckb_jsonrpc_types::{Block as JsonBlock, BlockTemplate}; -use ckb_logger::{debug, error, info}; +use ckb_logger::{debug, error}; use ckb_stop_handler::{new_tokio_exit_rx, CancellationToken}; use ckb_types::{ packed::{Block, Byte32}, @@ -87,7 +87,7 @@ impl Rpc { }); }, _ = stop_rx.cancelled() => { - info!("Rpc server received exit signal, exit now"); + debug!("Rpc server received exit signal, exit now"); break }, else => break @@ -235,7 +235,7 @@ Otherwise ckb-miner does not work properly and will behave as it stopped committ let stop_rx: CancellationToken = new_tokio_exit_rx(); let graceful = server.with_graceful_shutdown(async move { stop_rx.cancelled().await; - info!("Miner client received exit signal, exit now"); + debug!("Miner client received exit signal, exit now"); }); if let Err(e) = graceful.await { @@ -255,7 +255,7 @@ Otherwise ckb-miner does not work properly and will behave as it stopped committ self.fetch_block_template().await; } _ = stop_rx.cancelled() => { - info!("Miner client pool_block_template received exit signal, exit now"); + debug!("Miner client pool_block_template received exit signal, exit now"); break }, else => break, diff --git a/miner/src/miner.rs b/miner/src/miner.rs index e14ffef72f..110fad5514 100644 --- a/miner/src/miner.rs +++ b/miner/src/miner.rs @@ -103,7 +103,7 @@ impl Miner { }, }, recv(stop_rx) -> _msg => { - info!("miner received exit signal, stopped"); + debug!("miner received exit signal, stopped"); break; } }; diff --git a/network/src/network.rs b/network/src/network.rs index eaf3f7576b..93bccc1a9f 100644 --- a/network/src/network.rs +++ b/network/src/network.rs @@ -1127,7 +1127,7 @@ impl NetworkService { loop { tokio::select! { _ = receiver.cancelled() => { - info!("NetworkService receive exit signal, start shutdown..."); + debug!("NetworkService receive exit signal, start shutdown..."); let _ = p2p_control.shutdown().await; // Drop senders to stop all corresponding background task drop(bg_signals); diff --git a/notify/src/lib.rs b/notify/src/lib.rs index b6a0172a8a..41d1451e04 100644 --- a/notify/src/lib.rs +++ b/notify/src/lib.rs @@ -1,7 +1,7 @@ //! TODO(doc): @quake use ckb_app_config::NotifyConfig; use ckb_async_runtime::Handle; -use ckb_logger::{debug, error, info, trace}; +use ckb_logger::{debug, error, trace}; use ckb_stop_handler::{new_tokio_exit_rx, CancellationToken}; use ckb_types::packed::Byte32; use ckb_types::{ @@ -178,7 +178,7 @@ impl NotifyService { Some(msg) = network_alert_register_receiver.recv() => { self.handle_register_network_alert(msg) }, Some(msg) = network_alert_receiver.recv() => { self.handle_notify_network_alert(msg) }, _ = signal_receiver.cancelled() => { - info!("NotifyService received exit signal, exit now"); + debug!("NotifyService received exit signal, exit now"); break; } else => break, diff --git a/sync/src/synchronizer/mod.rs b/sync/src/synchronizer/mod.rs index 7341ce4bc8..b348226560 100644 --- a/sync/src/synchronizer/mod.rs +++ b/sync/src/synchronizer/mod.rs @@ -149,7 +149,7 @@ impl BlockFetchCMD { } } recv(stop_signal) -> _ => { - info!("thread BlockDownload received exit signal, exit now"); + debug!("thread BlockDownload received exit signal, exit now"); return; } } diff --git a/sync/src/tests/synchronizer/functions.rs b/sync/src/tests/synchronizer/functions.rs index bd0a55740c..bbdd902a3d 100644 --- a/sync/src/tests/synchronizer/functions.rs +++ b/sync/src/tests/synchronizer/functions.rs @@ -1226,8 +1226,6 @@ fn test_internal_db_error() { InternalErrorKind::Database.other("mocked db error").into(), )); - faux::when!(chain_controller.try_stop()).then_return(()); - let synchronizer = Synchronizer::new(chain_controller, sync_shared); let status = synchronizer diff --git a/sync/src/types/header_map/mod.rs b/sync/src/types/header_map/mod.rs index 78939164b6..975c7b9075 100644 --- a/sync/src/types/header_map/mod.rs +++ b/sync/src/types/header_map/mod.rs @@ -1,5 +1,5 @@ use ckb_async_runtime::Handle; -use ckb_logger::info; +use ckb_logger::debug; use ckb_stop_handler::{new_tokio_exit_rx, CancellationToken}; use ckb_types::packed::Byte32; use std::sync::Arc; @@ -56,7 +56,7 @@ impl HeaderMap { map.limit_memory(); } _ = stop_rx.cancelled() => { - info!("HeaderMap limit_memory received exit signal, exit now"); + debug!("HeaderMap limit_memory received exit signal, exit now"); break }, } diff --git a/tx-pool/src/chunk_process.rs b/tx-pool/src/chunk_process.rs index b35e547a21..73e4f246eb 100644 --- a/tx-pool/src/chunk_process.rs +++ b/tx-pool/src/chunk_process.rs @@ -4,7 +4,7 @@ use crate::try_or_return_with_snapshot; use crate::{error::Reject, service::TxPoolService}; use ckb_chain_spec::consensus::Consensus; use ckb_error::Error; -use ckb_logger::info; +use ckb_logger::debug; use ckb_snapshot::Snapshot; use ckb_store::data_loader_wrapper::AsDataLoader; use ckb_traits::{CellDataProvider, ExtensionProvider, HeaderProvider}; @@ -75,10 +75,6 @@ impl ChunkProcess { } } }, - _ = self.signal.cancelled() => { - info!("TxPool received exit signal, exit now"); - break - }, _ = interval.tick() => { if matches!(self.current_state, ChunkCommand::Resume) { let stop = self.try_process().await; @@ -87,6 +83,10 @@ impl ChunkProcess { } } }, + _ = self.signal.cancelled() => { + debug!("TxPool received exit signal, exit now"); + break + }, else => break, } } diff --git a/tx-pool/src/process.rs b/tx-pool/src/process.rs index 0013d5cf33..b5062b3b35 100644 --- a/tx-pool/src/process.rs +++ b/tx-pool/src/process.rs @@ -920,6 +920,8 @@ impl TxPoolService { let mut tx_pool = self.tx_pool.write().await; if let Err(err) = tx_pool.save_into_file() { error!("failed to save pool, error: {:?}", err) + } else { + info!("TxPool save successfully") } } diff --git a/tx-pool/src/service.rs b/tx-pool/src/service.rs index f405129201..b11564ea11 100644 --- a/tx-pool/src/service.rs +++ b/tx-pool/src/service.rs @@ -13,8 +13,8 @@ use ckb_chain_spec::consensus::Consensus; use ckb_channel::oneshot; use ckb_error::AnyError; use ckb_jsonrpc_types::BlockTemplate; -use ckb_logger::error; use ckb_logger::info; +use ckb_logger::{debug, error}; use ckb_network::{NetworkController, PeerIndex}; use ckb_snapshot::Snapshot; use ckb_stop_handler::new_tokio_exit_rx; @@ -538,7 +538,7 @@ impl TxPoolServiceBuilder { block_assembler::process(service_clone, &message).await; }, _ = signal_receiver.cancelled() => { - info!("TxPool received exit signal, exit now"); + debug!("TxPool received exit signal, exit now"); break }, else => break, @@ -573,7 +573,7 @@ impl TxPoolServiceBuilder { queue.clear(); } _ = signal_receiver.cancelled() => { - info!("TxPool received exit signal, exit now"); + debug!("TxPool received exit signal, exit now"); break }, else => break, @@ -611,7 +611,7 @@ impl TxPoolServiceBuilder { service.update_block_assembler_after_tx_pool_reorg().await; }, _ = signal_receiver.cancelled() => { - info!("TxPool received exit signal, exit now"); + debug!("TxPool received exit signal, exit now"); break }, else => break, diff --git a/util/indexer/src/service.rs b/util/indexer/src/service.rs index ef8f876aee..bcdc89c7ce 100644 --- a/util/indexer/src/service.rs +++ b/util/indexer/src/service.rs @@ -16,7 +16,7 @@ use ckb_jsonrpc_types::{ IndexerScriptSearchMode, IndexerScriptType, IndexerSearchKey, IndexerTip, IndexerTx, IndexerTxWithCell, IndexerTxWithCells, JsonBytes, Uint32, }; -use ckb_logger::{error, info}; +use ckb_logger::{debug, error, info}; use ckb_notify::NotifyController; use ckb_stop_handler::{new_tokio_exit_rx, CancellationToken}; use ckb_store::ChainStore; @@ -118,7 +118,7 @@ impl IndexerService { } } _ = stop.cancelled() => { - info!("Indexer received exit signal, exit now"); + debug!("Indexer received exit signal, exit now"); break }, else => break, @@ -204,7 +204,7 @@ impl IndexerService { } } _ = stop.cancelled() => { - info!("Indexer received exit signal, exit now"); + debug!("Indexer received exit signal, exit now"); break }, } diff --git a/util/metrics-service/src/lib.rs b/util/metrics-service/src/lib.rs index 1b88171de0..4206a3d0aa 100644 --- a/util/metrics-service/src/lib.rs +++ b/util/metrics-service/src/lib.rs @@ -10,7 +10,7 @@ use hyper::{ use prometheus::Encoder as _; use ckb_async_runtime::Handle; -use ckb_logger::info; +use ckb_logger::debug; use ckb_metrics_config::{Config, Exporter, Target}; use ckb_stop_handler::{new_tokio_exit_rx, CancellationToken}; use ckb_util::strings; @@ -66,7 +66,7 @@ fn run_exporter(exporter: Exporter, handle: &Handle) -> Result<(), String> { .with_graceful_shutdown(async { let exit_rx: CancellationToken = new_tokio_exit_rx(); exit_rx.cancelled().await; - info!("prometheus server received exit signal, exit now"); + debug!("prometheus server received exit signal, exit now"); }); if let Err(err) = server.await { ckb_logger::error!("prometheus server error: {}", err); diff --git a/util/stop-handler/src/stop_register.rs b/util/stop-handler/src/stop_register.rs index e496866383..8948217c19 100644 --- a/util/stop-handler/src/stop_register.rs +++ b/util/stop-handler/src/stop_register.rs @@ -1,5 +1,5 @@ use ckb_channel::TrySendError; -use ckb_logger::{error, info, trace, warn}; +use ckb_logger::{debug, error, info, trace, warn}; use ckb_util::Mutex; use tokio_util::sync::CancellationToken; @@ -12,19 +12,19 @@ pub fn wait_all_ckb_services_exit() { info!("waiting exit signal..."); let exit_signal = new_crossbeam_exit_rx(); let _ = exit_signal.recv(); - info!("received exit signal, broadcasting exit signal to all threads"); + debug!("received exit signal, broadcasting exit signal to all threads"); let mut handles = CKB_HANDLES.lock(); for (name, join_handle) in handles.thread_handles.drain(..) { match join_handle.join() { Ok(_) => { - info!("wait thread {} done", name); + debug!("wait thread {} done", name); } Err(e) => { warn!("wait thread {}: ERROR: {:?}", name, e) } } } - info!("all ckb threads have been stopped"); + debug!("all ckb threads have been stopped"); } static CKB_HANDLES: once_cell::sync::Lazy> = From c4aca9ad3a5660b4c65c39b10388d124bbba0692 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 12 Jul 2023 09:59:50 +0800 Subject: [PATCH 048/125] Add exit handler for `ckb miner` --- ckb-bin/src/subcommand/miner.rs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ckb-bin/src/subcommand/miner.rs b/ckb-bin/src/subcommand/miner.rs index fd9a892abc..0bc7312e42 100644 --- a/ckb-bin/src/subcommand/miner.rs +++ b/ckb-bin/src/subcommand/miner.rs @@ -1,8 +1,11 @@ use ckb_app_config::{ExitCode, MinerArgs, MinerConfig}; use ckb_async_runtime::Handle; use ckb_channel::unbounded; +use ckb_logger::info; use ckb_miner::{Client, Miner}; -use ckb_stop_handler::{new_crossbeam_exit_rx, register_thread, wait_all_ckb_services_exit}; +use ckb_stop_handler::{ + broadcast_exit_signals, new_crossbeam_exit_rx, register_thread, wait_all_ckb_services_exit, +}; use std::thread; pub fn miner(args: MinerArgs, async_handle: Handle) -> Result<(), ExitCode> { @@ -30,6 +33,12 @@ pub fn miner(args: MinerArgs, async_handle: Handle) -> Result<(), ExitCode> { .expect("Start client failed!"); register_thread(THREAD_NAME, miner_jh); + ctrlc::set_handler(|| { + info!("Trapped exit signal, exiting..."); + broadcast_exit_signals(); + }) + .expect("Error setting Ctrl-C handler"); + wait_all_ckb_services_exit(); Ok(()) From ba6a5dfe9499cf23fe3720261413c8daf2e915e8 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 12 Jul 2023 10:45:47 +0800 Subject: [PATCH 049/125] Add bats test for graceful shutdown Signed-off-by: Eval EXEC --- util/app-config/src/tests/ckb_run_replay.bats | 2 +- util/app-config/src/tests/cli_test.sh | 4 +- .../src/tests/graceful_shutdown.bats | 45 +++++++++++++++++++ 3 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 util/app-config/src/tests/graceful_shutdown.bats diff --git a/util/app-config/src/tests/ckb_run_replay.bats b/util/app-config/src/tests/ckb_run_replay.bats index dc9f87ef18..c6943eeb5b 100644 --- a/util/app-config/src/tests/ckb_run_replay.bats +++ b/util/app-config/src/tests/ckb_run_replay.bats @@ -24,7 +24,7 @@ function ckb_run { #@test run _ckb_run [ "$status" -eq 0 ] # assert_output --regexp "ckb_chain::chain.*block number:.*, hash:.*, size:.*, cycles:.*" - assert_output --regexp "ckb_bin all tokio tasks have been stopped" + assert_output --regexp "ckb_bin ckb shutdown" } function ckb_replay { #@test diff --git a/util/app-config/src/tests/cli_test.sh b/util/app-config/src/tests/cli_test.sh index 56e30dbab8..707b2b1dea 100755 --- a/util/app-config/src/tests/cli_test.sh +++ b/util/app-config/src/tests/cli_test.sh @@ -38,7 +38,7 @@ bash ${CKB_BATS_CORE_DIR}/bats-assert/load.bash cd ${CKB_BATS_TESTBED} -./ckb init --force && ./ckb import ckb_mainnet_4000.json +./ckb init --force && sed -i 's/filter = "info"/filter = "debug"/g' ckb.toml && ./ckb import ckb_mainnet_4000.json export PATH=${CKB_BATS_TESTBED}:/tmp/ckb_bats_bin/tmp_install/bin:${PATH} export BATS_LIB_PATH=${CKB_BATS_CORE_DIR} @@ -47,7 +47,7 @@ export TMP_DIR=${CKB_BATS_TESTBED}/tmp_dir mkdir ${TMP_DIR} for bats_cases in *.bats; do - bats --trace "$bats_cases" + bats "$bats_cases" ret=$? if [ "$ret" -ne "0" ]; then exit "$ret" diff --git a/util/app-config/src/tests/graceful_shutdown.bats b/util/app-config/src/tests/graceful_shutdown.bats new file mode 100644 index 0000000000..eb906c3949 --- /dev/null +++ b/util/app-config/src/tests/graceful_shutdown.bats @@ -0,0 +1,45 @@ +#!/usr/bin/env bats +bats_load_library 'bats-assert' +bats_load_library 'bats-support' + +_ckb_graceful_shutdown() { + ckb run -C ${CKB_DIRNAME} &> ${TMP_DIR}/ckb_run.log & + PID=$! + sleep 10 + kill ${PID} + + while kill -0 ${PID}; do + echo "waiting for ckb to exit" + sleep 1 + done + + tail -n 500 ${TMP_DIR}/ckb_run.log +} + +function ckb_graceful_shutdown { #@test + run _ckb_graceful_shutdown + + [ "$status" -eq 0 ] + assert_output --regexp "INFO ckb_bin::subcommand::run Trapped exit signal, exiting..." + assert_output --regexp "DEBUG ckb_stop_handler::stop_register received exit signal, broadcasting exit signal to all threads" + assert_output --regexp "DEBUG ckb_tx_pool::chunk_process TxPool received exit signal, exit now" + assert_output --regexp "DEBUG ckb_sync::types::header_map HeaderMap limit_memory received exit signal, exit now" + assert_output --regexp "DEBUG ckb_chain::chain ChainService received exit signal, exit now" + assert_output --regexp "DEBUG ckb_sync::synchronizer thread BlockDownload received exit signal, exit now" + assert_output --regexp "DEBUG ckb_network::network NetworkService receive exit signal, start shutdown..." + assert_output --regexp "INFO ckb_tx_pool::service TxPool is saving, please wait..." + assert_output --regexp "DEBUG ckb_tx_pool::service TxPool received exit signal, exit now" + assert_output --regexp "DEBUG ckb_block_filter::filter BlockFilter received exit signal, exit now" + assert_output --regexp "DEBUG ckb_network::services::dump_peer_store dump peer store before exit" + assert_output --regexp "DEBUG ckb_notify NotifyService received exit signal, exit now" + assert_output --regexp "DEBUG ckb_stop_handler::stop_register wait thread ChainService done" + assert_output --regexp "DEBUG ckb_stop_handler::stop_register wait thread BlockDownload done" + assert_output --regexp "DEBUG ckb_stop_handler::stop_register all ckb threads have been stopped" + assert_output --regexp "DEBUG ckb_bin waiting all tokio tasks done" + assert_output --regexp "INFO ckb_tx_pool::process TxPool save successfully" + assert_output --regexp "INFO ckb_bin ckb shutdown" +} + +teardown_file() { + rm -f ${TMP_DIR}/ckb_run.log +} From 6936766f529bc0edbcf385a8021a2cd7a5271a26 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Tue, 18 Jul 2023 16:12:23 +0800 Subject: [PATCH 050/125] fix: set `TxPoolService.started` to `true` before `tx_pool_controller.load_persisted_data` --- tx-pool/src/service.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tx-pool/src/service.rs b/tx-pool/src/service.rs index b11564ea11..5dc54018b4 100644 --- a/tx-pool/src/service.rs +++ b/tx-pool/src/service.rs @@ -618,10 +618,10 @@ impl TxPoolServiceBuilder { } } }); + self.started.store(true, Ordering::Relaxed); if let Err(err) = self.tx_pool_controller.load_persisted_data(txs) { error!("Failed to import persisted txs, cause: {}", err); } - self.started.store(true, Ordering::Relaxed); } } From 437f13daa59acb9c89aad23778172e348b068a72 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Tue, 18 Jul 2023 17:42:34 +0800 Subject: [PATCH 051/125] Add `winapi` dep to `dev-dependencies` --- Cargo.lock | 1 + util/stop-handler/Cargo.toml | 1 + 2 files changed, 2 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 4011129135..96c6bb6469 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1292,6 +1292,7 @@ dependencies = [ "rand 0.8.5", "tokio", "tokio-util 0.7.8", + "winapi 0.3.9", ] [[package]] diff --git a/util/stop-handler/Cargo.toml b/util/stop-handler/Cargo.toml index 2245ddfdcf..62da631172 100644 --- a/util/stop-handler/Cargo.toml +++ b/util/stop-handler/Cargo.toml @@ -21,4 +21,5 @@ tokio-util = "0.7.8" [dev-dependencies] ctrlc = { version = "3.1", features = ["termination"] } libc = "0.2" +winapi = "0.3.9" rand = "0.8.5" From 142e4bf21424d8d1b0deea9e3c9683f86bd019e3 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Tue, 18 Jul 2023 17:43:04 +0800 Subject: [PATCH 052/125] Fix unit test: handle windows platform for signal-handle Signed-off-by: Eval EXEC --- util/stop-handler/src/tests.rs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/util/stop-handler/src/tests.rs b/util/stop-handler/src/tests.rs index 3141512bb7..099aa32b90 100644 --- a/util/stop-handler/src/tests.rs +++ b/util/stop-handler/src/tests.rs @@ -13,7 +13,18 @@ use tokio_util::sync::CancellationToken; fn send_ctrlc_later(duration: Duration) { std::thread::spawn(move || { std::thread::sleep(duration); - // send SIGINT to myself + + // send CTRL_C event to myself on windows platform + #[cfg(windows)] + { + let pid = std::process::id(); + unsafe { + winapi::um::wincon::GenerateConsoleCtrlEvent(winapi::um::wincon::CTRL_C_EVENT, pid); + } + } + + // send SIGINT to myself on Linux and MacOS platform + #[cfg(not(windows))] unsafe { libc::raise(libc::SIGINT); println!("[ $$ sent SIGINT to myself $$ ]"); From e019245e70d488fd72585e55485fe53200f753f6 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Mon, 17 Jul 2023 11:17:52 +0800 Subject: [PATCH 053/125] docs: Fix `PendingCompactBlockMap` comment --- sync/src/types/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sync/src/types/mod.rs b/sync/src/types/mod.rs index d00fcf137a..73ce7935d0 100644 --- a/sync/src/types/mod.rs +++ b/sync/src/types/mod.rs @@ -1269,7 +1269,7 @@ fn get_skip_height(height: BlockNumber) -> BlockNumber { } } -// , timestamp)> +// , Vec)>, timestamp)> pub(crate) type PendingCompactBlockMap = HashMap< Byte32, ( From 9019a454994d1f1dd0bfbdf5f234b5ad507e263d Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Tue, 18 Jul 2023 22:40:11 +0800 Subject: [PATCH 054/125] Remove stop-handler unit test for Windows platform --- Cargo.lock | 1 - util/stop-handler/Cargo.toml | 1 - util/stop-handler/src/lib.rs | 3 ++- util/stop-handler/src/tests.rs | 11 +---------- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 96c6bb6469..4011129135 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1292,7 +1292,6 @@ dependencies = [ "rand 0.8.5", "tokio", "tokio-util 0.7.8", - "winapi 0.3.9", ] [[package]] diff --git a/util/stop-handler/Cargo.toml b/util/stop-handler/Cargo.toml index 62da631172..2245ddfdcf 100644 --- a/util/stop-handler/Cargo.toml +++ b/util/stop-handler/Cargo.toml @@ -21,5 +21,4 @@ tokio-util = "0.7.8" [dev-dependencies] ctrlc = { version = "3.1", features = ["termination"] } libc = "0.2" -winapi = "0.3.9" rand = "0.8.5" diff --git a/util/stop-handler/src/lib.rs b/util/stop-handler/src/lib.rs index fe80839dd3..48309b03e5 100644 --- a/util/stop-handler/src/lib.rs +++ b/util/stop-handler/src/lib.rs @@ -8,5 +8,6 @@ pub use stop_register::{ pub use tokio_util::sync::CancellationToken; mod stop_register; -#[cfg(test)] + +#[cfg(all(test, unix))] mod tests; diff --git a/util/stop-handler/src/tests.rs b/util/stop-handler/src/tests.rs index 099aa32b90..f45c200a83 100644 --- a/util/stop-handler/src/tests.rs +++ b/util/stop-handler/src/tests.rs @@ -14,17 +14,7 @@ fn send_ctrlc_later(duration: Duration) { std::thread::spawn(move || { std::thread::sleep(duration); - // send CTRL_C event to myself on windows platform - #[cfg(windows)] - { - let pid = std::process::id(); - unsafe { - winapi::um::wincon::GenerateConsoleCtrlEvent(winapi::um::wincon::CTRL_C_EVENT, pid); - } - } - // send SIGINT to myself on Linux and MacOS platform - #[cfg(not(windows))] unsafe { libc::raise(libc::SIGINT); println!("[ $$ sent SIGINT to myself $$ ]"); @@ -120,6 +110,7 @@ impl TestStopMemo { } } } + #[test] fn basic() { let (mut handle, mut stop_recv, _runtime) = new_global_runtime(); From 75b05b296f799e05fe1129e633b7c1f80cbe35a9 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Tue, 18 Jul 2023 18:54:56 +0800 Subject: [PATCH 055/125] docs: note the `send_transaction` is asynchronous --- rpc/src/module/pool.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rpc/src/module/pool.rs b/rpc/src/module/pool.rs index d2832c734b..dfd4d9531d 100644 --- a/rpc/src/module/pool.rs +++ b/rpc/src/module/pool.rs @@ -16,6 +16,10 @@ pub trait PoolRpc { /// Submits a new transaction into the transaction pool. If the transaction is already in the /// pool, rebroadcast it to peers. /// + /// Please note that `send_transaction` is an asynchronous process. + /// The return of `send_transaction` does NOT indicate that the transaction have been fully verified. + /// If you want to track the status of the transaction, please use the `get_transaction`rpc. + /// /// ## Params /// /// * `transaction` - The transaction. From ed2fb5fc6bec2ed2010bbe3510dd4357c02dbcf5 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Tue, 18 Jul 2023 18:55:28 +0800 Subject: [PATCH 056/125] docs: re-execute `make gen-rpc-doc` Signed-off-by: Eval EXEC --- rpc/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rpc/README.md b/rpc/README.md index 166d922b30..6db0bf3d40 100644 --- a/rpc/README.md +++ b/rpc/README.md @@ -4343,6 +4343,8 @@ RPC Module Pool for transaction memory pool. Submits a new transaction into the transaction pool. If the transaction is already in the pool, rebroadcast it to peers. +Please note that `send_transaction` is an asynchronous process. The return of `send_transaction` does NOT indicate that the transaction have been fully verified. If you want to track the status of the transaction, please use the `get_transaction`rpc. + ###### Params * `transaction` - The transaction. From 379b7adecf27df39a9ec600327a919328ab178bd Mon Sep 17 00:00:00 2001 From: yukang Date: Tue, 18 Jul 2023 19:20:45 +0800 Subject: [PATCH 057/125] terminate process when nonce limit reached --- miner/src/miner.rs | 4 +++- util/stop-handler/src/stop_register.rs | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/miner/src/miner.rs b/miner/src/miner.rs index 110fad5514..101f156b4d 100644 --- a/miner/src/miner.rs +++ b/miner/src/miner.rs @@ -5,6 +5,7 @@ use ckb_app_config::MinerWorkerConfig; use ckb_channel::{select, unbounded, Receiver}; use ckb_logger::{debug, error, info}; use ckb_pow::PowEngine; +use ckb_stop_handler::broadcast_exit_signals; use ckb_types::{ packed::{Byte32, Header}, prelude::*, @@ -94,7 +95,8 @@ impl Miner { Ok((pow_hash, work, nonce)) => { self.submit_nonce(pow_hash, work, nonce); if self.limit != 0 && self.nonces_found >= self.limit { - break; + debug!("miner nonce limit reached, terminate ..."); + broadcast_exit_signals(); } }, _ => { diff --git a/util/stop-handler/src/stop_register.rs b/util/stop-handler/src/stop_register.rs index 8948217c19..d7f2a7f560 100644 --- a/util/stop-handler/src/stop_register.rs +++ b/util/stop-handler/src/stop_register.rs @@ -12,8 +12,8 @@ pub fn wait_all_ckb_services_exit() { info!("waiting exit signal..."); let exit_signal = new_crossbeam_exit_rx(); let _ = exit_signal.recv(); - debug!("received exit signal, broadcasting exit signal to all threads"); let mut handles = CKB_HANDLES.lock(); + debug!("wait_all_ckb_services_exit wait all threads to exit"); for (name, join_handle) in handles.thread_handles.drain(..) { match join_handle.join() { Ok(_) => { @@ -54,6 +54,7 @@ pub fn new_crossbeam_exit_rx() -> ckb_channel::Receiver<()> { /// Broadcast exit signals to all threads and all tokio tasks pub fn broadcast_exit_signals() { + debug!("received exit signal, broadcasting exit signal to all threads"); TOKIO_EXIT.cancel(); CROSSBEAM_EXIT_SENDERS .lock() From 26764cefa15a1425cddb498680400a04f35b9c39 Mon Sep 17 00:00:00 2001 From: mohanson Date: Fri, 21 Jul 2023 13:35:26 +0800 Subject: [PATCH 058/125] Update ckb-vm to v0.24.4 --- Cargo.lock | 11 +++++++---- script/Cargo.toml | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4011129135..3503b236b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1528,9 +1528,9 @@ dependencies = [ [[package]] name = "ckb-vm" -version = "0.24.3" +version = "0.24.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f5747a877a71ff164fa0f17daf6e9abca036c2381b8576679fb3ac07ae77bbc" +checksum = "40894adbde925bfc6584d324a06228e19d78bd877146fc7df085927552d29f50" dependencies = [ "byteorder", "bytes 1.4.0", @@ -1546,9 +1546,12 @@ dependencies = [ [[package]] name = "ckb-vm-definitions" -version = "0.24.3" +version = "0.24.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83869c9d322de1ddbfde5b54b7376f9a1ac32273c50e21cdd5e8a1bd1a1cf632" +checksum = "0253bdea8dc20db90b58fe54e01392f71989e0567d42e09e7f8e588f156551db" +dependencies = [ + "paste", +] [[package]] name = "clang-sys" diff --git a/script/Cargo.toml b/script/Cargo.toml index 708bd6fc58..da018ecfdb 100644 --- a/script/Cargo.toml +++ b/script/Cargo.toml @@ -22,7 +22,7 @@ ckb-traits = { path = "../traits", version = "= 0.111.0-rc8" } byteorder = "1.3.1" ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc8" } -ckb-vm = { version = "=0.24.3", default-features = false } +ckb-vm = { version = "=0.24.4", default-features = false } faster-hex = "0.6" ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8", optional = true } serde = { version = "1.0", features = ["derive"] } From 932834b17b5069000d2e91edd7ccf7571762f1e6 Mon Sep 17 00:00:00 2001 From: zhangsoledad <787953403@qq.com> Date: Fri, 28 Jul 2023 10:29:55 +0800 Subject: [PATCH 059/125] chore: light client activation parameters --- spec/src/consensus.rs | 2 +- spec/src/lib.rs | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/spec/src/consensus.rs b/spec/src/consensus.rs index 40dcec7449..4f39d87a77 100644 --- a/spec/src/consensus.rs +++ b/spec/src/consensus.rs @@ -92,7 +92,7 @@ pub(crate) const SATOSHI_PUBKEY_HASH: H160 = h160!("0x62e907b15cbf27d5425399ebf6 // only affects genesis cellbase's satoshi lock cells. pub(crate) const SATOSHI_CELL_OCCUPIED_RATIO: Ratio = Ratio::new(6, 10); -// pub(crate) const MAINNET_ACTIVATION_THRESHOLD: Ratio = Ratio::new(9, 10); +pub(crate) const LC_MAINNET_ACTIVATION_THRESHOLD: Ratio = Ratio::new(8, 10); pub(crate) const TESTNET_ACTIVATION_THRESHOLD: Ratio = Ratio::new(3, 4); /// The struct represent CKB two-step-transaction-confirmation params diff --git a/spec/src/lib.rs b/spec/src/lib.rs index 40f8560b2e..c08eb123e3 100644 --- a/spec/src/lib.rs +++ b/spec/src/lib.rs @@ -12,8 +12,8 @@ use crate::consensus::{ build_genesis_dao_data, build_genesis_epoch_ext, Consensus, ConsensusBuilder, - SATOSHI_CELL_OCCUPIED_RATIO, SATOSHI_PUBKEY_HASH, TESTNET_ACTIVATION_THRESHOLD, - TYPE_ID_CODE_HASH, + LC_MAINNET_ACTIVATION_THRESHOLD, SATOSHI_CELL_OCCUPIED_RATIO, SATOSHI_PUBKEY_HASH, + TESTNET_ACTIVATION_THRESHOLD, TYPE_ID_CODE_HASH, }; use crate::versionbits::{ActiveMode, Deployment, DeploymentPos}; use ckb_constant::hardfork::{mainnet, testnet}; @@ -506,7 +506,20 @@ impl ChainSpec { fn softfork_deployments(&self) -> Option> { match self.name.as_str() { - mainnet::CHAIN_SPEC_NAME => None, + mainnet::CHAIN_SPEC_NAME => { + let mut deployments = HashMap::new(); + let light_client = Deployment { + bit: 1, + start: 8_282, // 2023/09/01 00:00:00 utc + timeout: 8_552, // 8_282 + 270 + min_activation_epoch: 8_648, // 2023/11/01 00:00:00 utc + period: 42, + active_mode: ActiveMode::Normal, + threshold: LC_MAINNET_ACTIVATION_THRESHOLD, + }; + deployments.insert(DeploymentPos::LightClient, light_client); + Some(deployments) + } testnet::CHAIN_SPEC_NAME => { let mut deployments = HashMap::new(); let light_client = Deployment { From 769b681dac62b0de5bc76080be0c24b842a7f1dc Mon Sep 17 00:00:00 2001 From: yukang Date: Wed, 2 Aug 2023 12:21:21 +0800 Subject: [PATCH 060/125] add ctrl hander for test main --- test/Cargo.toml | 1 + test/src/main.rs | 36 ++++++++++++++++++++++++++++++++---- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/test/Cargo.toml b/test/Cargo.toml index d3ec359d14..57263cb189 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -37,6 +37,7 @@ serde_json = "1.0" lazy_static = "1.4.0" byteorder = "1.3.1" jsonrpc-core = "18.0" +ctrlc = { version = "3.1", features = ["termination"] } [target.'cfg(not(target_os="windows"))'.dependencies] nix = { version = "0.24.0", default-features = false, features = ["signal"] } diff --git a/test/src/main.rs b/test/src/main.rs index 0ef0feafff..227e2c0b0d 100644 --- a/test/src/main.rs +++ b/test/src/main.rs @@ -12,6 +12,7 @@ use clap::{App, Arg}; use rand::{seq::SliceRandom, thread_rng}; use std::any::Any; use std::cmp::min; +use std::collections::HashSet; use std::env; use std::fs::{self, read_to_string, File}; use std::io::{self, BufRead, BufReader, Write}; @@ -113,6 +114,8 @@ fn main() { info!("max time: {:?}", max_time); let specs = filter_specs(all_specs(), spec_names_to_run); + let running_spec_names = Arc::new(Mutex::new(HashSet::new())); + let total = specs.len(); let worker_count = min(worker_count, total); let specs = Arc::new(Mutex::new(specs)); @@ -122,6 +125,22 @@ fn main() { let (notify_tx, notify_rx) = unbounded(); + let cloned_running_names = running_spec_names.clone(); + ctrlc::set_handler(move || { + std::thread::sleep(Duration::from_secs(1)); + warn!( + "Total {} specs are not finished", + cloned_running_names.lock().len() + ); + for name in cloned_running_names.lock().iter() { + warn!("spec {} is still not finished", name); + } + // sleep 1 second to wait for the log flush + std::thread::sleep(Duration::from_secs(1)); + std::process::exit(1); + }) + .expect("Error setting Ctrl-C handler"); + info!("start {} workers...", worker_count); let mut workers = Workers::new(worker_count, Arc::clone(&specs), notify_tx, start_port); workers.start(); @@ -148,6 +167,7 @@ fn main() { match msg { Notify::Start { spec_name } => { info!("[{}] Start executing", spec_name); + running_spec_names.lock().insert(spec_name); } Notify::Error { spec_error, @@ -166,6 +186,7 @@ fn main() { workers.shutdown(); worker_running -= 1; } + running_spec_names.lock().remove(&spec_name); spec_errors.push(Some(spec_error)); if verbose { info!("[{}] Error", spec_name); @@ -189,6 +210,7 @@ fn main() { worker_running -= 1; } spec_errors.push(None); + running_spec_names.lock().remove(&spec_name); if verbose { info!("[{}] Panic", spec_name); print_panicked_logs(&node_log_paths); @@ -204,6 +226,7 @@ fn main() { status: TestResultStatus::Passed, duration: seconds, }); + running_spec_names.lock().remove(&spec_name); done_specs += 1; info!( "{}/{} .............. [{}] Done in {} seconds", @@ -222,6 +245,7 @@ fn main() { } } } + // join all workers threads workers.join_all(); @@ -294,8 +318,12 @@ fn clap_app() -> App<'static> { .value_name("SECONDS") .help("Exit when total running time exceeds this limit"), ) - .arg(Arg::with_name("list-specs").long("list-specs")) - .arg(Arg::with_name("specs").multiple(true)) + .arg( + Arg::with_name("list-specs") + .long("list-specs") + .help("list all specs"), + ) + .arg(Arg::with_name("specs").multiple(true).help("Specs to run")) .arg( Arg::with_name("concurrent") .short('c') @@ -626,13 +654,13 @@ fn log_failed_specs(error_spec_names: &[String]) -> Result<(), io::Error> { fn print_results(mut test_results: Vec) { println!("{}", "-".repeat(20)); - println!("{:50} | {:10} | {:10}", "TEST", "STATUS", "DURATION"); + println!("{:65} | {:10} | {:10}", "TEST", "STATUS", "DURATION"); test_results.sort_by(|a, b| (&a.status, a.duration).cmp(&(&b.status, b.duration))); for result in test_results.iter() { println!( - "{:50} | {:10} | {:<10}", + "{:65} | {:10} | {:<10}", result.spec_name, format!("{:?}", result.status), format!("{} s", result.duration), From ff0e470b014958ecf991ff39c19e6ac74664fa42 Mon Sep 17 00:00:00 2001 From: yukang Date: Wed, 2 Aug 2023 12:25:10 +0800 Subject: [PATCH 061/125] fix the timeout issue in integeration main --- devtools/ci/ci_main.sh | 2 +- test/src/main.rs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/devtools/ci/ci_main.sh b/devtools/ci/ci_main.sh index c48a7382c6..377da7e939 100755 --- a/devtools/ci/ci_main.sh +++ b/devtools/ci/ci_main.sh @@ -51,7 +51,7 @@ case $GITHUB_WORKFLOW in if [[ $github_workflow_os == 'macos' ]]; then export CKB_FEATURES="deadlock_detection,with_sentry,portable" fi - make CKB_TEST_SEC_COEFFICIENT=5 CKB_TEST_ARGS="-c 4 --no-report" integration + make CKB_TEST_SEC_COEFFICIENT=5 CKB_TEST_ARGS="-c 4 --no-report --max-time 3600 " integration ;; ci_quick_checks*) echo "ci_quick_check" diff --git a/test/src/main.rs b/test/src/main.rs index 227e2c0b0d..f650e7ab35 100644 --- a/test/src/main.rs +++ b/test/src/main.rs @@ -125,7 +125,7 @@ fn main() { let (notify_tx, notify_rx) = unbounded(); - let cloned_running_names = running_spec_names.clone(); + let cloned_running_names = Arc::clone(&running_spec_names); ctrlc::set_handler(move || { std::thread::sleep(Duration::from_secs(1)); warn!( @@ -153,6 +153,7 @@ fn main() { if max_time > 0 && start_time.elapsed().as_secs() > max_time { // shutdown, specs running to long workers.shutdown(); + break; } let msg = match notify_rx.recv_timeout(Duration::from_secs(5)) { From 565d382cb82e019de106ecc46daaf36cf9311f90 Mon Sep 17 00:00:00 2001 From: yukang Date: Wed, 2 Aug 2023 14:38:14 +0800 Subject: [PATCH 062/125] node start will not panic when child process crashed --- test/Cargo.toml | 1 + test/src/main.rs | 3 +-- test/src/node.rs | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test/Cargo.toml b/test/Cargo.toml index 57263cb189..283eb30871 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -38,6 +38,7 @@ lazy_static = "1.4.0" byteorder = "1.3.1" jsonrpc-core = "18.0" ctrlc = { version = "3.1", features = ["termination"] } +log = "0.4" [target.'cfg(not(target_os="windows"))'.dependencies] nix = { version = "0.24.0", default-features = false, features = ["signal"] } diff --git a/test/src/main.rs b/test/src/main.rs index f650e7ab35..02e09c809b 100644 --- a/test/src/main.rs +++ b/test/src/main.rs @@ -135,8 +135,7 @@ fn main() { for name in cloned_running_names.lock().iter() { warn!("spec {} is still not finished", name); } - // sleep 1 second to wait for the log flush - std::thread::sleep(Duration::from_secs(1)); + log::logger().flush(); std::process::exit(1); }) .expect("Error setting Ctrl-C handler"); diff --git a/test/src/node.rs b/test/src/node.rs index 50a8c8f21d..168370bcaa 100644 --- a/test/src/node.rs +++ b/test/src/node.rs @@ -22,7 +22,7 @@ use std::collections::HashSet; use std::convert::Into; use std::fs; use std::path::PathBuf; -use std::process::{self, Child, Command, Stdio}; +use std::process::{Child, Command, Stdio}; use std::thread::sleep; use std::time::{Duration, Instant}; @@ -609,7 +609,8 @@ impl Node { status, self.log_path().display() ); - process::exit(status.code().unwrap()); + // parent process will exit + return; } Err(error) => { error!( @@ -617,7 +618,7 @@ impl Node { error, self.log_path().display() ); - process::exit(255); + return; } } }; From 0dfb57f9774bf81091e29b786f0c2c1284707c71 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Fri, 4 Aug 2023 09:07:06 +0800 Subject: [PATCH 063/125] Increase integration CI timeout to 2 hours --- devtools/ci/ci_main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devtools/ci/ci_main.sh b/devtools/ci/ci_main.sh index 377da7e939..25623ed7f9 100755 --- a/devtools/ci/ci_main.sh +++ b/devtools/ci/ci_main.sh @@ -51,7 +51,7 @@ case $GITHUB_WORKFLOW in if [[ $github_workflow_os == 'macos' ]]; then export CKB_FEATURES="deadlock_detection,with_sentry,portable" fi - make CKB_TEST_SEC_COEFFICIENT=5 CKB_TEST_ARGS="-c 4 --no-report --max-time 3600 " integration + make CKB_TEST_SEC_COEFFICIENT=5 CKB_TEST_ARGS="-c 4 --no-report --max-time 7200 " integration ;; ci_quick_checks*) echo "ci_quick_check" From a4468af160276ab0e91d67ee927347214b9e97cd Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Fri, 4 Aug 2023 09:17:48 +0800 Subject: [PATCH 064/125] Print node Spec name when killed the node --- test/src/node.rs | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/test/src/node.rs b/test/src/node.rs index 168370bcaa..143367a148 100644 --- a/test/src/node.rs +++ b/test/src/node.rs @@ -27,6 +27,7 @@ use std::thread::sleep; use std::time::{Duration, Instant}; struct ProcessGuard { + pub name: String, pub child: Child, pub killed: bool, } @@ -35,8 +36,8 @@ impl Drop for ProcessGuard { fn drop(&mut self) { if !self.killed { match self.child.kill() { - Err(e) => error!("Could not kill ckb process: {}", e), - Ok(_) => debug!("Successfully killed ckb process"), + Err(e) => error!("Could not kill ckb process ({}): {}", self.name, e), + Ok(_) => debug!("Successfully killed ckb process ({})", self.name), } let _ = self.child.wait(); } @@ -44,6 +45,7 @@ impl Drop for ProcessGuard { } pub struct Node { + spec_node_name: String, working_dir: PathBuf, consensus: Consensus, p2p_listen: String, @@ -74,8 +76,9 @@ impl Node { .unwrap_or_else(|_| panic!("cp {:?} {}", src.display(), dest.display())); } + let spec_node_name = format!("{}_{}", spec_name, node_name); // Allocate rpc port and p2p port, and fill into app config - let mut node = Self::init(working_dir); + let mut node = Self::init(working_dir, spec_node_name); node.modify_app_config(|app_config| { let rpc_port = find_available_port(); let p2p_port = find_available_port(); @@ -99,7 +102,7 @@ impl Node { modifier(&mut app_config); fs::write(&app_config_path, toml::to_string(&app_config).unwrap()).unwrap(); - *self = Self::init(self.working_dir()); + *self = Self::init(self.working_dir(), self.spec_node_name.clone()); } pub fn modify_chain_spec(&mut self, modifier: M) @@ -112,11 +115,11 @@ impl Node { modifier(&mut chain_spec); fs::write(&chain_spec_path, toml::to_string(&chain_spec).unwrap()).unwrap(); - *self = Self::init(self.working_dir()); + *self = Self::init(self.working_dir(), self.spec_node_name.clone()); } // Initialize Node instance based on working directory - fn init(working_dir: PathBuf) -> Self { + fn init(working_dir: PathBuf, spec_node_name: String) -> Self { let app_config = { let app_config_path = working_dir.join("ckb.toml"); let toml = fs::read(app_config_path).unwrap(); @@ -144,6 +147,7 @@ impl Node { chain_spec.build_consensus().unwrap() }; Self { + spec_node_name, working_dir, consensus, p2p_listen, @@ -626,6 +630,7 @@ impl Node { self.wait_tx_pool_ready(); self.guard = Some(ProcessGuard { + name: self.spec_node_name.clone(), child: child_process, killed: false, }); From 5f933965e2a0cfe7d2005bc9939f4868866e14d1 Mon Sep 17 00:00:00 2001 From: zhangsoledad <787953403@qq.com> Date: Wed, 9 Aug 2023 16:49:56 +0800 Subject: [PATCH 065/125] fix: data2 value --- rpc/README.md | 4 +- util/jsonrpc-types/src/blockchain.rs | 10 +- util/types/src/core/blockchain.rs | 13 +- util/types/src/core/tests/blockchain.rs | 4 +- util/types/src/extension/tests/check_data.rs | 133 ++++++++++--------- 5 files changed, 92 insertions(+), 72 deletions(-) diff --git a/rpc/README.md b/rpc/README.md index 6db0bf3d40..35de2c0e32 100644 --- a/rpc/README.md +++ b/rpc/README.md @@ -6681,10 +6681,12 @@ Describes the lock script and type script for a cell. Specifies how the script `code_hash` is used to match the script code and how to run the code. -Allowed kinds: “data”, “type” and “data1”. +Allowed kinds: “data”, “type”, “data1” and “data2” Refer to the section [Code Locating](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0022-transaction-structure/0022-transaction-structure.md#code-locating) and [Upgradable Script](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0022-transaction-structure/0022-transaction-structure.md#upgradable-script) in the RFC *CKB Transaction Structure*. +The hash type is split into the high 7 bits and the low 1 bit, when the low 1 bit is 1, it indicates the type, when the low 1 bit is 0, it indicates the data, and then it relies on the high 7 bits to indicate that the data actually corresponds to the version. + `ScriptHashType` is equivalent to `"data" | "type" | "data1" | "data2"`. * Type “data” matches script code via cell data hash, and run the script code in v0 CKB VM. diff --git a/util/jsonrpc-types/src/blockchain.rs b/util/jsonrpc-types/src/blockchain.rs index 8acaf95ce7..2df38a7959 100644 --- a/util/jsonrpc-types/src/blockchain.rs +++ b/util/jsonrpc-types/src/blockchain.rs @@ -13,11 +13,17 @@ use std::fmt; /// Specifies how the script `code_hash` is used to match the script code and how to run the code. /// -/// Allowed kinds: "data", "type" and "data1". +/// Allowed kinds: "data", "type", "data1" and “data2” /// /// Refer to the section [Code Locating](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0022-transaction-structure/0022-transaction-structure.md#code-locating) /// and [Upgradable Script](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0022-transaction-structure/0022-transaction-structure.md#upgradable-script) /// in the RFC *CKB Transaction Structure*. +/// +/// The hash type is split into the high 7 bits and the low 1 bit, +/// when the low 1 bit is 1, it indicates the type, +/// when the low 1 bit is 0, it indicates the data, +/// and then it relies on the high 7 bits to indicate +/// that the data actually corresponds to the version. #[derive(Clone, Serialize, Deserialize, PartialEq, Eq, Hash, Debug)] #[serde(rename_all = "snake_case")] pub enum ScriptHashType { @@ -28,7 +34,7 @@ pub enum ScriptHashType { /// Type "data1" matches script code via cell data hash, and run the script code in v1 CKB VM. Data1 = 2, /// Type "data2" matches script code via cell data hash, and run the script code in v2 CKB VM. - Data2 = 3, + Data2 = 4, } impl Default for ScriptHashType { diff --git a/util/types/src/core/blockchain.rs b/util/types/src/core/blockchain.rs index b28a126433..7121bf09de 100644 --- a/util/types/src/core/blockchain.rs +++ b/util/types/src/core/blockchain.rs @@ -3,6 +3,11 @@ use ckb_error::OtherError; use crate::packed; /// Specifies how the script `code_hash` is used to match the script code and how to run the code. +/// The hash type is split into the high 7 bits and the low 1 bit, +/// when the low 1 bit is 1, it indicates the type, +/// when the low 1 bit is 0, it indicates the data, +/// and then it relies on the high 7 bits to indicate +/// that the data actually corresponds to the version. #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)] pub enum ScriptHashType { /// Type "data" matches script code via cell data hash, and run the script code in v0 CKB VM. @@ -12,7 +17,7 @@ pub enum ScriptHashType { /// Type "data1" matches script code via cell data hash, and run the script code in v1 CKB VM. Data1 = 2, /// Type "data2" matches script code via cell data hash, and run the script code in v2 CKB VM. - Data2 = 3, + Data2 = 4, } impl Default for ScriptHashType { @@ -29,7 +34,7 @@ impl TryFrom for ScriptHashType { 0 => Ok(ScriptHashType::Data), 1 => Ok(ScriptHashType::Type), 2 => Ok(ScriptHashType::Data1), - 3 => Ok(ScriptHashType::Data2), + 4 => Ok(ScriptHashType::Data2), _ => Err(OtherError::new(format!("Invalid script hash type {v}"))), } } @@ -46,7 +51,7 @@ impl TryFrom for ScriptHashType { impl ScriptHashType { #[inline] pub(crate) fn verify_value(v: u8) -> bool { - v <= 3 + v <= 4 && v != 3 } } @@ -57,7 +62,7 @@ impl Into for ScriptHashType { Self::Data => 0, Self::Type => 1, Self::Data1 => 2, - Self::Data2 => 3, + Self::Data2 => 4, } } } diff --git a/util/types/src/core/tests/blockchain.rs b/util/types/src/core/tests/blockchain.rs index 0fa63847de..2c37578c28 100644 --- a/util/types/src/core/tests/blockchain.rs +++ b/util/types/src/core/tests/blockchain.rs @@ -10,10 +10,10 @@ fn test_script_hash_type() { let default_value: u8 = default.into(); assert_eq!(default_value, 0); - let max_value = 3u8; + let max_value = 4u8; for v in 0..32 { let res = ScriptHashType::try_from(v); - if v <= max_value { + if v <= max_value && v != 3 { let value: u8 = res.unwrap().into(); assert_eq!(value, v); } else { diff --git a/util/types/src/extension/tests/check_data.rs b/util/types/src/extension/tests/check_data.rs index 05489411dd..e8f4943e42 100644 --- a/util/types/src/extension/tests/check_data.rs +++ b/util/types/src/extension/tests/check_data.rs @@ -29,74 +29,81 @@ fn test_check_data_via_transaction( #[test] fn check_data() { for ht in 0..4 { - for dt in 0..2 { - let ht_right = ht.into(); - let dt_right = dt.into(); - let ht_error = 4.into(); - let dt_error = 2.into(); + if ht != 3 { + for dt in 0..2 { + let ht_right = ht.into(); + let dt_right = dt.into(); + let ht_error = 3.into(); + let dt_error = 2.into(); - let script_right = packed::Script::new_builder().hash_type(ht_right).build(); - let script_error = packed::Script::new_builder().hash_type(ht_error).build(); + let script_right = packed::Script::new_builder().hash_type(ht_right).build(); + let script_error = packed::Script::new_builder().hash_type(ht_error).build(); - let script_opt_right = packed::ScriptOpt::new_builder() - .set(Some(script_right.clone())) - .build(); - let script_opt_error = packed::ScriptOpt::new_builder() - .set(Some(script_error.clone())) - .build(); + let script_opt_right = packed::ScriptOpt::new_builder() + .set(Some(script_right.clone())) + .build(); + let script_opt_error = packed::ScriptOpt::new_builder() + .set(Some(script_error.clone())) + .build(); - let output_right1 = packed::CellOutput::new_builder() - .lock(script_right.clone()) - .build(); - let output_right2 = packed::CellOutput::new_builder() - .type_(script_opt_right.clone()) - .build(); - let output_error1 = packed::CellOutput::new_builder() - .lock(script_error.clone()) - .build(); - let output_error2 = packed::CellOutput::new_builder() - .type_(script_opt_error.clone()) - .build(); - let output_error3 = packed::CellOutput::new_builder() - .lock(script_right) - .type_(script_opt_error) - .build(); - let output_error4 = packed::CellOutput::new_builder() - .lock(script_error) - .type_(script_opt_right) - .build(); + let output_right1 = packed::CellOutput::new_builder() + .lock(script_right.clone()) + .build(); + let output_right2 = packed::CellOutput::new_builder() + .type_(script_opt_right.clone()) + .build(); + let output_error1 = packed::CellOutput::new_builder() + .lock(script_error.clone()) + .build(); + let output_error2 = packed::CellOutput::new_builder() + .type_(script_opt_error.clone()) + .build(); + let output_error3 = packed::CellOutput::new_builder() + .lock(script_right) + .type_(script_opt_error) + .build(); + let output_error4 = packed::CellOutput::new_builder() + .lock(script_error) + .type_(script_opt_right) + .build(); - let cell_dep_right = packed::CellDep::new_builder().dep_type(dt_right).build(); - let cell_dep_error = packed::CellDep::new_builder().dep_type(dt_error).build(); + let cell_dep_right = packed::CellDep::new_builder().dep_type(dt_right).build(); + let cell_dep_error = packed::CellDep::new_builder().dep_type(dt_error).build(); - test_check_data_via_transaction(true, &[], &[], &[]); - test_check_data_via_transaction(true, &[&output_right1], &[&[]], &[&cell_dep_right]); - test_check_data_via_transaction( - true, - &[&output_right1, &output_right2], - &[&[], &[]], - &[&cell_dep_right, &cell_dep_right], - ); - test_check_data_via_transaction(false, &[&output_error1], &[&[]], &[]); - test_check_data_via_transaction(false, &[&output_error2], &[&[]], &[]); - test_check_data_via_transaction(false, &[&output_error3], &[&[]], &[]); - test_check_data_via_transaction(false, &[&output_error4], &[&[]], &[]); - test_check_data_via_transaction(false, &[], &[], &[&cell_dep_error]); - test_check_data_via_transaction( - false, - &[ - &output_right1, - &output_right2, - &output_error1, - &output_error2, - &output_error3, - &output_error4, - ], - &[&[], &[], &[], &[], &[], &[]], - &[&cell_dep_right, &cell_dep_error], - ); - test_check_data_via_transaction(false, &[&output_right1], &[], &[&cell_dep_right]); - test_check_data_via_transaction(false, &[], &[&[]], &[&cell_dep_right]); + test_check_data_via_transaction(true, &[], &[], &[]); + test_check_data_via_transaction( + true, + &[&output_right1], + &[&[]], + &[&cell_dep_right], + ); + test_check_data_via_transaction( + true, + &[&output_right1, &output_right2], + &[&[], &[]], + &[&cell_dep_right, &cell_dep_right], + ); + test_check_data_via_transaction(false, &[&output_error1], &[&[]], &[]); + test_check_data_via_transaction(false, &[&output_error2], &[&[]], &[]); + test_check_data_via_transaction(false, &[&output_error3], &[&[]], &[]); + test_check_data_via_transaction(false, &[&output_error4], &[&[]], &[]); + test_check_data_via_transaction(false, &[], &[], &[&cell_dep_error]); + test_check_data_via_transaction( + false, + &[ + &output_right1, + &output_right2, + &output_error1, + &output_error2, + &output_error3, + &output_error4, + ], + &[&[], &[], &[], &[], &[], &[]], + &[&cell_dep_right, &cell_dep_error], + ); + test_check_data_via_transaction(false, &[&output_right1], &[], &[&cell_dep_right]); + test_check_data_via_transaction(false, &[], &[&[]], &[&cell_dep_right]); + } } } } From 464c7697aad9a24efac21b7f9094dafa3ac909bc Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Thu, 20 Jul 2023 15:37:46 +0800 Subject: [PATCH 066/125] Fix `FeeOfMultipleMaxBlockProposalsLimit` failed --- test/src/specs/mining/fee.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/src/specs/mining/fee.rs b/test/src/specs/mining/fee.rs index ecf6a10676..12a77cab7a 100644 --- a/test/src/specs/mining/fee.rs +++ b/test/src/specs/mining/fee.rs @@ -146,7 +146,7 @@ impl Spec for FeeOfMultipleMaxBlockProposalsLimit { }); (0..multiple).for_each(|_| { - let block = node.new_block(None, None, None); + let block = node.new_block_with_blocking(|template| template.proposals.is_empty()); node.submit_block(&block); assert_eq!( max_block_proposals_limit as usize, From 0f5c7709b5674ef6527f28a25f02771dc7770ff6 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Mon, 14 Aug 2023 08:22:53 +0800 Subject: [PATCH 067/125] Improve code comment --- script/src/verify.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/src/verify.rs b/script/src/verify.rs index af1182af12..653689e6dd 100644 --- a/script/src/verify.rs +++ b/script/src/verify.rs @@ -1076,7 +1076,7 @@ impl Date: Tue, 15 Aug 2023 15:32:51 +0800 Subject: [PATCH 068/125] fix typos in rpc readme. --- rpc/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpc/README.md b/rpc/README.md index 35de2c0e32..b361043232 100644 --- a/rpc/README.md +++ b/rpc/README.md @@ -6785,7 +6785,7 @@ Refer to RFC [CKB Transaction Structure](https://github.com/nervosnetwork/rfcs/b * `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. + CKB locates lock script and type script code via cell deps. The script also can use syscalls to read the cells here. Unlike inputs, the live cells can be used as cell deps in multiple transactions. @@ -6947,7 +6947,7 @@ The JSON view of a transaction as well as its status. * `cycles`: [`Cycle`](#type-cycle) `|` `null` - The transaction consumed cycles. -* `time_added_to_pool`: [`Uint64`](#type-uint64) `|` `null` - If the transaction is in tx-pool, `time_added_to_pool` represent when it enter the tx-pool. unit: Millisecond +* `time_added_to_pool`: [`Uint64`](#type-uint64) `|` `null` - If the transaction is in tx-pool, `time_added_to_pool` represent when it enters the tx-pool. unit: Millisecond * `tx_status`: [`TxStatus`](#type-txstatus) - The Transaction status. From 07de5e91063f09d29a0bd9763ef6a6a1edf39881 Mon Sep 17 00:00:00 2001 From: EthanYuan Date: Tue, 15 Aug 2023 15:34:38 +0800 Subject: [PATCH 069/125] fixing typos in comments --- util/jsonrpc-types/src/blockchain.rs | 8 ++++---- util/types/src/core/blockchain.rs | 2 +- util/types/src/core/tx_pool.rs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/util/jsonrpc-types/src/blockchain.rs b/util/jsonrpc-types/src/blockchain.rs index 2df38a7959..bf40d24f8e 100644 --- a/util/jsonrpc-types/src/blockchain.rs +++ b/util/jsonrpc-types/src/blockchain.rs @@ -13,7 +13,7 @@ use std::fmt; /// Specifies how the script `code_hash` is used to match the script code and how to run the code. /// -/// Allowed kinds: "data", "type", "data1" and “data2” +/// Allowed kinds: "data", "type", "data1" and "data2" /// /// Refer to the section [Code Locating](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0022-transaction-structure/0022-transaction-structure.md#code-locating) /// and [Upgradable Script](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0022-transaction-structure/0022-transaction-structure.md#upgradable-script) @@ -384,7 +384,7 @@ pub struct Transaction { pub version: Version, /// An array of cell deps. /// - /// CKB locates lock script and type script code via cell deps. The script also can uses syscalls + /// CKB locates lock script and type script code via cell deps. The script also can use syscalls /// to read the cells here. /// /// Unlike inputs, the live cells can be used as cell deps in multiple transactions. @@ -536,7 +536,7 @@ pub struct TransactionWithStatusResponse { pub transaction: Option>, /// The transaction consumed cycles. pub cycles: Option, - /// If the transaction is in tx-pool, `time_added_to_pool` represent when it enter the tx-pool. unit: Millisecond + /// If the transaction is in tx-pool, `time_added_to_pool` represent when it enters the tx-pool. unit: Millisecond pub time_added_to_pool: Option, /// The Transaction status. pub tx_status: TxStatus, @@ -1461,7 +1461,7 @@ pub struct Buried { pub status: SoftForkStatus, /// Whether the rules are active pub active: bool, - /// The first epoch which the rules will be enforced + /// The first epoch which the rules will be enforced pub epoch: EpochNumber, } diff --git a/util/types/src/core/blockchain.rs b/util/types/src/core/blockchain.rs index 7121bf09de..9dc2e7cb73 100644 --- a/util/types/src/core/blockchain.rs +++ b/util/types/src/core/blockchain.rs @@ -6,7 +6,7 @@ use crate::packed; /// The hash type is split into the high 7 bits and the low 1 bit, /// when the low 1 bit is 1, it indicates the type, /// when the low 1 bit is 0, it indicates the data, -/// and then it relies on the high 7 bits to indicate +/// and then it relies on the high 7 bits to indicate /// that the data actually corresponds to the version. #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)] pub enum ScriptHashType { diff --git a/util/types/src/core/tx_pool.rs b/util/types/src/core/tx_pool.rs index d5b41e1d4d..a1f182905d 100644 --- a/util/types/src/core/tx_pool.rs +++ b/util/types/src/core/tx_pool.rs @@ -161,7 +161,7 @@ pub struct TransactionWithStatus { pub tx_status: TxStatus, /// The transaction verification consumed cycles pub cycles: Option, - /// If the transaction is in tx-pool, `time_added_to_pool` represent when it enter the tx-pool. unit: Millisecond + /// If the transaction is in tx-pool, `time_added_to_pool` represent when it enters the tx-pool. unit: Millisecond pub time_added_to_pool: Option, } From 0d155c3999bb8ce2ac6ba79da2d99aad411a496a Mon Sep 17 00:00:00 2001 From: ian Date: Wed, 16 Aug 2023 20:16:49 +0800 Subject: [PATCH 070/125] chore: bump to v0.111.0-rc9 --- Cargo.lock | 136 +++++++++---------- Cargo.toml | 8 +- README.md | 2 +- benches/Cargo.toml | 36 ++--- block-filter/Cargo.toml | 14 +- chain/Cargo.toml | 52 +++---- ckb-bin/Cargo.toml | 48 +++---- db-migration/Cargo.toml | 12 +- db-schema/Cargo.toml | 2 +- db/Cargo.toml | 10 +- error/Cargo.toml | 4 +- freezer/Cargo.toml | 12 +- miner/Cargo.toml | 20 +-- network/Cargo.toml | 22 +-- notify/Cargo.toml | 12 +- pow/Cargo.toml | 6 +- resource/Cargo.toml | 6 +- rpc/Cargo.toml | 60 ++++---- script/Cargo.toml | 24 ++-- script/fuzz/Cargo.toml | 10 +- shared/Cargo.toml | 36 ++--- spec/Cargo.toml | 26 ++-- store/Cargo.toml | 20 +-- sync/Cargo.toml | 56 ++++---- test/Cargo.toml | 40 +++--- traits/Cargo.toml | 4 +- tx-pool/Cargo.toml | 44 +++--- util/Cargo.toml | 4 +- util/app-config/Cargo.toml | 24 ++-- util/build-info/Cargo.toml | 2 +- util/chain-iter/Cargo.toml | 6 +- util/channel/Cargo.toml | 2 +- util/constant/Cargo.toml | 2 +- util/crypto/Cargo.toml | 4 +- util/dao/Cargo.toml | 16 +-- util/dao/utils/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/indexer/Cargo.toml | 20 +-- util/instrument/Cargo.toml | 12 +- util/jsonrpc-types/Cargo.toml | 4 +- util/launcher/Cargo.toml | 66 ++++----- util/launcher/migration-template/Cargo.toml | 2 +- util/light-client-protocol-server/Cargo.toml | 32 ++--- util/logger-config/Cargo.toml | 2 +- util/logger-service/Cargo.toml | 10 +- util/logger/Cargo.toml | 2 +- util/memory-tracker/Cargo.toml | 8 +- util/metrics-config/Cargo.toml | 2 +- util/metrics-service/Cargo.toml | 14 +- util/metrics/Cargo.toml | 2 +- util/multisig/Cargo.toml | 8 +- util/network-alert/Cargo.toml | 28 ++-- 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 | 20 +-- util/runtime/Cargo.toml | 6 +- util/rust-unstable-port/Cargo.toml | 2 +- util/snapshot/Cargo.toml | 18 +-- util/spawn/Cargo.toml | 2 +- util/stop-handler/Cargo.toml | 10 +- util/systemtime/Cargo.toml | 2 +- util/test-chain-utils/Cargo.toml | 24 ++-- util/types/Cargo.toml | 16 +-- verification/Cargo.toml | 28 ++-- verification/contextual/Cargo.toml | 38 +++--- verification/traits/Cargo.toml | 4 +- wasm-build-test/Cargo.toml | 6 +- 73 files changed, 606 insertions(+), 606 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3503b236b0..32de81b580 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -395,7 +395,7 @@ dependencies = [ [[package]] name = "ckb" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-bin", "ckb-build-info", @@ -404,7 +404,7 @@ dependencies = [ [[package]] name = "ckb-app-config" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-build-info", "ckb-chain-spec", @@ -433,7 +433,7 @@ dependencies = [ [[package]] name = "ckb-async-runtime" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-logger", "ckb-spawn", @@ -442,7 +442,7 @@ dependencies = [ [[package]] name = "ckb-benches" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-app-config", "ckb-chain", @@ -470,7 +470,7 @@ dependencies = [ [[package]] name = "ckb-bin" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "base64", "ckb-app-config", @@ -511,7 +511,7 @@ dependencies = [ [[package]] name = "ckb-block-filter" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-async-runtime", "ckb-logger", @@ -523,11 +523,11 @@ dependencies = [ [[package]] name = "ckb-build-info" -version = "0.111.0-rc8" +version = "0.111.0-rc9" [[package]] name = "ckb-chain" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -561,7 +561,7 @@ dependencies = [ [[package]] name = "ckb-chain-iter" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-store", "ckb-types", @@ -569,7 +569,7 @@ dependencies = [ [[package]] name = "ckb-chain-spec" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-constant", "ckb-crypto", @@ -589,18 +589,18 @@ dependencies = [ [[package]] name = "ckb-channel" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "crossbeam-channel", ] [[package]] name = "ckb-constant" -version = "0.111.0-rc8" +version = "0.111.0-rc9" [[package]] name = "ckb-crypto" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-fixed-hash", "faster-hex", @@ -612,7 +612,7 @@ dependencies = [ [[package]] name = "ckb-dao" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "byteorder", "ckb-chain-spec", @@ -627,7 +627,7 @@ dependencies = [ [[package]] name = "ckb-dao-utils" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "byteorder", "ckb-error", @@ -636,7 +636,7 @@ dependencies = [ [[package]] name = "ckb-db" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-app-config", "ckb-db-schema", @@ -649,7 +649,7 @@ dependencies = [ [[package]] name = "ckb-db-migration" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-app-config", "ckb-db", @@ -663,11 +663,11 @@ dependencies = [ [[package]] name = "ckb-db-schema" -version = "0.111.0-rc8" +version = "0.111.0-rc9" [[package]] name = "ckb-error" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "anyhow", "ckb-occupied-capacity", @@ -677,7 +677,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-fixed-hash-core", "ckb-fixed-hash-macros", @@ -685,7 +685,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-core" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "faster-hex", "serde", @@ -695,7 +695,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-macros" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-fixed-hash-core", "proc-macro2", @@ -705,7 +705,7 @@ dependencies = [ [[package]] name = "ckb-freezer" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-error", "ckb-logger", @@ -721,7 +721,7 @@ dependencies = [ [[package]] name = "ckb-hash" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "blake2b-ref", "blake2b-rs", @@ -729,7 +729,7 @@ dependencies = [ [[package]] name = "ckb-indexer" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -751,7 +751,7 @@ dependencies = [ [[package]] name = "ckb-instrument" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-chain", "ckb-chain-iter", @@ -764,7 +764,7 @@ dependencies = [ [[package]] name = "ckb-jsonrpc-types" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-types", "faster-hex", @@ -777,7 +777,7 @@ dependencies = [ [[package]] name = "ckb-launcher" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -832,7 +832,7 @@ dependencies = [ [[package]] name = "ckb-light-client-protocol-server" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-app-config", "ckb-chain", @@ -855,14 +855,14 @@ dependencies = [ [[package]] name = "ckb-logger" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "log", ] [[package]] name = "ckb-logger-config" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "serde", "toml", @@ -870,7 +870,7 @@ dependencies = [ [[package]] name = "ckb-logger-service" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "backtrace", "ckb-channel", @@ -889,7 +889,7 @@ dependencies = [ [[package]] name = "ckb-memory-tracker" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-db", "ckb-logger", @@ -911,7 +911,7 @@ dependencies = [ [[package]] name = "ckb-metrics" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "once_cell", "prometheus", @@ -920,14 +920,14 @@ dependencies = [ [[package]] name = "ckb-metrics-config" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "serde", ] [[package]] name = "ckb-metrics-service" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-async-runtime", "ckb-logger", @@ -941,7 +941,7 @@ dependencies = [ [[package]] name = "ckb-migration-template" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "quote", "syn", @@ -949,7 +949,7 @@ dependencies = [ [[package]] name = "ckb-miner" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "base64", "ckb-app-config", @@ -978,7 +978,7 @@ dependencies = [ [[package]] name = "ckb-multisig" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-crypto", "ckb-error", @@ -988,7 +988,7 @@ dependencies = [ [[package]] name = "ckb-network" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "bitflags", "bloom-filters", @@ -1026,7 +1026,7 @@ dependencies = [ [[package]] name = "ckb-network-alert" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1049,7 +1049,7 @@ dependencies = [ [[package]] name = "ckb-notify" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1061,7 +1061,7 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-occupied-capacity-core", "ckb-occupied-capacity-macros", @@ -1069,14 +1069,14 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity-core" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "serde", ] [[package]] name = "ckb-occupied-capacity-macros" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-occupied-capacity-core", "quote", @@ -1085,7 +1085,7 @@ dependencies = [ [[package]] name = "ckb-pow" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "byteorder", "ckb-hash", @@ -1097,7 +1097,7 @@ dependencies = [ [[package]] name = "ckb-proposal-table" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-chain-spec", "ckb-logger", @@ -1106,7 +1106,7 @@ dependencies = [ [[package]] name = "ckb-rational" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "numext-fixed-uint", "proptest", @@ -1115,7 +1115,7 @@ dependencies = [ [[package]] name = "ckb-resource" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-system-scripts", "ckb-types", @@ -1129,7 +1129,7 @@ dependencies = [ [[package]] name = "ckb-reward-calculator" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-chain-spec", "ckb-dao", @@ -1156,7 +1156,7 @@ dependencies = [ [[package]] name = "ckb-rpc" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-app-config", "ckb-chain", @@ -1205,14 +1205,14 @@ dependencies = [ [[package]] name = "ckb-rust-unstable-port" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "is_sorted", ] [[package]] name = "ckb-script" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "byteorder", "ckb-chain-spec", @@ -1237,7 +1237,7 @@ dependencies = [ [[package]] name = "ckb-shared" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "arc-swap", "ckb-async-runtime", @@ -1260,7 +1260,7 @@ dependencies = [ [[package]] name = "ckb-snapshot" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "arc-swap", "ckb-chain-spec", @@ -1276,11 +1276,11 @@ dependencies = [ [[package]] name = "ckb-spawn" -version = "0.111.0-rc8" +version = "0.111.0-rc9" [[package]] name = "ckb-stop-handler" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-async-runtime", "ckb-channel", @@ -1296,7 +1296,7 @@ dependencies = [ [[package]] name = "ckb-store" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -1314,7 +1314,7 @@ dependencies = [ [[package]] name = "ckb-sync" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "bitflags", "ckb-app-config", @@ -1372,11 +1372,11 @@ dependencies = [ [[package]] name = "ckb-systemtime" -version = "0.111.0-rc8" +version = "0.111.0-rc9" [[package]] name = "ckb-test-chain-utils" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-chain-spec", "ckb-dao-utils", @@ -1394,14 +1394,14 @@ dependencies = [ [[package]] name = "ckb-traits" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-types", ] [[package]] name = "ckb-tx-pool" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1438,7 +1438,7 @@ dependencies = [ [[package]] name = "ckb-types" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "bit-vec", "bytes 1.4.0", @@ -1462,7 +1462,7 @@ dependencies = [ [[package]] name = "ckb-util" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-fixed-hash", "linked-hash-map", @@ -1473,7 +1473,7 @@ dependencies = [ [[package]] name = "ckb-verification" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-chain-spec", "ckb-dao", @@ -1493,7 +1493,7 @@ dependencies = [ [[package]] name = "ckb-verification-contextual" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "ckb-async-runtime", "ckb-chain", @@ -1520,7 +1520,7 @@ dependencies = [ [[package]] name = "ckb-verification-traits" -version = "0.111.0-rc8" +version = "0.111.0-rc9" dependencies = [ "bitflags", "ckb-error", diff --git a/Cargo.toml b/Cargo.toml index d6b1cb20d3..6587bbb8b8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,11 +11,11 @@ repository = "https://github.com/nervosnetwork/ckb" rust-version = "1.67.1" [build-dependencies] -ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc8" } +ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc9" } [dependencies] -ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc8" } -ckb-bin = { path = "ckb-bin", version = "= 0.111.0-rc8" } +ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc9" } +ckb-bin = { path = "ckb-bin", version = "= 0.111.0-rc9" } [dev-dependencies] diff --git a/README.md b/README.md index d0385f010b..2ccc6398aa 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.111.0--rc8-orange.svg)](https://github.com/nervosnetwork/ckb/releases) +[![Version](https://img.shields.io/badge/version-0.111.0--rc9-orange.svg)](https://github.com/nervosnetwork/ckb/releases) [![Nervos Talk](https://img.shields.io/badge/discuss-on%20Nervos%20Talk-3CC68A.svg)](https://talk.nervos.org/t/where-to-discuss-ckb-and-how-to-ask-for-support/6024) master | develop diff --git a/benches/Cargo.toml b/benches/Cargo.toml index eef230331d..23d1ae05b6 100644 --- a/benches/Cargo.toml +++ b/benches/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-benches" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,26 +13,26 @@ repository = "https://github.com/nervosnetwork/ckb" [dev-dependencies] criterion = "0.4" -ckb-chain = { path = "../chain", version = "= 0.111.0-rc8" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc8" } -ckb-store = { path = "../store", version = "= 0.111.0-rc8" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc8" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc9" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc9" } +ckb-store = { path = "../store", version = "= 0.111.0-rc9" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc9" } rand = "0.7" -ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc8"} -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc8" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc8" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc8" } +ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc9"} +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc9" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc9" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc9" } ckb-system-scripts = { version = "= 0.5.4" } lazy_static = "1.3.0" -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc8" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc8" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc8" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc8" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc8" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc8" } -ckb-network = { path = "../network", version = "= 0.111.0-rc8" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc8" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc9" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc9" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc9" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc9" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc9" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc9" } +ckb-network = { path = "../network", version = "= 0.111.0-rc9" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc9" } tempfile.workspace = true [[bench]] diff --git a/block-filter/Cargo.toml b/block-filter/Cargo.toml index 7577ff0ff6..94a4d53c03 100644 --- a/block-filter/Cargo.toml +++ b/block-filter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-block-filter" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,9 +11,9 @@ repository = "https://github.com/nervosnetwork/ckb" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ckb-store = { path = "../store", version = "= 0.111.0-rc8" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc8" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc8" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc8" } +ckb-store = { path = "../store", version = "= 0.111.0-rc9" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc9" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc9" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc9" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc9" } diff --git a/chain/Cargo.toml b/chain/Cargo.toml index e060f22512..840cb93c44 100644 --- a/chain/Cargo.toml +++ b/chain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,37 +9,37 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8" } -ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc8" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc8" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc8" } -ckb-store = { path = "../store", version = "= 0.111.0-rc8" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc8" } -ckb-verification-contextual = { path = "../verification/contextual", version = "= 0.111.0-rc8" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc8" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc8" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc8" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc8" } -ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc8" } -ckb-error = { path = "../error", version = "= 0.111.0-rc8" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc8" } -ckb-rust-unstable-port = { path = "../util/rust-unstable-port", version = "= 0.111.0-rc8" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc8" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc9" } +ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc9" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc9" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc9" } +ckb-store = { path = "../store", version = "= 0.111.0-rc9" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc9" } +ckb-verification-contextual = { path = "../verification/contextual", version = "= 0.111.0-rc9" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc9" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc9" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc9" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc9" } +ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc9" } +ckb-error = { path = "../error", version = "= 0.111.0-rc9" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc9" } +ckb-rust-unstable-port = { path = "../util/rust-unstable-port", version = "= 0.111.0-rc9" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc9" } faux = { version = "^0.1", optional = true } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc8" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc8" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc8" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc8", features = ["internal"] } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc8" } -ckb-network = { path = "../network", version = "= 0.111.0-rc8" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc8" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc9" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc9" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc9" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc9", features = ["internal"] } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc9" } +ckb-network = { path = "../network", version = "= 0.111.0-rc9" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc9" } lazy_static = "1.4" tempfile.workspace = true -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc8" ,features = ["enable_faketime"]} +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc9" ,features = ["enable_faketime"]} [features] default = [] diff --git a/ckb-bin/Cargo.toml b/ckb-bin/Cargo.toml index 27ee76fa04..2627dfe4b9 100644 --- a/ckb-bin/Cargo.toml +++ b/ckb-bin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-bin" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -14,36 +14,36 @@ serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0" } serde_plain = "0.3.0" toml = "0.5" -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc8" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8" } -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc8" } -ckb-metrics-service = { path = "../util/metrics-service", version = "= 0.111.0-rc8" } -ckb-util = { path = "../util", version = "= 0.111.0-rc8" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc8" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc8" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc8" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc8" } -ckb-store = { path = "../store", version = "= 0.111.0-rc8" } -ckb-chain-spec = {path = "../spec", version = "= 0.111.0-rc8"} -ckb-miner = { path = "../miner", version = "= 0.111.0-rc8" } -ckb-network = { path = "../network", version = "= 0.111.0-rc8"} -ckb-resource = { path = "../resource", version = "= 0.111.0-rc8"} +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc9" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc9" } +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc9" } +ckb-metrics-service = { path = "../util/metrics-service", version = "= 0.111.0-rc9" } +ckb-util = { path = "../util", version = "= 0.111.0-rc9" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc9" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc9" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc9" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc9" } +ckb-store = { path = "../store", version = "= 0.111.0-rc9" } +ckb-chain-spec = {path = "../spec", version = "= 0.111.0-rc9"} +ckb-miner = { path = "../miner", version = "= 0.111.0-rc9" } +ckb-network = { path = "../network", version = "= 0.111.0-rc9"} +ckb-resource = { path = "../resource", version = "= 0.111.0-rc9"} ctrlc = { version = "3.1", features = ["termination"] } -ckb-instrument = { path = "../util/instrument", version = "= 0.111.0-rc8", features = ["progress_bar"] } -ckb-build-info = { path = "../util/build-info", version = "= 0.111.0-rc8" } -ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc8" } -ckb-chain-iter = { path = "../util/chain-iter", version = "= 0.111.0-rc8" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc8" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc8" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc8" } +ckb-instrument = { path = "../util/instrument", version = "= 0.111.0-rc9", features = ["progress_bar"] } +ckb-build-info = { path = "../util/build-info", version = "= 0.111.0-rc9" } +ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc9" } +ckb-chain-iter = { path = "../util/chain-iter", version = "= 0.111.0-rc9" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc9" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc9" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc9" } base64 = "0.21.0" tempfile.workspace = true rayon = "1.0" sentry = { version = "0.26.0", optional = true } is-terminal = "0.4.7" fdlimit = "0.2.1" -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc8" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc9" } [features] deadlock_detection = ["ckb-util/deadlock_detection"] diff --git a/db-migration/Cargo.toml b/db-migration/Cargo.toml index e200343f21..9a7d1349a7 100644 --- a/db-migration/Cargo.toml +++ b/db-migration/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db-migration" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,16 +11,16 @@ 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.111.0-rc8" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8" } -ckb-error = { path = "../error", version = "= 0.111.0-rc8" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc8" } +ckb-db = { path = "../db", version = "= 0.111.0-rc9" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc9" } +ckb-error = { path = "../error", version = "= 0.111.0-rc9" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc9" } indicatif = "0.16" console = ">=0.9.1, <1.0.0" [dev-dependencies] tempfile.workspace = true -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc8" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc9" } [features] portable = ["ckb-db/portable"] diff --git a/db-schema/Cargo.toml b/db-schema/Cargo.toml index 00baa7c94a..a64fd8b196 100644 --- a/db-schema/Cargo.toml +++ b/db-schema/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db-schema" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/db/Cargo.toml b/db/Cargo.toml index 96ef02806d..e26b7f5e3f 100644 --- a/db/Cargo.toml +++ b/db/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,12 +9,12 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc8" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8" } -ckb-error = { path = "../error", version = "= 0.111.0-rc8" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc9" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc9" } +ckb-error = { path = "../error", version = "= 0.111.0-rc9" } libc = "0.2" rocksdb = { package = "ckb-rocksdb", version ="=0.20.0", features = ["snappy"], default-features = false } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc8" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc9" } [dev-dependencies] tempfile.workspace = true diff --git a/error/Cargo.toml b/error/Cargo.toml index 7b85bde530..f8cfba5441 100644 --- a/error/Cargo.toml +++ b/error/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-error" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,5 +11,5 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] thiserror = "1.0.22" anyhow = "1.0.34" -ckb-occupied-capacity = { path = "../util/occupied-capacity", version = "= 0.111.0-rc8" } +ckb-occupied-capacity = { path = "../util/occupied-capacity", version = "= 0.111.0-rc9" } derive_more = { version = "0.99.0", default-features = false, features = ["display"] } diff --git a/freezer/Cargo.toml b/freezer/Cargo.toml index 1aa127f419..828395ed9c 100644 --- a/freezer/Cargo.toml +++ b/freezer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-freezer" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,11 +10,11 @@ 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.111.0-rc8" } -ckb-error = { path = "../error", version = "= 0.111.0-rc8" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8" } -ckb-util = { path = "../util", version = "= 0.111.0-rc8" } -ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc8" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } +ckb-error = { path = "../error", version = "= 0.111.0-rc9" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc9" } +ckb-util = { path = "../util", version = "= 0.111.0-rc9" } +ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc9" } fs2 = "0.4.3" fail = "0.4" snap = "1" diff --git a/miner/Cargo.toml b/miner/Cargo.toml index 6e03e57e1f..279605a0fc 100644 --- a/miner/Cargo.toml +++ b/miner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-miner" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,23 +9,23 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc8" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc8" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc8" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc8" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc9" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc9" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc9" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc9" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc9" } rand = "0.7" rand_distr = "0.3" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc8" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc9" } hyper = { version = "0.14", features = ["client", "http2", "http1", "server"] } hyper-tls = "0.5" futures = "0.3" lru = "0.7.1" -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc8" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc8" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc9" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc9" } indicatif = "0.16" console = ">=0.9.1, <1.0.0" eaglesong = "0.1" diff --git a/network/Cargo.toml b/network/Cargo.toml index 88309b4f4c..eee344e3df 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-network" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,28 +11,28 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] rand = "0.7" serde = { version = "1.0", features = ["derive"] } -ckb-util = { path = "../util", version = "= 0.111.0-rc8" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc8" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc8" } -ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc8"} +ckb-util = { path = "../util", version = "= 0.111.0-rc9" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc9" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc9" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc9" } +ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc9"} tokio = { version = "1", features = ["sync", "macros"] } tokio-util = { version = "0.7", features = ["codec"] } futures = "0.3" -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc8"} +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc9"} lazy_static = { version = "1.3.0", optional = true } bs58 = { version = "0.4.0", optional = true } sentry = { version = "0.26.0", optional = true } faster-hex = { version = "0.6", optional = true } -ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc8"} +ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc9"} secp256k1 = {version = "0.24", features = ["recovery"], optional = true } trust-dns-resolver = { version = "0.20", optional = true } snap = "1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } ipnetwork = "0.18" serde_json = "1.0" bloom-filters = "0.1" -ckb-spawn = { path = "../util/spawn", version = "= 0.111.0-rc8" } +ckb-spawn = { path = "../util/spawn", version = "= 0.111.0-rc9" } socket2 = "0.4" bitflags = "1.0" @@ -48,7 +48,7 @@ criterion = "0.4" proptest = "1.0" num_cpus = "1.10" once_cell = "1.8.0" -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc8", features = ["enable_faketime"]} +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc9", features = ["enable_faketime"]} [[bench]] name = "peer_store" diff --git a/notify/Cargo.toml b/notify/Cargo.toml index 78382aa2b9..a08bdf3b56 100644 --- a/notify/Cargo.toml +++ b/notify/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-notify" -version = "0.111.0-rc8" +version = "0.111.0-rc9" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc8" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc8" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc8" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc9" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc9" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc9" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc9" } tokio = { version = "1", features = ["sync"] } [dev-dependencies] diff --git a/pow/Cargo.toml b/pow/Cargo.toml index e5c3c12fd6..78abb81e63 100644 --- a/pow/Cargo.toml +++ b/pow/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-pow" -version = "0.111.0-rc8" +version = "0.111.0-rc9" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,8 +10,8 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc8"} +ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc9"} serde = { version = "1.0", features = ["derive"] } eaglesong = "0.1" log = "0.4" diff --git a/resource/Cargo.toml b/resource/Cargo.toml index 862c97c474..d8582fca19 100644 --- a/resource/Cargo.toml +++ b/resource/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-resource" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,13 +13,13 @@ repository = "https://github.com/nervosnetwork/ckb" phf = "0.8.0" includedir = "0.6.0" serde = { version = "1.0", features = ["derive"] } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } ckb-system-scripts = { version = "= 0.5.4" } [build-dependencies] includedir_codegen = "0.6.0" walkdir = "2.1.4" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } ckb-system-scripts = { version = "= 0.5.4" } [dev-dependencies] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index c9a856d56a..0fd7607868 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-rpc" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,19 +9,19 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc8" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } -ckb-network = { path = "../network", version = "= 0.111.0-rc8" } -ckb-notify = { path = "../notify", version = "= 0.111.0-rc8" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc8" } -ckb-store = { path = "../store", version = "= 0.111.0-rc8" } -ckb-sync = { path = "../sync", version = "= 0.111.0-rc8" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc8" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8"} -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc8"} -ckb-network-alert = { path = "../util/network-alert", version = "= 0.111.0-rc8" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc8" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc8" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc9" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } +ckb-network = { path = "../network", version = "= 0.111.0-rc9" } +ckb-notify = { path = "../notify", version = "= 0.111.0-rc9" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc9" } +ckb-store = { path = "../store", version = "= 0.111.0-rc9" } +ckb-sync = { path = "../sync", version = "= 0.111.0-rc9" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc9" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc9"} +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc9"} +ckb-network-alert = { path = "../util/network-alert", version = "= 0.111.0-rc9" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc9" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc9" } jsonrpc-core = "18.0" jsonrpc-derive = "18.0" jsonrpc-http-server = "18.0" @@ -30,27 +30,27 @@ jsonrpc-ws-server = "18.0" jsonrpc-server-utils = "18.0" jsonrpc-pubsub = "18.0" serde_json = "1.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc8" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc8" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc8" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc8" } -ckb-util = { path = "../util", version = "= 0.111.0-rc8" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc8" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc8" } -ckb-error = { path = "../error", version = "= 0.111.0-rc8" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc8" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc8" } -ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc8" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc8" } -ckb-indexer = { path = "../util/indexer", version = "= 0.111.0-rc8" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc9" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc9" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc9" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc9" } +ckb-util = { path = "../util", version = "= 0.111.0-rc9" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc9" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc9" } +ckb-error = { path = "../error", version = "= 0.111.0-rc9" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc9" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc9" } +ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc9" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc9" } +ckb-indexer = { path = "../util/indexer", version = "= 0.111.0-rc9" } itertools.workspace = true tokio = "1" [dev-dependencies] reqwest = { version = "0.11.4", features = ["blocking", "json"] } serde = { version = "1.0", features = ["derive"] } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc8" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc8" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc9" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc9" } tempfile.workspace = true pretty_assertions = "1.3.0" -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc8" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc9" } diff --git a/script/Cargo.toml b/script/Cargo.toml index da018ecfdb..c34e892894 100644 --- a/script/Cargo.toml +++ b/script/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-script" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -18,24 +18,24 @@ logging = ["ckb-logger"] flatmemory = [] [dependencies] -ckb-traits = { path = "../traits", version = "= 0.111.0-rc8" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc9" } byteorder = "1.3.1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc8" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc9" } ckb-vm = { version = "=0.24.4", default-features = false } faster-hex = "0.6" -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8", optional = true } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc9", optional = true } serde = { version = "1.0", features = ["derive"] } -ckb-error = { path = "../error", version = "= 0.111.0-rc8" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc8" } +ckb-error = { path = "../error", version = "= 0.111.0-rc9" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc9" } [dev-dependencies] proptest = "1.0" -ckb-db = { path = "../db", version = "= 0.111.0-rc8" } -ckb-store = { path = "../store", version = "= 0.111.0-rc8" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc8" } +ckb-db = { path = "../db", version = "= 0.111.0-rc9" } +ckb-store = { path = "../store", version = "= 0.111.0-rc9" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc9" } tiny-keccak = { version = "2.0", features = ["sha3"] } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc8" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc8" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc9" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc9" } tempfile.workspace = true rand = "0.8.4" diff --git a/script/fuzz/Cargo.toml b/script/fuzz/Cargo.toml index 67c7b0901c..2c2afc3001 100644 --- a/script/fuzz/Cargo.toml +++ b/script/fuzz/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-script-fuzz" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -15,10 +15,10 @@ cargo-fuzz = true [dependencies] arbitrary = { version = "1", features = ["derive"] } libfuzzer-sys = { version="0.4.0", features=["arbitrary-derive"] } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc8" } -ckb-types = { path = "../../util/types", version = "= 0.111.0-rc8" } -ckb-script = { path = "../../script", version = "= 0.111.0-rc8" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc8" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc9" } +ckb-types = { path = "../../util/types", version = "= 0.111.0-rc9" } +ckb-script = { path = "../../script", version = "= 0.111.0-rc9" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc9" } # Prevent this from interfering with workspaces [workspace] diff --git a/shared/Cargo.toml b/shared/Cargo.toml index a33b65c3b0..337fa46308 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-shared" -version = "0.111.0-rc8" +version = "0.111.0-rc9" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,26 +9,26 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc8" } -ckb-store = { path = "../store", version = "= 0.111.0-rc8" } -ckb-db = { path = "../db", version = "= 0.111.0-rc8" } -ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc8" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc9" } +ckb-store = { path = "../store", version = "= 0.111.0-rc9" } +ckb-db = { path = "../db", version = "= 0.111.0-rc9" } +ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc9" } arc-swap = "1.3" -ckb-error = { path = "../error", version = "= 0.111.0-rc8" } -ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc8" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc8" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc8" } -ckb-notify = { path = "../notify", version = "= 0.111.0-rc8" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc8" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc8" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc8" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc8" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc8" } +ckb-error = { path = "../error", version = "= 0.111.0-rc9" } +ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc9" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc9" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc9" } +ckb-notify = { path = "../notify", version = "= 0.111.0-rc9" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc9" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc9" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc9" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc9" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc9" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc9" } [dev-dependencies] -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc8", features = ["enable_faketime"] } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc9", features = ["enable_faketime"] } [features] portable = ["ckb-db/portable", "ckb-store/portable", "ckb-tx-pool/portable"] diff --git a/spec/Cargo.toml b/spec/Cargo.toml index 4e03694634..58d10f4480 100644 --- a/spec/Cargo.toml +++ b/spec/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain-spec" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,15 +11,15 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] serde = { version = "1.0", features = ["derive"] } toml = "0.5" -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc8" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc8" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc8" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc8" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc8" } -ckb-rational = { path = "../util/rational", version = "= 0.111.0-rc8" } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc8"} -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc8"} -ckb-error = { path = "../error", version = "= 0.111.0-rc8" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc8" } -ckb-util = { path = "../util", version = "= 0.111.0-rc8" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc9" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc9" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc9" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc9" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc9" } +ckb-rational = { path = "../util/rational", version = "= 0.111.0-rc9" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc9"} +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc9"} +ckb-error = { path = "../error", version = "= 0.111.0-rc9" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc9" } +ckb-util = { path = "../util", version = "= 0.111.0-rc9" } diff --git a/store/Cargo.toml b/store/Cargo.toml index 5341ddd31b..250b38462a 100644 --- a/store/Cargo.toml +++ b/store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-store" -version = "0.111.0-rc8" +version = "0.111.0-rc9" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,16 +9,16 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } -ckb-db = { path = "../db", version = "= 0.111.0-rc8" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc8" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } +ckb-db = { path = "../db", version = "= 0.111.0-rc9" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc9" } lru = "0.7.1" -ckb-traits = { path = "../traits", version = "= 0.111.0-rc8" } -ckb-util = { path = "../util", version = "= 0.111.0-rc8" } -ckb-error = { path = "../error", version = "= 0.111.0-rc8" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc8" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc8" } -ckb-freezer = { path = "../freezer", version = "= 0.111.0-rc8" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc9" } +ckb-util = { path = "../util", version = "= 0.111.0-rc9" } +ckb-error = { path = "../error", version = "= 0.111.0-rc9" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc9" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc9" } +ckb-freezer = { path = "../freezer", version = "= 0.111.0-rc9" } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] diff --git a/sync/Cargo.toml b/sync/Cargo.toml index fa998193e7..43202c761b 100644 --- a/sync/Cargo.toml +++ b/sync/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-sync" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,32 +9,32 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-chain = { path = "../chain", version = "= 0.111.0-rc8" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc8" } -ckb-store = { path = "../store", version = "= 0.111.0-rc8" } -ckb-app-config = {path = "../util/app-config", version = "= 0.111.0-rc8"} -ckb-types = {path = "../util/types", version = "= 0.111.0-rc8"} -ckb-network = { path = "../network", version = "= 0.111.0-rc8" } -ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc8"} -ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc8"} -ckb-util = { path = "../util", version = "= 0.111.0-rc8" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc8" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc8" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc8" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc8" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc8" } -ckb-error = {path = "../error", version = "= 0.111.0-rc8"} -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc8" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc9" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc9" } +ckb-store = { path = "../store", version = "= 0.111.0-rc9" } +ckb-app-config = {path = "../util/app-config", version = "= 0.111.0-rc9"} +ckb-types = {path = "../util/types", version = "= 0.111.0-rc9"} +ckb-network = { path = "../network", version = "= 0.111.0-rc9" } +ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc9"} +ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc9"} +ckb-util = { path = "../util", version = "= 0.111.0-rc9" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc9" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc9" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc9" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc9" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc9" } +ckb-error = {path = "../error", version = "= 0.111.0-rc9"} +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc9" } sentry = { version = "0.26.0", optional = true } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc8" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc8" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc8" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc9" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc9" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc9" } tokio = { version = "1", features = ["sync"] } lru = "0.7.1" futures = "0.3" governor = "0.3.1" tempfile.workspace = true -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc8" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc9" } bitflags = "1.0" dashmap = "4.0" keyed_priority_queue = "0.3" @@ -42,16 +42,16 @@ sled = "0.34.7" itertools.workspace = true [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc8" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc9" } rand = "0.7" -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc8" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc8" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc8" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc8", features = ["mock"] } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc8" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc9" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc9" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc9" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc9", features = ["mock"] } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc9" } faux = "^0.1" once_cell = "1.8.0" -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc8" , features = ["enable_faketime"]} +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc9" , features = ["enable_faketime"]} [features] default = [] diff --git a/test/Cargo.toml b/test/Cargo.toml index 283eb30871..be36adc565 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-test" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,28 +11,28 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] clap = { version = "=3.2.21" } toml = "0.5.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc8" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc8" } -ckb-network = { path = "../network", version = "= 0.111.0-rc8" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc8" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc8" } -ckb-util = { path = "../util", version = "= 0.111.0-rc8" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc8" } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc8" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc8" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc8" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc8" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc8" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc8" } -ckb-logger-config = { path = "../util/logger-config", version = "= 0.111.0-rc8" } -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc8" } -ckb-error = { path = "../error", version = "= 0.111.0-rc8" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc8" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc9" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc9" } +ckb-network = { path = "../network", version = "= 0.111.0-rc9" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc9" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc9" } +ckb-util = { path = "../util", version = "= 0.111.0-rc9" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc9" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc9" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc9" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc9" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc9" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc9" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc9" } +ckb-logger-config = { path = "../util/logger-config", version = "= 0.111.0-rc9" } +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc9" } +ckb-error = { path = "../error", version = "= 0.111.0-rc9" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc9" } tempfile = "3" reqwest = { version = "0.11.4", features = ["blocking", "json"] } rand = "0.7" -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc8" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc9" } serde_json = "1.0" lazy_static = "1.4.0" byteorder = "1.3.1" diff --git a/traits/Cargo.toml b/traits/Cargo.toml index 17d4053882..8ff0de8999 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-traits" -version = "0.111.0-rc8" +version = "0.111.0-rc9" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc8" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } diff --git a/tx-pool/Cargo.toml b/tx-pool/Cargo.toml index 95e4aa1294..a94bbd77ce 100644 --- a/tx-pool/Cargo.toml +++ b/tx-pool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-tx-pool" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,27 +11,27 @@ 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.111.0-rc8" } -ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc8"} -ckb-verification = { path = "../verification", version = "= 0.111.0-rc8" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc8"} +ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } +ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc9"} +ckb-verification = { path = "../verification", version = "= 0.111.0-rc9" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc9"} lru = "0.7.1" -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc8" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc8" } -ckb-store = { path = "../store", version = "= 0.111.0-rc8" } -ckb-util = { path = "../util", version = "= 0.111.0-rc8" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc8" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc8" } -ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc8" } -ckb-error = { path = "../error", version = "= 0.111.0-rc8" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc9" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc9" } +ckb-store = { path = "../store", version = "= 0.111.0-rc9" } +ckb-util = { path = "../util", version = "= 0.111.0-rc9" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc9" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc9" } +ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc9" } +ckb-error = { path = "../error", version = "= 0.111.0-rc9" } tokio = { version = "1", features = ["sync", "process"] } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc8" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc8" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc8" } -ckb-network = { path = "../network", version = "= 0.111.0-rc8" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc8" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc8" } -ckb-db = { path = "../db", version = "= 0.111.0-rc8" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc9" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc9" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc9" } +ckb-network = { path = "../network", version = "= 0.111.0-rc9" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc9" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc9" } +ckb-db = { path = "../db", version = "= 0.111.0-rc9" } sentry = { version = "0.26.0", optional = true } serde_json = "1.0" rand = "0.8.4" @@ -43,8 +43,8 @@ tokio-util = "0.7.8" [dev-dependencies] tempfile.workspace = true -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc8" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc8", features = ["enable_faketime"]} +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc9" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc9", features = ["enable_faketime"]} [features] default = [] diff --git a/util/Cargo.toml b/util/Cargo.toml index d4d2079dd0..c0ef6b29bf 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-util" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -15,7 +15,7 @@ regex = "1.1.6" once_cell = "1.8.0" [dev-dependencies] -ckb-fixed-hash = { path = "fixed-hash", version = "= 0.111.0-rc8" } +ckb-fixed-hash = { path = "fixed-hash", version = "= 0.111.0-rc9" } [features] deadlock_detection = ["parking_lot/deadlock_detection"] diff --git a/util/app-config/Cargo.toml b/util/app-config/Cargo.toml index d45270faba..5e47228240 100644 --- a/util/app-config/Cargo.toml +++ b/util/app-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-app-config" -version = "0.111.0-rc8" +version = "0.111.0-rc9" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -15,20 +15,20 @@ serde_plain = "0.3.0" serde_json = "1.0" toml = "0.5" path-clean = "0.1.0" -ckb-logger = { path = "../../util/logger", version = "= 0.111.0-rc8" } -ckb-logger-config = { path = "../../util/logger-config", version = "= 0.111.0-rc8" } -ckb-metrics-config = { path = "../../util/metrics-config", version = "= 0.111.0-rc8" } -ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc8"} -ckb-jsonrpc-types = {path = "../jsonrpc-types", version = "= 0.111.0-rc8"} -ckb-pow = { path = "../../pow", version = "= 0.111.0-rc8" } -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc8"} -ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc8" } -ckb-types = { path = "../types", version = "= 0.111.0-rc8" } +ckb-logger = { path = "../../util/logger", version = "= 0.111.0-rc9" } +ckb-logger-config = { path = "../../util/logger-config", version = "= 0.111.0-rc9" } +ckb-metrics-config = { path = "../../util/metrics-config", version = "= 0.111.0-rc9" } +ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc9"} +ckb-jsonrpc-types = {path = "../jsonrpc-types", version = "= 0.111.0-rc9"} +ckb-pow = { path = "../../pow", version = "= 0.111.0-rc9" } +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc9"} +ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc9" } +ckb-types = { path = "../types", version = "= 0.111.0-rc9" } secio = { version="0.5.7", package="tentacle-secio" } multiaddr = { version="0.3.0", package="tentacle-multiaddr" } rand = "0.7" sentry = { version = "0.26.0", optional = true } -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc8" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc9" } url = { version = "2.2.2", features = ["serde"] } ubyte = { version = "0.10", features = ["serde"] } @@ -37,4 +37,4 @@ with_sentry = ["sentry"] [dev-dependencies] tempfile.workspace = true -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc8" ,features = ["enable_faketime"]} +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc9" ,features = ["enable_faketime"]} diff --git a/util/build-info/Cargo.toml b/util/build-info/Cargo.toml index 69e931d97a..be8079c551 100644 --- a/util/build-info/Cargo.toml +++ b/util/build-info/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-build-info" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/chain-iter/Cargo.toml b/util/chain-iter/Cargo.toml index 9c6eeda960..d8e6900ae3 100644 --- a/util/chain-iter/Cargo.toml +++ b/util/chain-iter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain-iter" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc8" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc8" } +ckb-types = { path = "../types", version = "= 0.111.0-rc9" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc9" } diff --git a/util/channel/Cargo.toml b/util/channel/Cargo.toml index f06d027bd6..8f4dbd8ae5 100644 --- a/util/channel/Cargo.toml +++ b/util/channel/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-channel" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/constant/Cargo.toml b/util/constant/Cargo.toml index 7549f9914c..8f40462af2 100644 --- a/util/constant/Cargo.toml +++ b/util/constant/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-constant" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/crypto/Cargo.toml b/util/crypto/Cargo.toml index 2d57bb7469..18c0077d45 100644 --- a/util/crypto/Cargo.toml +++ b/util/crypto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-crypto" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc8" } +ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc9" } lazy_static = "1.3" secp256k1 = { version = "0.24", features = ["recovery"], optional = true } thiserror = "1.0.22" diff --git a/util/dao/Cargo.toml b/util/dao/Cargo.toml index a2b19cccc9..73dbe1b44e 100644 --- a/util/dao/Cargo.toml +++ b/util/dao/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-dao" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,13 +10,13 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../types", version = "= 0.111.0-rc8" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc8" } -ckb-dao-utils = { path = "./utils", version = "= 0.111.0-rc8" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc8" } +ckb-types = { path = "../types", version = "= 0.111.0-rc9" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc9" } +ckb-dao-utils = { path = "./utils", version = "= 0.111.0-rc9" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc9" } [dev-dependencies] -ckb-db = { path = "../../db", version = "= 0.111.0-rc8" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc8" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc8" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc9" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc9" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc9" } tempfile.workspace = true diff --git a/util/dao/utils/Cargo.toml b/util/dao/utils/Cargo.toml index 376db2274d..b53c5dc415 100644 --- a/util/dao/utils/Cargo.toml +++ b/util/dao/utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-dao-utils" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,5 +10,5 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../../types", version = "= 0.111.0-rc8" } -ckb-error = { path = "../../../error", version = "= 0.111.0-rc8" } +ckb-types = { path = "../../types", version = "= 0.111.0-rc9" } +ckb-error = { path = "../../../error", version = "= 0.111.0-rc9" } diff --git a/util/fixed-hash/Cargo.toml b/util/fixed-hash/Cargo.toml index 1caec14fea..08d99c8b58 100644 --- a/util/fixed-hash/Cargo.toml +++ b/util/fixed-hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-fixed-hash" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -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.111.0-rc8" } -ckb-fixed-hash-macros = { path = "macros", version = "= 0.111.0-rc8" } +ckb-fixed-hash-core = { path = "core", version = "= 0.111.0-rc9" } +ckb-fixed-hash-macros = { path = "macros", version = "= 0.111.0-rc9" } diff --git a/util/fixed-hash/core/Cargo.toml b/util/fixed-hash/core/Cargo.toml index 6522097ceb..0c9ba8b530 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.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/fixed-hash/macros/Cargo.toml b/util/fixed-hash/macros/Cargo.toml index 776d8df6d3..e8ddbbf099 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.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -12,7 +12,7 @@ repository = "https://github.com/nervosnetwork/ckb" proc-macro = true [dependencies] -ckb-fixed-hash-core = { path = "../core", version = "= 0.111.0-rc8" } +ckb-fixed-hash-core = { path = "../core", version = "= 0.111.0-rc9" } quote = "1.0" syn = "1.0" proc-macro2 = "1.0" diff --git a/util/hash/Cargo.toml b/util/hash/Cargo.toml index cfb408265b..0881058de6 100644 --- a/util/hash/Cargo.toml +++ b/util/hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-hash" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/indexer/Cargo.toml b/util/indexer/Cargo.toml index 9b24d3a973..00f08a45ee 100644 --- a/util/indexer/Cargo.toml +++ b/util/indexer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-indexer" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,15 +13,15 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] thiserror = "1.0" rocksdb = { package = "ckb-rocksdb", version ="=0.20.0", features = ["snappy"], default-features = false } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc8" } -ckb-types = { path = "../types", version = "= 0.111.0-rc8" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc8" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc8" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc8" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc8" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc8" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc8" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc8" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc9" } +ckb-types = { path = "../types", version = "= 0.111.0-rc9" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc9" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc9" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc9" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc9" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc9" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc9" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc9" } rhai = { version = "1.10.0", features = ["no_function", "no_float", "no_module", "sync"]} serde_json = "1.0" numext-fixed-uint = "0.1" diff --git a/util/instrument/Cargo.toml b/util/instrument/Cargo.toml index a1bda42237..d256e3ba2b 100644 --- a/util/instrument/Cargo.toml +++ b/util/instrument/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-instrument" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc8" } -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc8" } -ckb-chain-iter = { path = "../chain-iter", version = "= 0.111.0-rc8" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc8" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc8" } +ckb-types = { path = "../types", version = "= 0.111.0-rc9" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc9" } +ckb-chain-iter = { path = "../chain-iter", version = "= 0.111.0-rc9" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc9" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc9" } serde_json = "1.0" indicatif = { version = "0.16", optional = true } diff --git a/util/jsonrpc-types/Cargo.toml b/util/jsonrpc-types/Cargo.toml index d1c8694207..4bb32df999 100644 --- a/util/jsonrpc-types/Cargo.toml +++ b/util/jsonrpc-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-jsonrpc-types" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,7 +9,7 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc8" } +ckb-types = { path = "../types", version = "= 0.111.0-rc9" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" faster-hex = "0.6" diff --git a/util/launcher/Cargo.toml b/util/launcher/Cargo.toml index aafb19269a..0ae11adcae 100644 --- a/util/launcher/Cargo.toml +++ b/util/launcher/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-launcher" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,43 +11,43 @@ 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.111.0-rc8" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc8" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc8" } -ckb-migration-template = { path = "migration-template", version = "= 0.111.0-rc8" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc8" } -ckb-db-migration = { path = "../../db-migration", version = "= 0.111.0-rc8" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc8" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc8" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc8" } -ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc8" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc8" } -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc8" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc8" } -ckb-network = { path = "../../network", version = "= 0.111.0-rc8"} -ckb-rpc = { path = "../../rpc", version = "= 0.111.0-rc8"} -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc8"} -ckb-network-alert = { path = "../network-alert", version = "= 0.111.0-rc8" } -ckb-sync = { path = "../../sync", version = "= 0.111.0-rc8"} -ckb-verification = { path = "../../verification", version = "= 0.111.0-rc8" } -ckb-verification-traits = { path = "../../verification/traits", version = "= 0.111.0-rc8" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc8" } -ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc8" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc8" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc8" } -ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc8" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc8" } -ckb-snapshot = { path = "../snapshot", version = "= 0.111.0-rc8" } -ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc8" } -ckb-light-client-protocol-server = { path = "../light-client-protocol-server", version = "= 0.111.0-rc8" } -ckb-block-filter = { path = "../../block-filter", version = "= 0.111.0-rc8" } -ckb-hash = { path = "../hash", version = "= 0.111.0-rc8" } +ckb-types = { path = "../types", version = "= 0.111.0-rc9" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc9" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc9" } +ckb-migration-template = { path = "migration-template", version = "= 0.111.0-rc9" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc9" } +ckb-db-migration = { path = "../../db-migration", version = "= 0.111.0-rc9" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc9" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc9" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc9" } +ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc9" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc9" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc9" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc9" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc9"} +ckb-rpc = { path = "../../rpc", version = "= 0.111.0-rc9"} +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc9"} +ckb-network-alert = { path = "../network-alert", version = "= 0.111.0-rc9" } +ckb-sync = { path = "../../sync", version = "= 0.111.0-rc9"} +ckb-verification = { path = "../../verification", version = "= 0.111.0-rc9" } +ckb-verification-traits = { path = "../../verification/traits", version = "= 0.111.0-rc9" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc9" } +ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc9" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc9" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc9" } +ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc9" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc9" } +ckb-snapshot = { path = "../snapshot", version = "= 0.111.0-rc9" } +ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc9" } +ckb-light-client-protocol-server = { path = "../light-client-protocol-server", version = "= 0.111.0-rc9" } +ckb-block-filter = { path = "../../block-filter", version = "= 0.111.0-rc9" } +ckb-hash = { path = "../hash", version = "= 0.111.0-rc9" } num_cpus = "1.10" once_cell = "1.8.0" tempfile.workspace = true [dev-dependencies] -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc8", features = ["enable_faketime"] } +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc9", features = ["enable_faketime"] } [features] with_sentry = [ "ckb-sync/with_sentry", "ckb-network/with_sentry", "ckb-app-config/with_sentry" ] diff --git a/util/launcher/migration-template/Cargo.toml b/util/launcher/migration-template/Cargo.toml index dc8d17308f..c184dcbdaf 100644 --- a/util/launcher/migration-template/Cargo.toml +++ b/util/launcher/migration-template/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-migration-template" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/light-client-protocol-server/Cargo.toml b/util/light-client-protocol-server/Cargo.toml index 00fa1481ef..5cdda0e80c 100644 --- a/util/light-client-protocol-server/Cargo.toml +++ b/util/light-client-protocol-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-light-client-protocol-server" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,23 +9,23 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-network = { path = "../../network", version = "= 0.111.0-rc8" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc8" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc8" } -ckb-types = { path = "../types", version = "= 0.111.0-rc8" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc8" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc9" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc9" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc9" } +ckb-types = { path = "../types", version = "= 0.111.0-rc9" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc9" } ckb-merkle-mountain-range = "0.5.2" -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc8"} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc9"} [dev-dependencies] -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc8" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc8" } -ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc8" } -ckb-launcher = { path = "../launcher", version = "= 0.111.0-rc8" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc8" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc8" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc8" } -ckb-test-chain-utils = { path = "../test-chain-utils", version = "= 0.111.0-rc8" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc9" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc9" } +ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc9" } +ckb-launcher = { path = "../launcher", version = "= 0.111.0-rc9" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc9" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc9" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc9" } +ckb-test-chain-utils = { path = "../test-chain-utils", version = "= 0.111.0-rc9" } tempfile.workspace = true -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc8", features = ["enable_faketime"]} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc9", features = ["enable_faketime"]} tokio = "1.20" diff --git a/util/logger-config/Cargo.toml b/util/logger-config/Cargo.toml index 579aba7997..c2da029dc0 100644 --- a/util/logger-config/Cargo.toml +++ b/util/logger-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger-config" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/logger-service/Cargo.toml b/util/logger-service/Cargo.toml index 9986345cc9..325a3cda6b 100644 --- a/util/logger-service/Cargo.toml +++ b/util/logger-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger-service" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -9,9 +9,9 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-util = { path = "..", version = "= 0.111.0-rc8" } -ckb-logger-config = { path = "../logger-config", version = "= 0.111.0-rc8" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc8" } +ckb-util = { path = "..", version = "= 0.111.0-rc9" } +ckb-logger-config = { path = "../logger-config", version = "= 0.111.0-rc9" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc9" } yansi = "0.5" log = "0.4" env_logger = "0.6" @@ -22,7 +22,7 @@ sentry = { version = "0.26.0", optional = true, features = ["log"] } time = { version = "0.3.11", features = ["formatting"] } [dev-dependencies] -ckb-logger = { path = "../logger", version = "= 0.111.0-rc8" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc9" } tempfile.workspace = true [features] diff --git a/util/logger/Cargo.toml b/util/logger/Cargo.toml index 873faa7611..e7cccece0d 100644 --- a/util/logger/Cargo.toml +++ b/util/logger/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/memory-tracker/Cargo.toml b/util/memory-tracker/Cargo.toml index 6681beac50..a70290b403 100644 --- a/util/memory-tracker/Cargo.toml +++ b/util/memory-tracker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-memory-tracker" -version = "0.111.0-rc8" +version = "0.111.0-rc9" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc8" } -ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc8" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc8" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc9" } +ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc9" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc9" } [target.'cfg(all(not(target_env = "msvc"), not(target_os="macos")))'.dependencies] jemalloc-ctl = { package = "tikv-jemalloc-ctl", version = "0.5.0" } diff --git a/util/metrics-config/Cargo.toml b/util/metrics-config/Cargo.toml index eae191be78..39088886fc 100644 --- a/util/metrics-config/Cargo.toml +++ b/util/metrics-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics-config" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/metrics-service/Cargo.toml b/util/metrics-service/Cargo.toml index 7dd9ff098f..b597a73317 100644 --- a/util/metrics-service/Cargo.toml +++ b/util/metrics-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics-service" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-metrics-config = { path = "../metrics-config", version = "= 0.111.0-rc8" } -ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc8" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc8" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc8" } -ckb-util = { path = "..", version = "= 0.111.0-rc8" } +ckb-metrics-config = { path = "../metrics-config", version = "= 0.111.0-rc9" } +ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc9" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc9" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc9" } +ckb-util = { path = "..", version = "= 0.111.0-rc9" } prometheus = "0.13.3" hyper = { version = "0.14", features = ["http1", "tcp", "server"] } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc8" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc9" } diff --git a/util/metrics/Cargo.toml b/util/metrics/Cargo.toml index d57f0fb15c..1de844407c 100644 --- a/util/metrics/Cargo.toml +++ b/util/metrics/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/multisig/Cargo.toml b/util/multisig/Cargo.toml index e3948ead96..d13319b776 100644 --- a/util/multisig/Cargo.toml +++ b/util/multisig/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-multisig" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,9 +9,9 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-error = { path = "../../error", version = "= 0.111.0-rc8" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc8" } -ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc8" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc9" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc9" } +ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc9" } [dev-dependencies] rand = "0.7" diff --git a/util/network-alert/Cargo.toml b/util/network-alert/Cargo.toml index 4a3cfeaa99..9cf6d4e673 100644 --- a/util/network-alert/Cargo.toml +++ b/util/network-alert/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-network-alert" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,23 +9,23 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-multisig = { path = "../multisig", version = "= 0.111.0-rc8" } -ckb-types = { path = "../types", version = "= 0.111.0-rc8" } -ckb-util = { path = "..", version = "= 0.111.0-rc8" } -ckb-network = { path = "../../network", version = "= 0.111.0-rc8" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc8"} -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc8" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc8"} -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc8" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc8" } -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc8" } +ckb-multisig = { path = "../multisig", version = "= 0.111.0-rc9" } +ckb-types = { path = "../types", version = "= 0.111.0-rc9" } +ckb-util = { path = "..", version = "= 0.111.0-rc9" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc9" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc9"} +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc9" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc9"} +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc9" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc9" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc9" } lru = "0.7.1" semver = "1.0" [dev-dependencies] -ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc8" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc8" } +ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc9" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc9" } once_cell = "1.8.0" -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc8", features = ["enable_faketime"]} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc9", features = ["enable_faketime"]} faster-hex = "0.6" serde_json = "1.0" diff --git a/util/occupied-capacity/Cargo.toml b/util/occupied-capacity/Cargo.toml index 1d8e42d085..e62bdc753b 100644 --- a/util/occupied-capacity/Cargo.toml +++ b/util/occupied-capacity/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-occupied-capacity" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc8" } -ckb-occupied-capacity-core = { path = "core", version = "= 0.111.0-rc8" } +ckb-occupied-capacity-macros = { path = "macros", version = "= 0.111.0-rc9" } +ckb-occupied-capacity-core = { path = "core", version = "= 0.111.0-rc9" } diff --git a/util/occupied-capacity/core/Cargo.toml b/util/occupied-capacity/core/Cargo.toml index 0274f46dca..0a97ee5a11 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.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/occupied-capacity/macros/Cargo.toml b/util/occupied-capacity/macros/Cargo.toml index e8f5486160..19a6e20e8d 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.111.0-rc8" +version = "0.111.0-rc9" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -14,4 +14,4 @@ proc-macro = true [dependencies] quote = "1.0" syn = "1.0" -ckb-occupied-capacity-core = { path = "../core", version = "= 0.111.0-rc8" } +ckb-occupied-capacity-core = { path = "../core", version = "= 0.111.0-rc9" } diff --git a/util/proposal-table/Cargo.toml b/util/proposal-table/Cargo.toml index f247075aa5..fcab0fa8b5 100644 --- a/util/proposal-table/Cargo.toml +++ b/util/proposal-table/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-proposal-table" -version = "0.111.0-rc8" +version = "0.111.0-rc9" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc8" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc8" } -ckb-types = { path = "../types", version = "= 0.111.0-rc8" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc9" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc9" } +ckb-types = { path = "../types", version = "= 0.111.0-rc9" } diff --git a/util/rational/Cargo.toml b/util/rational/Cargo.toml index 525887229e..f86b25f915 100644 --- a/util/rational/Cargo.toml +++ b/util/rational/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-rational" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/reward-calculator/Cargo.toml b/util/reward-calculator/Cargo.toml index 05170377a6..d882ffc8b7 100644 --- a/util/reward-calculator/Cargo.toml +++ b/util/reward-calculator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-reward-calculator" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,15 +9,15 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc8" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc8" } -ckb-dao = { path = "../dao", version = "= 0.111.0-rc8" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc8" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc8" } -ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc8"} +ckb-types = { path = "../types", version = "= 0.111.0-rc9" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc9" } +ckb-dao = { path = "../dao", version = "= 0.111.0-rc9" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc9" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc9" } +ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc9"} [dev-dependencies] -ckb-db = { path = "../../db", version = "= 0.111.0-rc8" } -ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc8" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc8" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc9" } +ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc9" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc9" } tempfile.workspace = true diff --git a/util/runtime/Cargo.toml b/util/runtime/Cargo.toml index 0588089a23..31eff9a831 100644 --- a/util/runtime/Cargo.toml +++ b/util/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-async-runtime" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,5 +10,5 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] tokio = { version = "1", features = ["full"] } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc8" } -ckb-spawn = { path = "../spawn", version = "= 0.111.0-rc8" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc9" } +ckb-spawn = { path = "../spawn", version = "= 0.111.0-rc9" } diff --git a/util/rust-unstable-port/Cargo.toml b/util/rust-unstable-port/Cargo.toml index 26ab44ef30..6b3f29dc80 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.111.0-rc8" +version = "0.111.0-rc9" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" diff --git a/util/snapshot/Cargo.toml b/util/snapshot/Cargo.toml index 3b1eb848be..7bcddc9fd2 100644 --- a/util/snapshot/Cargo.toml +++ b/util/snapshot/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-snapshot" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,15 +11,15 @@ 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.111.0-rc8" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc8" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc8" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc8" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc8" } -ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc8" } +ckb-types = { path = "../types", version = "= 0.111.0-rc9" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc9" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc9" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc9" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc9" } +ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc9" } arc-swap = "1.3" -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc8" } -ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc8" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc9" } +ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc9" } ckb-merkle-mountain-range = "0.5.2" [features] diff --git a/util/spawn/Cargo.toml b/util/spawn/Cargo.toml index 79e32f5980..2d619bdf30 100644 --- a/util/spawn/Cargo.toml +++ b/util/spawn/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-spawn" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/stop-handler/Cargo.toml b/util/stop-handler/Cargo.toml index 2245ddfdcf..d70a36d1f0 100644 --- a/util/stop-handler/Cargo.toml +++ b/util/stop-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-stop-handler" -version = "0.111.0-rc8" +version = "0.111.0-rc9" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,12 +9,12 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../logger", version = "= 0.111.0-rc8" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc9" } tokio = { version = "1", features = ["sync", "rt-multi-thread"] } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc8" } -ckb-util = { path = "..", version = "= 0.111.0-rc8" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc9" } +ckb-util = { path = "..", version = "= 0.111.0-rc9" } once_cell = "1.8.0" -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc8" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc9" } tokio-util = "0.7.8" diff --git a/util/systemtime/Cargo.toml b/util/systemtime/Cargo.toml index b193a631c3..a4dbf8bf46 100644 --- a/util/systemtime/Cargo.toml +++ b/util/systemtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-systemtime" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/test-chain-utils/Cargo.toml b/util/test-chain-utils/Cargo.toml index 98b4685fc1..eb9cd2e4d8 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.111.0-rc8" +version = "0.111.0-rc9" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,18 +9,18 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = {path = "../types", version = "= 0.111.0-rc8"} -ckb-db = { path = "../../db", version = "= 0.111.0-rc8" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc8" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc8" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc8" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc8" } +ckb-types = {path = "../types", version = "= 0.111.0-rc9"} +ckb-db = { path = "../../db", version = "= 0.111.0-rc9" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc9" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc9" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc9" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc9" } lazy_static = "1.3.0" -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc8" } -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc8" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc8" } -ckb-util = { path = "..", version = "= 0.111.0-rc8" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc9" } +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc9" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc9" } +ckb-util = { path = "..", version = "= 0.111.0-rc9" } tempfile.workspace = true [dev-dependencies] -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc8", features = ["enable_faketime"] } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc9", features = ["enable_faketime"] } diff --git a/util/types/Cargo.toml b/util/types/Cargo.toml index 364e1e520e..7fe033eeec 100644 --- a/util/types/Cargo.toml +++ b/util/types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-types" -version = "0.111.0-rc8" +version = "0.111.0-rc9" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,17 +10,17 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] molecule = "=0.7.5" -ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc8" } +ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc9" } numext-fixed-uint = { version = "0.1", features = ["support_rand", "support_heapsize", "support_serde"] } bytes = { version="1", features = ["serde"] } merkle-cbt = "0.3" -ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc8" } -ckb-hash = { path = "../hash", version = "= 0.111.0-rc8" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc8" } -ckb-constant = { path = "../constant", version = "= 0.111.0-rc8" } +ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc9" } +ckb-hash = { path = "../hash", version = "= 0.111.0-rc9" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc9" } +ckb-constant = { path = "../constant", version = "= 0.111.0-rc9" } bit-vec = "0.6.3" -ckb-error = { path = "../../error", version = "= 0.111.0-rc8" } -ckb-rational = { path = "../rational", version = "= 0.111.0-rc8" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc9" } +ckb-rational = { path = "../rational", version = "= 0.111.0-rc9" } once_cell = "1.8.0" derive_more = { version = "0.99.0", default-features=false, features = ["display"] } ckb-merkle-mountain-range = "0.5.2" diff --git a/verification/Cargo.toml b/verification/Cargo.toml index 79aa455db1..283e2828d8 100644 --- a/verification/Cargo.toml +++ b/verification/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,20 +9,20 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } -ckb-script = { path = "../script", version = "= 0.111.0-rc8" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc8" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc8" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } +ckb-script = { path = "../script", version = "= 0.111.0-rc9" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc9" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc9" } lru = "0.7.1" -ckb-traits = { path = "../traits", version = "= 0.111.0-rc8" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc8" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc8" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc8" } -ckb-error = { path = "../error", version = "= 0.111.0-rc8" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc9" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc9" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc9" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc9" } +ckb-error = { path = "../error", version = "= 0.111.0-rc9" } derive_more = { version = "0.99.0", default-features=false, features = ["display"] } -ckb-verification-traits = { path = "./traits", version = "= 0.111.0-rc8" } +ckb-verification-traits = { path = "./traits", version = "= 0.111.0-rc9" } [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc8" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc8" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc8", features=["enable_faketime"]} +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc9" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc9" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc9", features=["enable_faketime"]} diff --git a/verification/contextual/Cargo.toml b/verification/contextual/Cargo.toml index 9ec2eadcc5..8737b8cc7d 100644 --- a/verification/contextual/Cargo.toml +++ b/verification/contextual/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification-contextual" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,27 +9,27 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../../util/types", version = "= 0.111.0-rc8" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc8" } -ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc8" } +ckb-types = { path = "../../util/types", version = "= 0.111.0-rc9" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc9" } +ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc9" } rayon = "1.0" -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc8" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc8" } -ckb-dao = { path = "../../util/dao", version = "= 0.111.0-rc8" } -ckb-dao-utils = { path = "../../util/dao/utils", version = "= 0.111.0-rc8" } -ckb-logger = {path = "../../util/logger", version = "= 0.111.0-rc8"} -ckb-reward-calculator= { path = "../../util/reward-calculator", version = "= 0.111.0-rc8" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc8" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc9" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc9" } +ckb-dao = { path = "../../util/dao", version = "= 0.111.0-rc9" } +ckb-dao-utils = { path = "../../util/dao/utils", version = "= 0.111.0-rc9" } +ckb-logger = {path = "../../util/logger", version = "= 0.111.0-rc9"} +ckb-reward-calculator= { path = "../../util/reward-calculator", version = "= 0.111.0-rc9" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc9" } tokio = { version = "1", features = ["sync", "rt-multi-thread"] } -ckb-async-runtime = { path = "../../util/runtime", version = "= 0.111.0-rc8" } -ckb-verification-traits = { path = "../traits", version = "= 0.111.0-rc8" } -ckb-verification = { path = "..", version = "= 0.111.0-rc8" } +ckb-async-runtime = { path = "../../util/runtime", version = "= 0.111.0-rc9" } +ckb-verification-traits = { path = "../traits", version = "= 0.111.0-rc9" } +ckb-verification = { path = "..", version = "= 0.111.0-rc9" } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc8" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc8" } -ckb-launcher = { path = "../../util/launcher", version = "= 0.111.0-rc8" } -ckb-test-chain-utils = { path = "../../util/test-chain-utils", version = "= 0.111.0-rc8" } -ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc8", features = ["enable_faketime"]} +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc9" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc9" } +ckb-launcher = { path = "../../util/launcher", version = "= 0.111.0-rc9" } +ckb-test-chain-utils = { path = "../../util/test-chain-utils", version = "= 0.111.0-rc9" } +ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc9", features = ["enable_faketime"]} rand = "0.7" diff --git a/verification/traits/Cargo.toml b/verification/traits/Cargo.toml index 74fb2891f5..cb8c0b1f4b 100644 --- a/verification/traits/Cargo.toml +++ b/verification/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification-traits" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,4 +10,4 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] bitflags = "1.0" -ckb-error = { path = "../../error", version = "= 0.111.0-rc8" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc9" } diff --git a/wasm-build-test/Cargo.toml b/wasm-build-test/Cargo.toml index 8dbf644ca9..1a25506ff6 100644 --- a/wasm-build-test/Cargo.toml +++ b/wasm-build-test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-wasm-test" -version = "0.111.0-rc8" +version = "0.111.0-rc9" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,8 +9,8 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc8" } -ckb-script = { path = "../script", version = "= 0.111.0-rc8", default-features = false, features = [] } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } +ckb-script = { path = "../script", version = "= 0.111.0-rc9", default-features = false, features = [] } # Prevent this from interfering with workspaces [workspace] From ee5499c29a941a825a9d95c40e3ee48135a75d64 Mon Sep 17 00:00:00 2001 From: ian Date: Wed, 16 Aug 2023 20:34:18 +0800 Subject: [PATCH 071/125] chore: add script for release chores --- devtools/release/release-pkg.sh | 36 +++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100755 devtools/release/release-pkg.sh diff --git a/devtools/release/release-pkg.sh b/devtools/release/release-pkg.sh new file mode 100755 index 0000000000..f1063f2000 --- /dev/null +++ b/devtools/release/release-pkg.sh @@ -0,0 +1,36 @@ +#!/usr/bin/env bash + +on_push_pkg() { + BRANCH=$(git symbolic-ref --quiet HEAD) + BRANCH="${BRANCH#refs/heads/}" + VERSION="v$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml)" + echo "$BRANCH -> upstream/$BRANCH" + echo "$BRANCH -> upstream/pkg/$VERSION" + + git push upstream "$BRANCH" "$BRANCH:pkg/$VERSION" +} + +on_tag() { + VERSION="v$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml)" + git tag -s -m "$VERSION" "$VERSION" +} + +on_push_tag() { + VERSION="v$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml)" + git push upstream "$VERSION" +} + +case "${1:-help}" in +push-pkg) + on_push_pkg + ;; +tag) + on_tag + ;; +push-tag) + on_push_tag + ;; +*) + echo "$0 push-pkg|tag|push-tag" + ;; +esac From 229b45582dbec61674befcaa7a56f3b704bb4e37 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Thu, 20 Jul 2023 15:37:46 +0800 Subject: [PATCH 072/125] Fix `FeeOfMultipleMaxBlockProposalsLimit` failed --- tx-pool/src/chunk_process.rs | 14 +- tx-pool/src/process.rs | 13 +- tx-pool/src/util.rs | 24 +- util/types/src/core/error.rs | 8 + .../src/contextual_block_verifier.rs | 21 +- verification/src/lib.rs | 2 +- .../src/tests/transaction_verifier.rs | 223 +++++++++++++++++- verification/src/transaction_verifier.rs | 92 +++++++- 8 files changed, 371 insertions(+), 26 deletions(-) diff --git a/tx-pool/src/chunk_process.rs b/tx-pool/src/chunk_process.rs index 73e4f246eb..889ce916f6 100644 --- a/tx-pool/src/chunk_process.rs +++ b/tx-pool/src/chunk_process.rs @@ -15,8 +15,9 @@ use ckb_types::{ use ckb_verification::cache::TxVerificationCache; use ckb_verification::{ cache::{CacheEntry, Completed}, - ContextualWithoutScriptTransactionVerifier, ScriptError, ScriptVerifier, ScriptVerifyResult, - ScriptVerifyState, TimeRelativeTransactionVerifier, TransactionSnapshot, TxVerifyEnv, + ContextualWithoutScriptTransactionVerifier, DaoScriptSizeVerifier, ScriptError, ScriptVerifier, + ScriptVerifyResult, ScriptVerifyState, TimeRelativeTransactionVerifier, TransactionSnapshot, + TxVerifyEnv, }; use std::sync::Arc; use tokio::sync::watch; @@ -275,6 +276,15 @@ impl ChunkProcess { Arc::clone(&tx_env), ) .verify() + .and_then(|result| { + DaoScriptSizeVerifier::new( + Arc::clone(&rtx), + consensus.dao_type_hash(), + data_loader.clone(), + ) + .verify()?; + Ok(result) + }) .map_err(Reject::Verification); let fee = try_or_return_with_snapshot!(ret, snapshot); diff --git a/tx-pool/src/process.rs b/tx-pool/src/process.rs index b5062b3b35..b868de686e 100644 --- a/tx-pool/src/process.rs +++ b/tx-pool/src/process.rs @@ -25,8 +25,8 @@ use ckb_types::{ use ckb_util::LinkedHashSet; use ckb_verification::{ cache::{CacheEntry, Completed}, - ContextualTransactionVerifier, ScriptVerifyResult, TimeRelativeTransactionVerifier, - TxVerifyEnv, + ContextualTransactionVerifier, DaoScriptSizeVerifier, ScriptVerifyResult, + TimeRelativeTransactionVerifier, TxVerifyEnv, }; use std::collections::HashSet; use std::collections::{HashMap, VecDeque}; @@ -603,6 +603,15 @@ impl TxPoolService { match ret { ScriptVerifyResult::Completed(cycles) => { + if let Err(e) = DaoScriptSizeVerifier::new( + Arc::clone(&rtx), + self.consensus.dao_type_hash(), + snapshot.as_data_loader(), + ) + .verify() + { + return Err(Reject::Verification(e)); + } if let Some((declared, _)) = remote { if declared != cycles { return Err(Reject::DeclaredWrongCycles(declared, cycles)); diff --git a/tx-pool/src/util.rs b/tx-pool/src/util.rs index b4d6c3b5d5..a330d2f058 100644 --- a/tx-pool/src/util.rs +++ b/tx-pool/src/util.rs @@ -11,7 +11,7 @@ use ckb_types::core::{ }; use ckb_verification::{ cache::{CacheEntry, Completed}, - ContextualTransactionVerifier, NonContextualTransactionVerifier, + ContextualTransactionVerifier, DaoScriptSizeVerifier, NonContextualTransactionVerifier, TimeRelativeTransactionVerifier, TxVerifyEnv, }; use std::sync::Arc; @@ -93,15 +93,33 @@ pub(crate) fn verify_rtx( .map_err(Reject::Verification) } CacheEntry::Suspended(suspended) => { - ContextualTransactionVerifier::new(rtx, consensus, data_loader, tx_env) + ContextualTransactionVerifier::new(Arc::clone(&rtx), consensus, data_loader, tx_env) .complete(max_tx_verify_cycles, false, &suspended.snap) + .and_then(|result| { + DaoScriptSizeVerifier::new( + rtx, + snapshot.cloned_consensus().dao_type_hash(), + snapshot.as_data_loader(), + ) + .verify()?; + Ok(result) + }) .map_err(Reject::Verification) } } } else { block_in_place(|| { - ContextualTransactionVerifier::new(rtx, consensus, data_loader, tx_env) + ContextualTransactionVerifier::new(Arc::clone(&rtx), consensus, data_loader, tx_env) .verify(max_tx_verify_cycles, false) + .and_then(|result| { + DaoScriptSizeVerifier::new( + rtx, + snapshot.cloned_consensus().dao_type_hash(), + snapshot.as_data_loader(), + ) + .verify()?; + Ok(result) + }) .map_err(Reject::Verification) }) } diff --git a/util/types/src/core/error.rs b/util/types/src/core/error.rs index 1bd60e0d6d..e489151937 100644 --- a/util/types/src/core/error.rs +++ b/util/types/src/core/error.rs @@ -175,6 +175,13 @@ pub enum TransactionError { feature: &'static str, }, + /// Nervos DAO lock size mismatch. + #[error("The lock script size of deposit cell at index {} does not match the withdrawing cell at the same index", index)] + DaoLockSizeMismatch { + /// The index of mismatched DAO cells. + index: usize, + }, + /// The internal error. #[error("Internal: {description}, this error shouldn't happen, please report this bug to developers.")] Internal { @@ -202,6 +209,7 @@ impl TransactionError { | TransactionError::CellbaseImmaturity { .. } | TransactionError::MismatchedVersion { .. } | TransactionError::Compatible { .. } + | TransactionError::DaoLockSizeMismatch { .. } | TransactionError::Internal { .. } => false, } } diff --git a/verification/contextual/src/contextual_block_verifier.rs b/verification/contextual/src/contextual_block_verifier.rs index 15d41e4075..a3ed5c002c 100644 --- a/verification/contextual/src/contextual_block_verifier.rs +++ b/verification/contextual/src/contextual_block_verifier.rs @@ -27,7 +27,7 @@ use ckb_verification::cache::{ }; use ckb_verification::{ BlockErrorKind, CellbaseError, CommitError, ContextualTransactionVerifier, - TimeRelativeTransactionVerifier, UnknownParentError, + DaoScriptSizeVerifier, TimeRelativeTransactionVerifier, UnknownParentError, }; use ckb_verification::{BlockTransactionsError, EpochError, TxVerifyEnv}; use ckb_verification_traits::Switch; @@ -327,25 +327,28 @@ impl<'a, 'b, 'c, CS: ChainStore + VersionbitsIndexer> DaoHeaderVerifier<'a, 'b, } } -struct BlockTxsVerifier<'a, CS> { +struct BlockTxsVerifier<'a, 'b, CS> { context: VerifyContext, header: HeaderView, handle: &'a Handle, txs_verify_cache: &'a Arc>, + parent: &'b HeaderView, } -impl<'a, CS: ChainStore + VersionbitsIndexer + 'static> BlockTxsVerifier<'a, CS> { +impl<'a, 'b, CS: ChainStore + VersionbitsIndexer + 'static> BlockTxsVerifier<'a, 'b, CS> { pub fn new( context: VerifyContext, header: HeaderView, handle: &'a Handle, txs_verify_cache: &'a Arc>, + parent: &'b HeaderView, ) -> Self { BlockTxsVerifier { context, header, handle, txs_verify_cache, + parent, } } @@ -465,7 +468,16 @@ impl<'a, CS: ChainStore + VersionbitsIndexer + 'static> BlockTxsVerifier<'a, CS> .into() }) .map(|completed| (tx_hash, completed)) - } + }.and_then(|result| { + if self.context.versionbits_active(DeploymentPos::LightClient, self.parent) { + DaoScriptSizeVerifier::new( + Arc::clone(tx), + self.context.consensus.dao_type_hash(), + self.context.store.as_data_loader(), + ).verify()?; + } + Ok(result) + }) }) .skip(1) // skip cellbase tx .collect::, Error>>()?; @@ -697,6 +709,7 @@ impl<'a, CS: ChainStore + VersionbitsIndexer + 'static, MS: MMRStore Option { + None + } + + fn get_cell_data_hash(&self, _out_point: &OutPoint) -> Option { + None + } +} + +#[test] +fn test_dao_disables_different_lock_script_size() { + let dao_type_script = build_genesis_type_id_script(OUTPUT_INDEX_DAO); + let transaction = TransactionBuilder::default() + .outputs(vec![ + CellOutput::new_builder() + .capacity(capacity_bytes!(50).pack()) + .build(), + CellOutput::new_builder() + .capacity(capacity_bytes!(200).pack()) + .lock( + Script::new_builder() + .args(Bytes::from(vec![1; 20]).pack()) + .build(), + ) + .type_(Some(dao_type_script.clone()).pack()) + .build(), + ]) + .outputs_data(vec![Bytes::new().pack(); 2]) + .build(); + + let rtx = Arc::new(ResolvedTransaction { + transaction, + resolved_cell_deps: Vec::new(), + resolved_inputs: vec![ + CellMetaBuilder::from_cell_output( + CellOutput::new_builder() + .capacity(capacity_bytes!(50).pack()) + .build(), + Bytes::new(), + ) + .build(), + CellMetaBuilder::from_cell_output( + CellOutput::new_builder() + .capacity(capacity_bytes!(201).pack()) + .lock(Script::new_builder().args(Bytes::new().pack()).build()) + .type_(Some(dao_type_script.clone()).pack()) + .build(), + Bytes::from(vec![0; 8]), + ) + .build(), + ], + resolved_dep_groups: vec![], + }); + let verifier = + DaoScriptSizeVerifier::new(rtx, Some(dao_type_script.code_hash()), EmptyDataProvider {}); + + assert_error_eq!( + verifier.verify().unwrap_err(), + TransactionError::DaoLockSizeMismatch { index: 1 }, + ); +} + +#[test] +fn test_non_dao_allows_lock_script_size() { + let dao_type_script = build_genesis_type_id_script(OUTPUT_INDEX_DAO); + let transaction = TransactionBuilder::default() + .outputs(vec![ + CellOutput::new_builder() + .capacity(capacity_bytes!(50).pack()) + .build(), + CellOutput::new_builder() + .capacity(capacity_bytes!(200).pack()) + .lock( + Script::new_builder() + .args(Bytes::from(vec![1; 20]).pack()) + .build(), + ) + .build(), + ]) + .outputs_data(vec![Bytes::new().pack(); 2]) + .build(); + + let rtx = Arc::new(ResolvedTransaction { + transaction, + resolved_cell_deps: Vec::new(), + resolved_inputs: vec![ + CellMetaBuilder::from_cell_output( + CellOutput::new_builder() + .capacity(capacity_bytes!(50).pack()) + .build(), + Bytes::new(), + ) + .build(), + CellMetaBuilder::from_cell_output( + CellOutput::new_builder() + .capacity(capacity_bytes!(201).pack()) + .lock(Script::new_builder().args(Bytes::new().pack()).build()) + .build(), + Bytes::from(vec![0; 8]), + ) + .build(), + ], + resolved_dep_groups: vec![], + }); + let verifier = + DaoScriptSizeVerifier::new(rtx, Some(dao_type_script.code_hash()), EmptyDataProvider {}); + + assert!(verifier.verify().is_ok()); +} + +#[test] +fn test_dao_allows_different_lock_script_size_in_withdraw_phase_2() { + let dao_type_script = build_genesis_type_id_script(OUTPUT_INDEX_DAO); + let transaction = TransactionBuilder::default() + .outputs(vec![ + CellOutput::new_builder() + .capacity(capacity_bytes!(50).pack()) + .build(), + CellOutput::new_builder() + .capacity(capacity_bytes!(200).pack()) + .lock( + Script::new_builder() + .args(Bytes::from(vec![1; 20]).pack()) + .build(), + ) + .type_(Some(dao_type_script.clone()).pack()) + .build(), + ]) + .outputs_data(vec![Bytes::new().pack(); 2]) + .build(); + + let rtx = Arc::new(ResolvedTransaction { + transaction, + resolved_cell_deps: Vec::new(), + resolved_inputs: vec![ + CellMetaBuilder::from_cell_output( + CellOutput::new_builder() + .capacity(capacity_bytes!(50).pack()) + .build(), + Bytes::new(), + ) + .build(), + CellMetaBuilder::from_cell_output( + CellOutput::new_builder() + .capacity(capacity_bytes!(201).pack()) + .lock(Script::new_builder().args(Bytes::new().pack()).build()) + .type_(Some(dao_type_script.clone()).pack()) + .build(), + Bytes::from(vec![1; 8]), + ) + .build(), + ], + resolved_dep_groups: vec![], + }); + let verifier = + DaoScriptSizeVerifier::new(rtx, Some(dao_type_script.code_hash()), EmptyDataProvider {}); + + assert!(verifier.verify().is_ok()); +} + +#[test] +fn test_dao_allows_different_lock_script_size_using_normal_cells_in_withdraw_phase_2() { + let dao_type_script = build_genesis_type_id_script(OUTPUT_INDEX_DAO); + let transaction = TransactionBuilder::default() + .outputs(vec![ + CellOutput::new_builder() + .capacity(capacity_bytes!(50).pack()) + .build(), + CellOutput::new_builder() + .capacity(capacity_bytes!(200).pack()) + .lock( + Script::new_builder() + .args(Bytes::from(vec![1; 20]).pack()) + .build(), + ) + .type_(Some(dao_type_script.clone()).pack()) + .build(), + ]) + .outputs_data(vec![]) + .build(); + + let rtx = Arc::new(ResolvedTransaction { + transaction, + resolved_cell_deps: Vec::new(), + resolved_inputs: vec![ + CellMetaBuilder::from_cell_output( + CellOutput::new_builder() + .capacity(capacity_bytes!(50).pack()) + .build(), + Bytes::new(), + ) + .build(), + CellMetaBuilder::from_cell_output( + CellOutput::new_builder() + .capacity(capacity_bytes!(201).pack()) + .lock(Script::new_builder().args(Bytes::new().pack()).build()) + .build(), + Bytes::from(vec![1; 8]), + ) + .build(), + ], + resolved_dep_groups: vec![], + }); + let verifier = + DaoScriptSizeVerifier::new(rtx, Some(dao_type_script.code_hash()), EmptyDataProvider {}); + + assert!(verifier.verify().is_ok()); +} diff --git a/verification/src/transaction_verifier.rs b/verification/src/transaction_verifier.rs index 8c4e11e734..22468e862a 100644 --- a/verification/src/transaction_verifier.rs +++ b/verification/src/transaction_verifier.rs @@ -14,7 +14,7 @@ use ckb_types::{ cell::{CellMeta, ResolvedTransaction}, Capacity, Cycle, EpochNumberWithFraction, ScriptHashType, TransactionView, Version, }, - packed::Byte32, + packed::{Byte32, CellOutput}, prelude::*, }; use std::collections::HashSet; @@ -585,20 +585,25 @@ impl CapacityVerifier { .resolved_inputs .iter() .any(|cell_meta| { - cell_meta - .cell_output - .type_() - .to_opt() - .map(|t| { - Into::::into(t.hash_type()) == Into::::into(ScriptHashType::Type) - && &t.code_hash() - == self.dao_type_hash.as_ref().expect("No dao system cell") - }) - .unwrap_or(false) + cell_uses_dao_type_script( + &cell_meta.cell_output, + self.dao_type_hash.as_ref().expect("No dao system cell"), + ) }) } } +fn cell_uses_dao_type_script(cell_output: &CellOutput, dao_type_hash: &Byte32) -> bool { + cell_output + .type_() + .to_opt() + .map(|t| { + Into::::into(t.hash_type()) == Into::::into(ScriptHashType::Type) + && &t.code_hash() == dao_type_hash + }) + .unwrap_or(false) +} + const LOCK_TYPE_FLAG: u64 = 1 << 63; const METRIC_TYPE_FLAG_MASK: u64 = 0x6000_0000_0000_0000; const VALUE_MASK: u64 = 0x00ff_ffff_ffff_ffff; @@ -962,3 +967,68 @@ where Ok(fee) } } + +/// Verifies that deposit cell and withdrawing cell in Nervos DAO use same sized lock scripts. +/// It provides a temporary solution till Nervos DAO script can be properly upgraded. +pub struct DaoScriptSizeVerifier
{ + resolved_transaction: Arc, + // It's Option because genesis block might not always have dao system cell + dao_type_hash: Option, + data_loader: DL, +} + +impl DaoScriptSizeVerifier
{ + /// Create a new `DaoScriptSizeVerifier` + pub fn new( + resolved_transaction: Arc, + dao_type_hash: Option, + data_loader: DL, + ) -> Self { + DaoScriptSizeVerifier { + resolved_transaction, + dao_type_hash, + data_loader, + } + } + + /// Verifies that for all Nervos DAO transactions, withdrawing cells must use lock scripts + /// of the same size as corresponding deposit cells + pub fn verify(&self) -> Result<(), Error> { + if self.dao_type_hash.is_none() { + return Ok(()); + } + let dao_type_hash = self.dao_type_hash.as_ref().unwrap(); + for (i, (input_meta, cell_output)) in self + .resolved_transaction + .resolved_inputs + .iter() + .zip(self.resolved_transaction.transaction.outputs()) + .enumerate() + { + // Both the input and output cell must use Nervos DAO as type script + if !(cell_uses_dao_type_script(&input_meta.cell_output, dao_type_hash) + && cell_uses_dao_type_script(&cell_output, dao_type_hash)) + { + continue; + } + + // A Nervos DAO deposit cell must have input data + let input_data = match self.data_loader.load_cell_data(input_meta) { + Some(data) => data, + None => continue, + }; + + // Only input data with full zeros are counted as deposit cell + if input_data.into_iter().any(|b| b != 0) { + continue; + } + + // Now we have a pair of DAO deposit and withdrawing cells, it is expected + // they have the lock scripts of the same size. + if input_meta.cell_output.lock().total_size() != cell_output.lock().total_size() { + return Err((TransactionError::DaoLockSizeMismatch { index: i }).into()); + } + } + Ok(()) + } +} From be04952e971cf23756b4ff958a490f892f8643b2 Mon Sep 17 00:00:00 2001 From: ian Date: Thu, 17 Aug 2023 10:39:35 +0800 Subject: [PATCH 073/125] chore: bump to v0.111.0-rc10 --- Cargo.lock | 136 +++++++++---------- Cargo.toml | 8 +- README.md | 2 +- benches/Cargo.toml | 36 ++--- block-filter/Cargo.toml | 14 +- chain/Cargo.toml | 52 +++---- ckb-bin/Cargo.toml | 48 +++---- db-migration/Cargo.toml | 12 +- db-schema/Cargo.toml | 2 +- db/Cargo.toml | 10 +- error/Cargo.toml | 4 +- freezer/Cargo.toml | 12 +- miner/Cargo.toml | 20 +-- network/Cargo.toml | 22 +-- notify/Cargo.toml | 12 +- pow/Cargo.toml | 6 +- resource/Cargo.toml | 6 +- rpc/Cargo.toml | 60 ++++---- script/Cargo.toml | 24 ++-- script/fuzz/Cargo.toml | 10 +- shared/Cargo.toml | 36 ++--- spec/Cargo.toml | 26 ++-- store/Cargo.toml | 20 +-- sync/Cargo.toml | 56 ++++---- test/Cargo.toml | 40 +++--- traits/Cargo.toml | 4 +- tx-pool/Cargo.toml | 44 +++--- util/Cargo.toml | 4 +- util/app-config/Cargo.toml | 24 ++-- util/build-info/Cargo.toml | 2 +- util/chain-iter/Cargo.toml | 6 +- util/channel/Cargo.toml | 2 +- util/constant/Cargo.toml | 2 +- util/crypto/Cargo.toml | 4 +- util/dao/Cargo.toml | 16 +-- util/dao/utils/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/indexer/Cargo.toml | 20 +-- util/instrument/Cargo.toml | 12 +- util/jsonrpc-types/Cargo.toml | 4 +- util/launcher/Cargo.toml | 66 ++++----- util/launcher/migration-template/Cargo.toml | 2 +- util/light-client-protocol-server/Cargo.toml | 32 ++--- util/logger-config/Cargo.toml | 2 +- util/logger-service/Cargo.toml | 10 +- util/logger/Cargo.toml | 2 +- util/memory-tracker/Cargo.toml | 8 +- util/metrics-config/Cargo.toml | 2 +- util/metrics-service/Cargo.toml | 14 +- util/metrics/Cargo.toml | 2 +- util/multisig/Cargo.toml | 8 +- util/network-alert/Cargo.toml | 28 ++-- 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 | 20 +-- util/runtime/Cargo.toml | 6 +- util/rust-unstable-port/Cargo.toml | 2 +- util/snapshot/Cargo.toml | 18 +-- util/spawn/Cargo.toml | 2 +- util/stop-handler/Cargo.toml | 10 +- util/systemtime/Cargo.toml | 2 +- util/test-chain-utils/Cargo.toml | 24 ++-- util/types/Cargo.toml | 16 +-- verification/Cargo.toml | 28 ++-- verification/contextual/Cargo.toml | 38 +++--- verification/traits/Cargo.toml | 4 +- wasm-build-test/Cargo.toml | 6 +- 73 files changed, 606 insertions(+), 606 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 32de81b580..1ef3c681b9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -395,7 +395,7 @@ dependencies = [ [[package]] name = "ckb" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-bin", "ckb-build-info", @@ -404,7 +404,7 @@ dependencies = [ [[package]] name = "ckb-app-config" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-build-info", "ckb-chain-spec", @@ -433,7 +433,7 @@ dependencies = [ [[package]] name = "ckb-async-runtime" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-logger", "ckb-spawn", @@ -442,7 +442,7 @@ dependencies = [ [[package]] name = "ckb-benches" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-app-config", "ckb-chain", @@ -470,7 +470,7 @@ dependencies = [ [[package]] name = "ckb-bin" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "base64", "ckb-app-config", @@ -511,7 +511,7 @@ dependencies = [ [[package]] name = "ckb-block-filter" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-async-runtime", "ckb-logger", @@ -523,11 +523,11 @@ dependencies = [ [[package]] name = "ckb-build-info" -version = "0.111.0-rc9" +version = "0.111.0-rc10" [[package]] name = "ckb-chain" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -561,7 +561,7 @@ dependencies = [ [[package]] name = "ckb-chain-iter" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-store", "ckb-types", @@ -569,7 +569,7 @@ dependencies = [ [[package]] name = "ckb-chain-spec" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-constant", "ckb-crypto", @@ -589,18 +589,18 @@ dependencies = [ [[package]] name = "ckb-channel" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "crossbeam-channel", ] [[package]] name = "ckb-constant" -version = "0.111.0-rc9" +version = "0.111.0-rc10" [[package]] name = "ckb-crypto" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-fixed-hash", "faster-hex", @@ -612,7 +612,7 @@ dependencies = [ [[package]] name = "ckb-dao" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "byteorder", "ckb-chain-spec", @@ -627,7 +627,7 @@ dependencies = [ [[package]] name = "ckb-dao-utils" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "byteorder", "ckb-error", @@ -636,7 +636,7 @@ dependencies = [ [[package]] name = "ckb-db" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-app-config", "ckb-db-schema", @@ -649,7 +649,7 @@ dependencies = [ [[package]] name = "ckb-db-migration" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-app-config", "ckb-db", @@ -663,11 +663,11 @@ dependencies = [ [[package]] name = "ckb-db-schema" -version = "0.111.0-rc9" +version = "0.111.0-rc10" [[package]] name = "ckb-error" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "anyhow", "ckb-occupied-capacity", @@ -677,7 +677,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-fixed-hash-core", "ckb-fixed-hash-macros", @@ -685,7 +685,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-core" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "faster-hex", "serde", @@ -695,7 +695,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-macros" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-fixed-hash-core", "proc-macro2", @@ -705,7 +705,7 @@ dependencies = [ [[package]] name = "ckb-freezer" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-error", "ckb-logger", @@ -721,7 +721,7 @@ dependencies = [ [[package]] name = "ckb-hash" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "blake2b-ref", "blake2b-rs", @@ -729,7 +729,7 @@ dependencies = [ [[package]] name = "ckb-indexer" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -751,7 +751,7 @@ dependencies = [ [[package]] name = "ckb-instrument" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-chain", "ckb-chain-iter", @@ -764,7 +764,7 @@ dependencies = [ [[package]] name = "ckb-jsonrpc-types" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-types", "faster-hex", @@ -777,7 +777,7 @@ dependencies = [ [[package]] name = "ckb-launcher" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -832,7 +832,7 @@ dependencies = [ [[package]] name = "ckb-light-client-protocol-server" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-app-config", "ckb-chain", @@ -855,14 +855,14 @@ dependencies = [ [[package]] name = "ckb-logger" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "log", ] [[package]] name = "ckb-logger-config" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "serde", "toml", @@ -870,7 +870,7 @@ dependencies = [ [[package]] name = "ckb-logger-service" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "backtrace", "ckb-channel", @@ -889,7 +889,7 @@ dependencies = [ [[package]] name = "ckb-memory-tracker" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-db", "ckb-logger", @@ -911,7 +911,7 @@ dependencies = [ [[package]] name = "ckb-metrics" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "once_cell", "prometheus", @@ -920,14 +920,14 @@ dependencies = [ [[package]] name = "ckb-metrics-config" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "serde", ] [[package]] name = "ckb-metrics-service" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-async-runtime", "ckb-logger", @@ -941,7 +941,7 @@ dependencies = [ [[package]] name = "ckb-migration-template" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "quote", "syn", @@ -949,7 +949,7 @@ dependencies = [ [[package]] name = "ckb-miner" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "base64", "ckb-app-config", @@ -978,7 +978,7 @@ dependencies = [ [[package]] name = "ckb-multisig" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-crypto", "ckb-error", @@ -988,7 +988,7 @@ dependencies = [ [[package]] name = "ckb-network" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "bitflags", "bloom-filters", @@ -1026,7 +1026,7 @@ dependencies = [ [[package]] name = "ckb-network-alert" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1049,7 +1049,7 @@ dependencies = [ [[package]] name = "ckb-notify" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1061,7 +1061,7 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-occupied-capacity-core", "ckb-occupied-capacity-macros", @@ -1069,14 +1069,14 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity-core" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "serde", ] [[package]] name = "ckb-occupied-capacity-macros" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-occupied-capacity-core", "quote", @@ -1085,7 +1085,7 @@ dependencies = [ [[package]] name = "ckb-pow" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "byteorder", "ckb-hash", @@ -1097,7 +1097,7 @@ dependencies = [ [[package]] name = "ckb-proposal-table" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-chain-spec", "ckb-logger", @@ -1106,7 +1106,7 @@ dependencies = [ [[package]] name = "ckb-rational" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "numext-fixed-uint", "proptest", @@ -1115,7 +1115,7 @@ dependencies = [ [[package]] name = "ckb-resource" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-system-scripts", "ckb-types", @@ -1129,7 +1129,7 @@ dependencies = [ [[package]] name = "ckb-reward-calculator" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-chain-spec", "ckb-dao", @@ -1156,7 +1156,7 @@ dependencies = [ [[package]] name = "ckb-rpc" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-app-config", "ckb-chain", @@ -1205,14 +1205,14 @@ dependencies = [ [[package]] name = "ckb-rust-unstable-port" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "is_sorted", ] [[package]] name = "ckb-script" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "byteorder", "ckb-chain-spec", @@ -1237,7 +1237,7 @@ dependencies = [ [[package]] name = "ckb-shared" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "arc-swap", "ckb-async-runtime", @@ -1260,7 +1260,7 @@ dependencies = [ [[package]] name = "ckb-snapshot" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "arc-swap", "ckb-chain-spec", @@ -1276,11 +1276,11 @@ dependencies = [ [[package]] name = "ckb-spawn" -version = "0.111.0-rc9" +version = "0.111.0-rc10" [[package]] name = "ckb-stop-handler" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-async-runtime", "ckb-channel", @@ -1296,7 +1296,7 @@ dependencies = [ [[package]] name = "ckb-store" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -1314,7 +1314,7 @@ dependencies = [ [[package]] name = "ckb-sync" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "bitflags", "ckb-app-config", @@ -1372,11 +1372,11 @@ dependencies = [ [[package]] name = "ckb-systemtime" -version = "0.111.0-rc9" +version = "0.111.0-rc10" [[package]] name = "ckb-test-chain-utils" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-chain-spec", "ckb-dao-utils", @@ -1394,14 +1394,14 @@ dependencies = [ [[package]] name = "ckb-traits" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-types", ] [[package]] name = "ckb-tx-pool" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1438,7 +1438,7 @@ dependencies = [ [[package]] name = "ckb-types" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "bit-vec", "bytes 1.4.0", @@ -1462,7 +1462,7 @@ dependencies = [ [[package]] name = "ckb-util" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-fixed-hash", "linked-hash-map", @@ -1473,7 +1473,7 @@ dependencies = [ [[package]] name = "ckb-verification" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-chain-spec", "ckb-dao", @@ -1493,7 +1493,7 @@ dependencies = [ [[package]] name = "ckb-verification-contextual" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "ckb-async-runtime", "ckb-chain", @@ -1520,7 +1520,7 @@ dependencies = [ [[package]] name = "ckb-verification-traits" -version = "0.111.0-rc9" +version = "0.111.0-rc10" dependencies = [ "bitflags", "ckb-error", diff --git a/Cargo.toml b/Cargo.toml index 6587bbb8b8..5fa0353291 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,11 +11,11 @@ repository = "https://github.com/nervosnetwork/ckb" rust-version = "1.67.1" [build-dependencies] -ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc9" } +ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc10" } [dependencies] -ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc9" } -ckb-bin = { path = "ckb-bin", version = "= 0.111.0-rc9" } +ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc10" } +ckb-bin = { path = "ckb-bin", version = "= 0.111.0-rc10" } [dev-dependencies] diff --git a/README.md b/README.md index 2ccc6398aa..af9ca15fa8 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.111.0--rc9-orange.svg)](https://github.com/nervosnetwork/ckb/releases) +[![Version](https://img.shields.io/badge/version-0.111.0--rc10-orange.svg)](https://github.com/nervosnetwork/ckb/releases) [![Nervos Talk](https://img.shields.io/badge/discuss-on%20Nervos%20Talk-3CC68A.svg)](https://talk.nervos.org/t/where-to-discuss-ckb-and-how-to-ask-for-support/6024) master | develop diff --git a/benches/Cargo.toml b/benches/Cargo.toml index 23d1ae05b6..7486da3b67 100644 --- a/benches/Cargo.toml +++ b/benches/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-benches" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,26 +13,26 @@ repository = "https://github.com/nervosnetwork/ckb" [dev-dependencies] criterion = "0.4" -ckb-chain = { path = "../chain", version = "= 0.111.0-rc9" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc9" } -ckb-store = { path = "../store", version = "= 0.111.0-rc9" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc9" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc10" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc10" } +ckb-store = { path = "../store", version = "= 0.111.0-rc10" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc10" } rand = "0.7" -ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc9"} -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc9" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc9" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc9" } +ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc10"} +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc10" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc10" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc10" } ckb-system-scripts = { version = "= 0.5.4" } lazy_static = "1.3.0" -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc9" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc9" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc9" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc9" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc9" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc9" } -ckb-network = { path = "../network", version = "= 0.111.0-rc9" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc9" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc10" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc10" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc10" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc10" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc10" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc10" } +ckb-network = { path = "../network", version = "= 0.111.0-rc10" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc10" } tempfile.workspace = true [[bench]] diff --git a/block-filter/Cargo.toml b/block-filter/Cargo.toml index 94a4d53c03..ef8bdca0bc 100644 --- a/block-filter/Cargo.toml +++ b/block-filter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-block-filter" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,9 +11,9 @@ repository = "https://github.com/nervosnetwork/ckb" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ckb-store = { path = "../store", version = "= 0.111.0-rc9" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc9" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc9" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc9" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc9" } +ckb-store = { path = "../store", version = "= 0.111.0-rc10" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc10" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc10" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc10" } diff --git a/chain/Cargo.toml b/chain/Cargo.toml index 840cb93c44..feb18e6672 100644 --- a/chain/Cargo.toml +++ b/chain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,37 +9,37 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc9" } -ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc9" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc9" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc9" } -ckb-store = { path = "../store", version = "= 0.111.0-rc9" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc9" } -ckb-verification-contextual = { path = "../verification/contextual", version = "= 0.111.0-rc9" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc9" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc9" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc9" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc9" } -ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc9" } -ckb-error = { path = "../error", version = "= 0.111.0-rc9" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc9" } -ckb-rust-unstable-port = { path = "../util/rust-unstable-port", version = "= 0.111.0-rc9" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc9" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10" } +ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc10" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc10" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc10" } +ckb-store = { path = "../store", version = "= 0.111.0-rc10" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc10" } +ckb-verification-contextual = { path = "../verification/contextual", version = "= 0.111.0-rc10" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc10" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc10" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc10" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc10" } +ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc10" } +ckb-error = { path = "../error", version = "= 0.111.0-rc10" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc10" } +ckb-rust-unstable-port = { path = "../util/rust-unstable-port", version = "= 0.111.0-rc10" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc10" } faux = { version = "^0.1", optional = true } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc9" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc9" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc9" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc9", features = ["internal"] } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc9" } -ckb-network = { path = "../network", version = "= 0.111.0-rc9" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc9" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc10" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc10" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc10" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc10", features = ["internal"] } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc10" } +ckb-network = { path = "../network", version = "= 0.111.0-rc10" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc10" } lazy_static = "1.4" tempfile.workspace = true -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc9" ,features = ["enable_faketime"]} +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc10" ,features = ["enable_faketime"]} [features] default = [] diff --git a/ckb-bin/Cargo.toml b/ckb-bin/Cargo.toml index 2627dfe4b9..29d366a1ca 100644 --- a/ckb-bin/Cargo.toml +++ b/ckb-bin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-bin" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -14,36 +14,36 @@ serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0" } serde_plain = "0.3.0" toml = "0.5" -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc9" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc9" } -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc9" } -ckb-metrics-service = { path = "../util/metrics-service", version = "= 0.111.0-rc9" } -ckb-util = { path = "../util", version = "= 0.111.0-rc9" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc9" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc9" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc9" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc9" } -ckb-store = { path = "../store", version = "= 0.111.0-rc9" } -ckb-chain-spec = {path = "../spec", version = "= 0.111.0-rc9"} -ckb-miner = { path = "../miner", version = "= 0.111.0-rc9" } -ckb-network = { path = "../network", version = "= 0.111.0-rc9"} -ckb-resource = { path = "../resource", version = "= 0.111.0-rc9"} +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc10" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10" } +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc10" } +ckb-metrics-service = { path = "../util/metrics-service", version = "= 0.111.0-rc10" } +ckb-util = { path = "../util", version = "= 0.111.0-rc10" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc10" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc10" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc10" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc10" } +ckb-store = { path = "../store", version = "= 0.111.0-rc10" } +ckb-chain-spec = {path = "../spec", version = "= 0.111.0-rc10"} +ckb-miner = { path = "../miner", version = "= 0.111.0-rc10" } +ckb-network = { path = "../network", version = "= 0.111.0-rc10"} +ckb-resource = { path = "../resource", version = "= 0.111.0-rc10"} ctrlc = { version = "3.1", features = ["termination"] } -ckb-instrument = { path = "../util/instrument", version = "= 0.111.0-rc9", features = ["progress_bar"] } -ckb-build-info = { path = "../util/build-info", version = "= 0.111.0-rc9" } -ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc9" } -ckb-chain-iter = { path = "../util/chain-iter", version = "= 0.111.0-rc9" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc9" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc9" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc9" } +ckb-instrument = { path = "../util/instrument", version = "= 0.111.0-rc10", features = ["progress_bar"] } +ckb-build-info = { path = "../util/build-info", version = "= 0.111.0-rc10" } +ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc10" } +ckb-chain-iter = { path = "../util/chain-iter", version = "= 0.111.0-rc10" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc10" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc10" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc10" } base64 = "0.21.0" tempfile.workspace = true rayon = "1.0" sentry = { version = "0.26.0", optional = true } is-terminal = "0.4.7" fdlimit = "0.2.1" -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc9" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc10" } [features] deadlock_detection = ["ckb-util/deadlock_detection"] diff --git a/db-migration/Cargo.toml b/db-migration/Cargo.toml index 9a7d1349a7..d2bb256e29 100644 --- a/db-migration/Cargo.toml +++ b/db-migration/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db-migration" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,16 +11,16 @@ 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.111.0-rc9" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc9" } -ckb-error = { path = "../error", version = "= 0.111.0-rc9" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc9" } +ckb-db = { path = "../db", version = "= 0.111.0-rc10" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10" } +ckb-error = { path = "../error", version = "= 0.111.0-rc10" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc10" } indicatif = "0.16" console = ">=0.9.1, <1.0.0" [dev-dependencies] tempfile.workspace = true -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc9" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc10" } [features] portable = ["ckb-db/portable"] diff --git a/db-schema/Cargo.toml b/db-schema/Cargo.toml index a64fd8b196..614ff4c4ae 100644 --- a/db-schema/Cargo.toml +++ b/db-schema/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db-schema" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/db/Cargo.toml b/db/Cargo.toml index e26b7f5e3f..d3131d84ee 100644 --- a/db/Cargo.toml +++ b/db/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,12 +9,12 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc9" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc9" } -ckb-error = { path = "../error", version = "= 0.111.0-rc9" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc10" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10" } +ckb-error = { path = "../error", version = "= 0.111.0-rc10" } libc = "0.2" rocksdb = { package = "ckb-rocksdb", version ="=0.20.0", features = ["snappy"], default-features = false } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc9" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc10" } [dev-dependencies] tempfile.workspace = true diff --git a/error/Cargo.toml b/error/Cargo.toml index f8cfba5441..e632debe51 100644 --- a/error/Cargo.toml +++ b/error/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-error" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,5 +11,5 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] thiserror = "1.0.22" anyhow = "1.0.34" -ckb-occupied-capacity = { path = "../util/occupied-capacity", version = "= 0.111.0-rc9" } +ckb-occupied-capacity = { path = "../util/occupied-capacity", version = "= 0.111.0-rc10" } derive_more = { version = "0.99.0", default-features = false, features = ["display"] } diff --git a/freezer/Cargo.toml b/freezer/Cargo.toml index 828395ed9c..0c6028fd48 100644 --- a/freezer/Cargo.toml +++ b/freezer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-freezer" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,11 +10,11 @@ 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.111.0-rc9" } -ckb-error = { path = "../error", version = "= 0.111.0-rc9" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc9" } -ckb-util = { path = "../util", version = "= 0.111.0-rc9" } -ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc9" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } +ckb-error = { path = "../error", version = "= 0.111.0-rc10" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10" } +ckb-util = { path = "../util", version = "= 0.111.0-rc10" } +ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc10" } fs2 = "0.4.3" fail = "0.4" snap = "1" diff --git a/miner/Cargo.toml b/miner/Cargo.toml index 279605a0fc..908e4b9896 100644 --- a/miner/Cargo.toml +++ b/miner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-miner" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,23 +9,23 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc9" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc9" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc9" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc9" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc9" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc10" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc10" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc10" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc10" } rand = "0.7" rand_distr = "0.3" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc9" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc10" } hyper = { version = "0.14", features = ["client", "http2", "http1", "server"] } hyper-tls = "0.5" futures = "0.3" lru = "0.7.1" -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc9" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc9" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc10" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc10" } indicatif = "0.16" console = ">=0.9.1, <1.0.0" eaglesong = "0.1" diff --git a/network/Cargo.toml b/network/Cargo.toml index eee344e3df..d2ac79d0ab 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-network" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,28 +11,28 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] rand = "0.7" serde = { version = "1.0", features = ["derive"] } -ckb-util = { path = "../util", version = "= 0.111.0-rc9" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc9" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc9" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc9" } -ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc9"} +ckb-util = { path = "../util", version = "= 0.111.0-rc10" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc10" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc10" } +ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc10"} tokio = { version = "1", features = ["sync", "macros"] } tokio-util = { version = "0.7", features = ["codec"] } futures = "0.3" -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc9"} +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc10"} lazy_static = { version = "1.3.0", optional = true } bs58 = { version = "0.4.0", optional = true } sentry = { version = "0.26.0", optional = true } faster-hex = { version = "0.6", optional = true } -ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc9"} +ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc10"} secp256k1 = {version = "0.24", features = ["recovery"], optional = true } trust-dns-resolver = { version = "0.20", optional = true } snap = "1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } ipnetwork = "0.18" serde_json = "1.0" bloom-filters = "0.1" -ckb-spawn = { path = "../util/spawn", version = "= 0.111.0-rc9" } +ckb-spawn = { path = "../util/spawn", version = "= 0.111.0-rc10" } socket2 = "0.4" bitflags = "1.0" @@ -48,7 +48,7 @@ criterion = "0.4" proptest = "1.0" num_cpus = "1.10" once_cell = "1.8.0" -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc9", features = ["enable_faketime"]} +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc10", features = ["enable_faketime"]} [[bench]] name = "peer_store" diff --git a/notify/Cargo.toml b/notify/Cargo.toml index a08bdf3b56..05cba38fa7 100644 --- a/notify/Cargo.toml +++ b/notify/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-notify" -version = "0.111.0-rc9" +version = "0.111.0-rc10" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc9" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc9" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc9" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc9" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc10" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc10" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc10" } tokio = { version = "1", features = ["sync"] } [dev-dependencies] diff --git a/pow/Cargo.toml b/pow/Cargo.toml index 78abb81e63..54340c3dda 100644 --- a/pow/Cargo.toml +++ b/pow/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-pow" -version = "0.111.0-rc9" +version = "0.111.0-rc10" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,8 +10,8 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc9"} +ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc10"} serde = { version = "1.0", features = ["derive"] } eaglesong = "0.1" log = "0.4" diff --git a/resource/Cargo.toml b/resource/Cargo.toml index d8582fca19..9096a43841 100644 --- a/resource/Cargo.toml +++ b/resource/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-resource" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,13 +13,13 @@ repository = "https://github.com/nervosnetwork/ckb" phf = "0.8.0" includedir = "0.6.0" serde = { version = "1.0", features = ["derive"] } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } ckb-system-scripts = { version = "= 0.5.4" } [build-dependencies] includedir_codegen = "0.6.0" walkdir = "2.1.4" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } ckb-system-scripts = { version = "= 0.5.4" } [dev-dependencies] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 0fd7607868..91fd560ccb 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-rpc" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,19 +9,19 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc9" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } -ckb-network = { path = "../network", version = "= 0.111.0-rc9" } -ckb-notify = { path = "../notify", version = "= 0.111.0-rc9" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc9" } -ckb-store = { path = "../store", version = "= 0.111.0-rc9" } -ckb-sync = { path = "../sync", version = "= 0.111.0-rc9" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc9" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc9"} -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc9"} -ckb-network-alert = { path = "../util/network-alert", version = "= 0.111.0-rc9" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc9" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc9" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc10" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } +ckb-network = { path = "../network", version = "= 0.111.0-rc10" } +ckb-notify = { path = "../notify", version = "= 0.111.0-rc10" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc10" } +ckb-store = { path = "../store", version = "= 0.111.0-rc10" } +ckb-sync = { path = "../sync", version = "= 0.111.0-rc10" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc10" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10"} +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc10"} +ckb-network-alert = { path = "../util/network-alert", version = "= 0.111.0-rc10" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc10" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc10" } jsonrpc-core = "18.0" jsonrpc-derive = "18.0" jsonrpc-http-server = "18.0" @@ -30,27 +30,27 @@ jsonrpc-ws-server = "18.0" jsonrpc-server-utils = "18.0" jsonrpc-pubsub = "18.0" serde_json = "1.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc9" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc9" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc9" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc9" } -ckb-util = { path = "../util", version = "= 0.111.0-rc9" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc9" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc9" } -ckb-error = { path = "../error", version = "= 0.111.0-rc9" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc9" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc9" } -ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc9" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc9" } -ckb-indexer = { path = "../util/indexer", version = "= 0.111.0-rc9" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc10" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc10" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc10" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc10" } +ckb-util = { path = "../util", version = "= 0.111.0-rc10" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc10" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc10" } +ckb-error = { path = "../error", version = "= 0.111.0-rc10" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc10" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc10" } +ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc10" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc10" } +ckb-indexer = { path = "../util/indexer", version = "= 0.111.0-rc10" } itertools.workspace = true tokio = "1" [dev-dependencies] reqwest = { version = "0.11.4", features = ["blocking", "json"] } serde = { version = "1.0", features = ["derive"] } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc9" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc9" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc10" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc10" } tempfile.workspace = true pretty_assertions = "1.3.0" -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc9" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc10" } diff --git a/script/Cargo.toml b/script/Cargo.toml index c34e892894..6010f49b34 100644 --- a/script/Cargo.toml +++ b/script/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-script" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -18,24 +18,24 @@ logging = ["ckb-logger"] flatmemory = [] [dependencies] -ckb-traits = { path = "../traits", version = "= 0.111.0-rc9" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc10" } byteorder = "1.3.1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc9" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc10" } ckb-vm = { version = "=0.24.4", default-features = false } faster-hex = "0.6" -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc9", optional = true } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10", optional = true } serde = { version = "1.0", features = ["derive"] } -ckb-error = { path = "../error", version = "= 0.111.0-rc9" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc9" } +ckb-error = { path = "../error", version = "= 0.111.0-rc10" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc10" } [dev-dependencies] proptest = "1.0" -ckb-db = { path = "../db", version = "= 0.111.0-rc9" } -ckb-store = { path = "../store", version = "= 0.111.0-rc9" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc9" } +ckb-db = { path = "../db", version = "= 0.111.0-rc10" } +ckb-store = { path = "../store", version = "= 0.111.0-rc10" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc10" } tiny-keccak = { version = "2.0", features = ["sha3"] } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc9" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc9" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc10" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc10" } tempfile.workspace = true rand = "0.8.4" diff --git a/script/fuzz/Cargo.toml b/script/fuzz/Cargo.toml index 2c2afc3001..2affdc7c95 100644 --- a/script/fuzz/Cargo.toml +++ b/script/fuzz/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-script-fuzz" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -15,10 +15,10 @@ cargo-fuzz = true [dependencies] arbitrary = { version = "1", features = ["derive"] } libfuzzer-sys = { version="0.4.0", features=["arbitrary-derive"] } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc9" } -ckb-types = { path = "../../util/types", version = "= 0.111.0-rc9" } -ckb-script = { path = "../../script", version = "= 0.111.0-rc9" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc9" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc10" } +ckb-types = { path = "../../util/types", version = "= 0.111.0-rc10" } +ckb-script = { path = "../../script", version = "= 0.111.0-rc10" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc10" } # Prevent this from interfering with workspaces [workspace] diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 337fa46308..41148f6239 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-shared" -version = "0.111.0-rc9" +version = "0.111.0-rc10" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,26 +9,26 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc9" } -ckb-store = { path = "../store", version = "= 0.111.0-rc9" } -ckb-db = { path = "../db", version = "= 0.111.0-rc9" } -ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc9" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc10" } +ckb-store = { path = "../store", version = "= 0.111.0-rc10" } +ckb-db = { path = "../db", version = "= 0.111.0-rc10" } +ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc10" } arc-swap = "1.3" -ckb-error = { path = "../error", version = "= 0.111.0-rc9" } -ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc9" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc9" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc9" } -ckb-notify = { path = "../notify", version = "= 0.111.0-rc9" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc9" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc9" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc9" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc9" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc9" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc9" } +ckb-error = { path = "../error", version = "= 0.111.0-rc10" } +ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc10" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc10" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc10" } +ckb-notify = { path = "../notify", version = "= 0.111.0-rc10" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc10" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc10" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc10" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc10" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc10" } [dev-dependencies] -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc9", features = ["enable_faketime"] } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc10", features = ["enable_faketime"] } [features] portable = ["ckb-db/portable", "ckb-store/portable", "ckb-tx-pool/portable"] diff --git a/spec/Cargo.toml b/spec/Cargo.toml index 58d10f4480..9f367e7c98 100644 --- a/spec/Cargo.toml +++ b/spec/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain-spec" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,15 +11,15 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] serde = { version = "1.0", features = ["derive"] } toml = "0.5" -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc9" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc9" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc9" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc9" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc9" } -ckb-rational = { path = "../util/rational", version = "= 0.111.0-rc9" } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc9"} -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc9"} -ckb-error = { path = "../error", version = "= 0.111.0-rc9" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc9" } -ckb-util = { path = "../util", version = "= 0.111.0-rc9" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc10" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc10" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc10" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc10" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc10" } +ckb-rational = { path = "../util/rational", version = "= 0.111.0-rc10" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc10"} +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc10"} +ckb-error = { path = "../error", version = "= 0.111.0-rc10" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc10" } +ckb-util = { path = "../util", version = "= 0.111.0-rc10" } diff --git a/store/Cargo.toml b/store/Cargo.toml index 250b38462a..6e1089530b 100644 --- a/store/Cargo.toml +++ b/store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-store" -version = "0.111.0-rc9" +version = "0.111.0-rc10" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,16 +9,16 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } -ckb-db = { path = "../db", version = "= 0.111.0-rc9" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc9" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } +ckb-db = { path = "../db", version = "= 0.111.0-rc10" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc10" } lru = "0.7.1" -ckb-traits = { path = "../traits", version = "= 0.111.0-rc9" } -ckb-util = { path = "../util", version = "= 0.111.0-rc9" } -ckb-error = { path = "../error", version = "= 0.111.0-rc9" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc9" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc9" } -ckb-freezer = { path = "../freezer", version = "= 0.111.0-rc9" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc10" } +ckb-util = { path = "../util", version = "= 0.111.0-rc10" } +ckb-error = { path = "../error", version = "= 0.111.0-rc10" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc10" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc10" } +ckb-freezer = { path = "../freezer", version = "= 0.111.0-rc10" } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] diff --git a/sync/Cargo.toml b/sync/Cargo.toml index 43202c761b..6af264bfd3 100644 --- a/sync/Cargo.toml +++ b/sync/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-sync" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,32 +9,32 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-chain = { path = "../chain", version = "= 0.111.0-rc9" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc9" } -ckb-store = { path = "../store", version = "= 0.111.0-rc9" } -ckb-app-config = {path = "../util/app-config", version = "= 0.111.0-rc9"} -ckb-types = {path = "../util/types", version = "= 0.111.0-rc9"} -ckb-network = { path = "../network", version = "= 0.111.0-rc9" } -ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc9"} -ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc9"} -ckb-util = { path = "../util", version = "= 0.111.0-rc9" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc9" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc9" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc9" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc9" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc9" } -ckb-error = {path = "../error", version = "= 0.111.0-rc9"} -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc9" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc10" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc10" } +ckb-store = { path = "../store", version = "= 0.111.0-rc10" } +ckb-app-config = {path = "../util/app-config", version = "= 0.111.0-rc10"} +ckb-types = {path = "../util/types", version = "= 0.111.0-rc10"} +ckb-network = { path = "../network", version = "= 0.111.0-rc10" } +ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc10"} +ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc10"} +ckb-util = { path = "../util", version = "= 0.111.0-rc10" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc10" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc10" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc10" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc10" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc10" } +ckb-error = {path = "../error", version = "= 0.111.0-rc10"} +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc10" } sentry = { version = "0.26.0", optional = true } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc9" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc9" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc9" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc10" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc10" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc10" } tokio = { version = "1", features = ["sync"] } lru = "0.7.1" futures = "0.3" governor = "0.3.1" tempfile.workspace = true -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc9" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc10" } bitflags = "1.0" dashmap = "4.0" keyed_priority_queue = "0.3" @@ -42,16 +42,16 @@ sled = "0.34.7" itertools.workspace = true [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc9" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc10" } rand = "0.7" -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc9" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc9" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc9" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc9", features = ["mock"] } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc9" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc10" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc10" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc10" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc10", features = ["mock"] } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc10" } faux = "^0.1" once_cell = "1.8.0" -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc9" , features = ["enable_faketime"]} +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc10" , features = ["enable_faketime"]} [features] default = [] diff --git a/test/Cargo.toml b/test/Cargo.toml index be36adc565..df68fd14f5 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-test" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,28 +11,28 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] clap = { version = "=3.2.21" } toml = "0.5.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc9" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc9" } -ckb-network = { path = "../network", version = "= 0.111.0-rc9" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc9" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc9" } -ckb-util = { path = "../util", version = "= 0.111.0-rc9" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc9" } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc9" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc9" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc9" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc9" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc9" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc9" } -ckb-logger-config = { path = "../util/logger-config", version = "= 0.111.0-rc9" } -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc9" } -ckb-error = { path = "../error", version = "= 0.111.0-rc9" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc9" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc10" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc10" } +ckb-network = { path = "../network", version = "= 0.111.0-rc10" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc10" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc10" } +ckb-util = { path = "../util", version = "= 0.111.0-rc10" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc10" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc10" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc10" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc10" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc10" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc10" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10" } +ckb-logger-config = { path = "../util/logger-config", version = "= 0.111.0-rc10" } +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc10" } +ckb-error = { path = "../error", version = "= 0.111.0-rc10" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc10" } tempfile = "3" reqwest = { version = "0.11.4", features = ["blocking", "json"] } rand = "0.7" -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc9" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc10" } serde_json = "1.0" lazy_static = "1.4.0" byteorder = "1.3.1" diff --git a/traits/Cargo.toml b/traits/Cargo.toml index 8ff0de8999..cd2e6e3f6c 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-traits" -version = "0.111.0-rc9" +version = "0.111.0-rc10" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc9" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } diff --git a/tx-pool/Cargo.toml b/tx-pool/Cargo.toml index a94bbd77ce..bf8581c86e 100644 --- a/tx-pool/Cargo.toml +++ b/tx-pool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-tx-pool" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,27 +11,27 @@ 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.111.0-rc9" } -ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc9"} -ckb-verification = { path = "../verification", version = "= 0.111.0-rc9" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc9"} +ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } +ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc10"} +ckb-verification = { path = "../verification", version = "= 0.111.0-rc10" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc10"} lru = "0.7.1" -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc9" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc9" } -ckb-store = { path = "../store", version = "= 0.111.0-rc9" } -ckb-util = { path = "../util", version = "= 0.111.0-rc9" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc9" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc9" } -ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc9" } -ckb-error = { path = "../error", version = "= 0.111.0-rc9" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc10" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc10" } +ckb-store = { path = "../store", version = "= 0.111.0-rc10" } +ckb-util = { path = "../util", version = "= 0.111.0-rc10" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc10" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc10" } +ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc10" } +ckb-error = { path = "../error", version = "= 0.111.0-rc10" } tokio = { version = "1", features = ["sync", "process"] } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc9" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc9" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc9" } -ckb-network = { path = "../network", version = "= 0.111.0-rc9" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc9" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc9" } -ckb-db = { path = "../db", version = "= 0.111.0-rc9" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc10" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc10" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc10" } +ckb-network = { path = "../network", version = "= 0.111.0-rc10" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc10" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc10" } +ckb-db = { path = "../db", version = "= 0.111.0-rc10" } sentry = { version = "0.26.0", optional = true } serde_json = "1.0" rand = "0.8.4" @@ -43,8 +43,8 @@ tokio-util = "0.7.8" [dev-dependencies] tempfile.workspace = true -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc9" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc9", features = ["enable_faketime"]} +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc10" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc10", features = ["enable_faketime"]} [features] default = [] diff --git a/util/Cargo.toml b/util/Cargo.toml index c0ef6b29bf..733d9fc3f4 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-util" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -15,7 +15,7 @@ regex = "1.1.6" once_cell = "1.8.0" [dev-dependencies] -ckb-fixed-hash = { path = "fixed-hash", version = "= 0.111.0-rc9" } +ckb-fixed-hash = { path = "fixed-hash", version = "= 0.111.0-rc10" } [features] deadlock_detection = ["parking_lot/deadlock_detection"] diff --git a/util/app-config/Cargo.toml b/util/app-config/Cargo.toml index 5e47228240..03f2cbb55d 100644 --- a/util/app-config/Cargo.toml +++ b/util/app-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-app-config" -version = "0.111.0-rc9" +version = "0.111.0-rc10" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -15,20 +15,20 @@ serde_plain = "0.3.0" serde_json = "1.0" toml = "0.5" path-clean = "0.1.0" -ckb-logger = { path = "../../util/logger", version = "= 0.111.0-rc9" } -ckb-logger-config = { path = "../../util/logger-config", version = "= 0.111.0-rc9" } -ckb-metrics-config = { path = "../../util/metrics-config", version = "= 0.111.0-rc9" } -ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc9"} -ckb-jsonrpc-types = {path = "../jsonrpc-types", version = "= 0.111.0-rc9"} -ckb-pow = { path = "../../pow", version = "= 0.111.0-rc9" } -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc9"} -ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc9" } -ckb-types = { path = "../types", version = "= 0.111.0-rc9" } +ckb-logger = { path = "../../util/logger", version = "= 0.111.0-rc10" } +ckb-logger-config = { path = "../../util/logger-config", version = "= 0.111.0-rc10" } +ckb-metrics-config = { path = "../../util/metrics-config", version = "= 0.111.0-rc10" } +ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc10"} +ckb-jsonrpc-types = {path = "../jsonrpc-types", version = "= 0.111.0-rc10"} +ckb-pow = { path = "../../pow", version = "= 0.111.0-rc10" } +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc10"} +ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc10" } +ckb-types = { path = "../types", version = "= 0.111.0-rc10" } secio = { version="0.5.7", package="tentacle-secio" } multiaddr = { version="0.3.0", package="tentacle-multiaddr" } rand = "0.7" sentry = { version = "0.26.0", optional = true } -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc9" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc10" } url = { version = "2.2.2", features = ["serde"] } ubyte = { version = "0.10", features = ["serde"] } @@ -37,4 +37,4 @@ with_sentry = ["sentry"] [dev-dependencies] tempfile.workspace = true -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc9" ,features = ["enable_faketime"]} +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc10" ,features = ["enable_faketime"]} diff --git a/util/build-info/Cargo.toml b/util/build-info/Cargo.toml index be8079c551..d2e97280f2 100644 --- a/util/build-info/Cargo.toml +++ b/util/build-info/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-build-info" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/chain-iter/Cargo.toml b/util/chain-iter/Cargo.toml index d8e6900ae3..72ec709fc6 100644 --- a/util/chain-iter/Cargo.toml +++ b/util/chain-iter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain-iter" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc9" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc9" } +ckb-types = { path = "../types", version = "= 0.111.0-rc10" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc10" } diff --git a/util/channel/Cargo.toml b/util/channel/Cargo.toml index 8f4dbd8ae5..c4186aa16d 100644 --- a/util/channel/Cargo.toml +++ b/util/channel/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-channel" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/constant/Cargo.toml b/util/constant/Cargo.toml index 8f40462af2..2fdb434f56 100644 --- a/util/constant/Cargo.toml +++ b/util/constant/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-constant" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/crypto/Cargo.toml b/util/crypto/Cargo.toml index 18c0077d45..0d6d4cd3f1 100644 --- a/util/crypto/Cargo.toml +++ b/util/crypto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-crypto" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc9" } +ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc10" } lazy_static = "1.3" secp256k1 = { version = "0.24", features = ["recovery"], optional = true } thiserror = "1.0.22" diff --git a/util/dao/Cargo.toml b/util/dao/Cargo.toml index 73dbe1b44e..74bf9332ea 100644 --- a/util/dao/Cargo.toml +++ b/util/dao/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-dao" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,13 +10,13 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../types", version = "= 0.111.0-rc9" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc9" } -ckb-dao-utils = { path = "./utils", version = "= 0.111.0-rc9" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc9" } +ckb-types = { path = "../types", version = "= 0.111.0-rc10" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc10" } +ckb-dao-utils = { path = "./utils", version = "= 0.111.0-rc10" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc10" } [dev-dependencies] -ckb-db = { path = "../../db", version = "= 0.111.0-rc9" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc9" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc9" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc10" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc10" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc10" } tempfile.workspace = true diff --git a/util/dao/utils/Cargo.toml b/util/dao/utils/Cargo.toml index b53c5dc415..8072f04c16 100644 --- a/util/dao/utils/Cargo.toml +++ b/util/dao/utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-dao-utils" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,5 +10,5 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../../types", version = "= 0.111.0-rc9" } -ckb-error = { path = "../../../error", version = "= 0.111.0-rc9" } +ckb-types = { path = "../../types", version = "= 0.111.0-rc10" } +ckb-error = { path = "../../../error", version = "= 0.111.0-rc10" } diff --git a/util/fixed-hash/Cargo.toml b/util/fixed-hash/Cargo.toml index 08d99c8b58..a79aea5f9a 100644 --- a/util/fixed-hash/Cargo.toml +++ b/util/fixed-hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-fixed-hash" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -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.111.0-rc9" } -ckb-fixed-hash-macros = { path = "macros", version = "= 0.111.0-rc9" } +ckb-fixed-hash-core = { path = "core", version = "= 0.111.0-rc10" } +ckb-fixed-hash-macros = { path = "macros", version = "= 0.111.0-rc10" } diff --git a/util/fixed-hash/core/Cargo.toml b/util/fixed-hash/core/Cargo.toml index 0c9ba8b530..b0f0731c87 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.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/fixed-hash/macros/Cargo.toml b/util/fixed-hash/macros/Cargo.toml index e8ddbbf099..64556117ae 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.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -12,7 +12,7 @@ repository = "https://github.com/nervosnetwork/ckb" proc-macro = true [dependencies] -ckb-fixed-hash-core = { path = "../core", version = "= 0.111.0-rc9" } +ckb-fixed-hash-core = { path = "../core", version = "= 0.111.0-rc10" } quote = "1.0" syn = "1.0" proc-macro2 = "1.0" diff --git a/util/hash/Cargo.toml b/util/hash/Cargo.toml index 0881058de6..3f7629d3ec 100644 --- a/util/hash/Cargo.toml +++ b/util/hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-hash" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/indexer/Cargo.toml b/util/indexer/Cargo.toml index 00f08a45ee..3fb610d832 100644 --- a/util/indexer/Cargo.toml +++ b/util/indexer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-indexer" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,15 +13,15 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] thiserror = "1.0" rocksdb = { package = "ckb-rocksdb", version ="=0.20.0", features = ["snappy"], default-features = false } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc9" } -ckb-types = { path = "../types", version = "= 0.111.0-rc9" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc9" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc9" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc9" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc9" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc9" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc9" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc9" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc10" } +ckb-types = { path = "../types", version = "= 0.111.0-rc10" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc10" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc10" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc10" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc10" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc10" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc10" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc10" } rhai = { version = "1.10.0", features = ["no_function", "no_float", "no_module", "sync"]} serde_json = "1.0" numext-fixed-uint = "0.1" diff --git a/util/instrument/Cargo.toml b/util/instrument/Cargo.toml index d256e3ba2b..bafd673f3e 100644 --- a/util/instrument/Cargo.toml +++ b/util/instrument/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-instrument" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc9" } -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc9" } -ckb-chain-iter = { path = "../chain-iter", version = "= 0.111.0-rc9" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc9" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc9" } +ckb-types = { path = "../types", version = "= 0.111.0-rc10" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc10" } +ckb-chain-iter = { path = "../chain-iter", version = "= 0.111.0-rc10" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc10" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc10" } serde_json = "1.0" indicatif = { version = "0.16", optional = true } diff --git a/util/jsonrpc-types/Cargo.toml b/util/jsonrpc-types/Cargo.toml index 4bb32df999..e1d20b0c70 100644 --- a/util/jsonrpc-types/Cargo.toml +++ b/util/jsonrpc-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-jsonrpc-types" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,7 +9,7 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc9" } +ckb-types = { path = "../types", version = "= 0.111.0-rc10" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" faster-hex = "0.6" diff --git a/util/launcher/Cargo.toml b/util/launcher/Cargo.toml index 0ae11adcae..bdf79f0bff 100644 --- a/util/launcher/Cargo.toml +++ b/util/launcher/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-launcher" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,43 +11,43 @@ 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.111.0-rc9" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc9" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc9" } -ckb-migration-template = { path = "migration-template", version = "= 0.111.0-rc9" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc9" } -ckb-db-migration = { path = "../../db-migration", version = "= 0.111.0-rc9" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc9" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc9" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc9" } -ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc9" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc9" } -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc9" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc9" } -ckb-network = { path = "../../network", version = "= 0.111.0-rc9"} -ckb-rpc = { path = "../../rpc", version = "= 0.111.0-rc9"} -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc9"} -ckb-network-alert = { path = "../network-alert", version = "= 0.111.0-rc9" } -ckb-sync = { path = "../../sync", version = "= 0.111.0-rc9"} -ckb-verification = { path = "../../verification", version = "= 0.111.0-rc9" } -ckb-verification-traits = { path = "../../verification/traits", version = "= 0.111.0-rc9" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc9" } -ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc9" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc9" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc9" } -ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc9" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc9" } -ckb-snapshot = { path = "../snapshot", version = "= 0.111.0-rc9" } -ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc9" } -ckb-light-client-protocol-server = { path = "../light-client-protocol-server", version = "= 0.111.0-rc9" } -ckb-block-filter = { path = "../../block-filter", version = "= 0.111.0-rc9" } -ckb-hash = { path = "../hash", version = "= 0.111.0-rc9" } +ckb-types = { path = "../types", version = "= 0.111.0-rc10" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc10" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc10" } +ckb-migration-template = { path = "migration-template", version = "= 0.111.0-rc10" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc10" } +ckb-db-migration = { path = "../../db-migration", version = "= 0.111.0-rc10" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc10" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc10" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc10" } +ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc10" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc10" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc10" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc10" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc10"} +ckb-rpc = { path = "../../rpc", version = "= 0.111.0-rc10"} +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc10"} +ckb-network-alert = { path = "../network-alert", version = "= 0.111.0-rc10" } +ckb-sync = { path = "../../sync", version = "= 0.111.0-rc10"} +ckb-verification = { path = "../../verification", version = "= 0.111.0-rc10" } +ckb-verification-traits = { path = "../../verification/traits", version = "= 0.111.0-rc10" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc10" } +ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc10" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc10" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc10" } +ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc10" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc10" } +ckb-snapshot = { path = "../snapshot", version = "= 0.111.0-rc10" } +ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc10" } +ckb-light-client-protocol-server = { path = "../light-client-protocol-server", version = "= 0.111.0-rc10" } +ckb-block-filter = { path = "../../block-filter", version = "= 0.111.0-rc10" } +ckb-hash = { path = "../hash", version = "= 0.111.0-rc10" } num_cpus = "1.10" once_cell = "1.8.0" tempfile.workspace = true [dev-dependencies] -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc9", features = ["enable_faketime"] } +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc10", features = ["enable_faketime"] } [features] with_sentry = [ "ckb-sync/with_sentry", "ckb-network/with_sentry", "ckb-app-config/with_sentry" ] diff --git a/util/launcher/migration-template/Cargo.toml b/util/launcher/migration-template/Cargo.toml index c184dcbdaf..df1dbb6b78 100644 --- a/util/launcher/migration-template/Cargo.toml +++ b/util/launcher/migration-template/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-migration-template" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/light-client-protocol-server/Cargo.toml b/util/light-client-protocol-server/Cargo.toml index 5cdda0e80c..f88957420c 100644 --- a/util/light-client-protocol-server/Cargo.toml +++ b/util/light-client-protocol-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-light-client-protocol-server" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,23 +9,23 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-network = { path = "../../network", version = "= 0.111.0-rc9" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc9" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc9" } -ckb-types = { path = "../types", version = "= 0.111.0-rc9" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc9" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc10" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc10" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc10" } +ckb-types = { path = "../types", version = "= 0.111.0-rc10" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc10" } ckb-merkle-mountain-range = "0.5.2" -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc9"} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc10"} [dev-dependencies] -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc9" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc9" } -ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc9" } -ckb-launcher = { path = "../launcher", version = "= 0.111.0-rc9" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc9" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc9" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc9" } -ckb-test-chain-utils = { path = "../test-chain-utils", version = "= 0.111.0-rc9" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc10" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc10" } +ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc10" } +ckb-launcher = { path = "../launcher", version = "= 0.111.0-rc10" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc10" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc10" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc10" } +ckb-test-chain-utils = { path = "../test-chain-utils", version = "= 0.111.0-rc10" } tempfile.workspace = true -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc9", features = ["enable_faketime"]} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc10", features = ["enable_faketime"]} tokio = "1.20" diff --git a/util/logger-config/Cargo.toml b/util/logger-config/Cargo.toml index c2da029dc0..100bf0da6b 100644 --- a/util/logger-config/Cargo.toml +++ b/util/logger-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger-config" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/logger-service/Cargo.toml b/util/logger-service/Cargo.toml index 325a3cda6b..9e22a0b0d5 100644 --- a/util/logger-service/Cargo.toml +++ b/util/logger-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger-service" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -9,9 +9,9 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-util = { path = "..", version = "= 0.111.0-rc9" } -ckb-logger-config = { path = "../logger-config", version = "= 0.111.0-rc9" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc9" } +ckb-util = { path = "..", version = "= 0.111.0-rc10" } +ckb-logger-config = { path = "../logger-config", version = "= 0.111.0-rc10" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc10" } yansi = "0.5" log = "0.4" env_logger = "0.6" @@ -22,7 +22,7 @@ sentry = { version = "0.26.0", optional = true, features = ["log"] } time = { version = "0.3.11", features = ["formatting"] } [dev-dependencies] -ckb-logger = { path = "../logger", version = "= 0.111.0-rc9" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc10" } tempfile.workspace = true [features] diff --git a/util/logger/Cargo.toml b/util/logger/Cargo.toml index e7cccece0d..1efcc3df22 100644 --- a/util/logger/Cargo.toml +++ b/util/logger/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/memory-tracker/Cargo.toml b/util/memory-tracker/Cargo.toml index a70290b403..ffbe84a279 100644 --- a/util/memory-tracker/Cargo.toml +++ b/util/memory-tracker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-memory-tracker" -version = "0.111.0-rc9" +version = "0.111.0-rc10" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc9" } -ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc9" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc9" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc10" } +ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc10" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc10" } [target.'cfg(all(not(target_env = "msvc"), not(target_os="macos")))'.dependencies] jemalloc-ctl = { package = "tikv-jemalloc-ctl", version = "0.5.0" } diff --git a/util/metrics-config/Cargo.toml b/util/metrics-config/Cargo.toml index 39088886fc..e467edde58 100644 --- a/util/metrics-config/Cargo.toml +++ b/util/metrics-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics-config" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/metrics-service/Cargo.toml b/util/metrics-service/Cargo.toml index b597a73317..0e5bcce492 100644 --- a/util/metrics-service/Cargo.toml +++ b/util/metrics-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics-service" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-metrics-config = { path = "../metrics-config", version = "= 0.111.0-rc9" } -ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc9" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc9" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc9" } -ckb-util = { path = "..", version = "= 0.111.0-rc9" } +ckb-metrics-config = { path = "../metrics-config", version = "= 0.111.0-rc10" } +ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc10" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc10" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc10" } +ckb-util = { path = "..", version = "= 0.111.0-rc10" } prometheus = "0.13.3" hyper = { version = "0.14", features = ["http1", "tcp", "server"] } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc9" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc10" } diff --git a/util/metrics/Cargo.toml b/util/metrics/Cargo.toml index 1de844407c..5800c79daa 100644 --- a/util/metrics/Cargo.toml +++ b/util/metrics/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/multisig/Cargo.toml b/util/multisig/Cargo.toml index d13319b776..868d2a295a 100644 --- a/util/multisig/Cargo.toml +++ b/util/multisig/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-multisig" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,9 +9,9 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-error = { path = "../../error", version = "= 0.111.0-rc9" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc9" } -ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc9" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc10" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc10" } +ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc10" } [dev-dependencies] rand = "0.7" diff --git a/util/network-alert/Cargo.toml b/util/network-alert/Cargo.toml index 9cf6d4e673..82ffa3aa19 100644 --- a/util/network-alert/Cargo.toml +++ b/util/network-alert/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-network-alert" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,23 +9,23 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-multisig = { path = "../multisig", version = "= 0.111.0-rc9" } -ckb-types = { path = "../types", version = "= 0.111.0-rc9" } -ckb-util = { path = "..", version = "= 0.111.0-rc9" } -ckb-network = { path = "../../network", version = "= 0.111.0-rc9" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc9"} -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc9" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc9"} -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc9" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc9" } -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc9" } +ckb-multisig = { path = "../multisig", version = "= 0.111.0-rc10" } +ckb-types = { path = "../types", version = "= 0.111.0-rc10" } +ckb-util = { path = "..", version = "= 0.111.0-rc10" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc10" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc10"} +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc10" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc10"} +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc10" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc10" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc10" } lru = "0.7.1" semver = "1.0" [dev-dependencies] -ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc9" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc9" } +ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc10" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc10" } once_cell = "1.8.0" -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc9", features = ["enable_faketime"]} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc10", features = ["enable_faketime"]} faster-hex = "0.6" serde_json = "1.0" diff --git a/util/occupied-capacity/Cargo.toml b/util/occupied-capacity/Cargo.toml index e62bdc753b..08f27ea2bb 100644 --- a/util/occupied-capacity/Cargo.toml +++ b/util/occupied-capacity/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-occupied-capacity" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc9" } -ckb-occupied-capacity-core = { path = "core", version = "= 0.111.0-rc9" } +ckb-occupied-capacity-macros = { path = "macros", version = "= 0.111.0-rc10" } +ckb-occupied-capacity-core = { path = "core", version = "= 0.111.0-rc10" } diff --git a/util/occupied-capacity/core/Cargo.toml b/util/occupied-capacity/core/Cargo.toml index 0a97ee5a11..02c480284e 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.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/occupied-capacity/macros/Cargo.toml b/util/occupied-capacity/macros/Cargo.toml index 19a6e20e8d..511763cc02 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.111.0-rc9" +version = "0.111.0-rc10" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -14,4 +14,4 @@ proc-macro = true [dependencies] quote = "1.0" syn = "1.0" -ckb-occupied-capacity-core = { path = "../core", version = "= 0.111.0-rc9" } +ckb-occupied-capacity-core = { path = "../core", version = "= 0.111.0-rc10" } diff --git a/util/proposal-table/Cargo.toml b/util/proposal-table/Cargo.toml index fcab0fa8b5..ab43b49d30 100644 --- a/util/proposal-table/Cargo.toml +++ b/util/proposal-table/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-proposal-table" -version = "0.111.0-rc9" +version = "0.111.0-rc10" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc9" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc9" } -ckb-types = { path = "../types", version = "= 0.111.0-rc9" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc10" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc10" } +ckb-types = { path = "../types", version = "= 0.111.0-rc10" } diff --git a/util/rational/Cargo.toml b/util/rational/Cargo.toml index f86b25f915..2a1ebcd61c 100644 --- a/util/rational/Cargo.toml +++ b/util/rational/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-rational" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/reward-calculator/Cargo.toml b/util/reward-calculator/Cargo.toml index d882ffc8b7..c363d160d1 100644 --- a/util/reward-calculator/Cargo.toml +++ b/util/reward-calculator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-reward-calculator" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,15 +9,15 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc9" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc9" } -ckb-dao = { path = "../dao", version = "= 0.111.0-rc9" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc9" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc9" } -ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc9"} +ckb-types = { path = "../types", version = "= 0.111.0-rc10" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc10" } +ckb-dao = { path = "../dao", version = "= 0.111.0-rc10" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc10" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc10" } +ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc10"} [dev-dependencies] -ckb-db = { path = "../../db", version = "= 0.111.0-rc9" } -ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc9" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc9" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc10" } +ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc10" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc10" } tempfile.workspace = true diff --git a/util/runtime/Cargo.toml b/util/runtime/Cargo.toml index 31eff9a831..4b24e149bb 100644 --- a/util/runtime/Cargo.toml +++ b/util/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-async-runtime" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,5 +10,5 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] tokio = { version = "1", features = ["full"] } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc9" } -ckb-spawn = { path = "../spawn", version = "= 0.111.0-rc9" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc10" } +ckb-spawn = { path = "../spawn", version = "= 0.111.0-rc10" } diff --git a/util/rust-unstable-port/Cargo.toml b/util/rust-unstable-port/Cargo.toml index 6b3f29dc80..a18dda8a2b 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.111.0-rc9" +version = "0.111.0-rc10" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" diff --git a/util/snapshot/Cargo.toml b/util/snapshot/Cargo.toml index 7bcddc9fd2..41a0e064a1 100644 --- a/util/snapshot/Cargo.toml +++ b/util/snapshot/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-snapshot" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,15 +11,15 @@ 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.111.0-rc9" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc9" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc9" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc9" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc9" } -ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc9" } +ckb-types = { path = "../types", version = "= 0.111.0-rc10" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc10" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc10" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc10" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc10" } +ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc10" } arc-swap = "1.3" -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc9" } -ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc9" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc10" } +ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc10" } ckb-merkle-mountain-range = "0.5.2" [features] diff --git a/util/spawn/Cargo.toml b/util/spawn/Cargo.toml index 2d619bdf30..f8fdb918de 100644 --- a/util/spawn/Cargo.toml +++ b/util/spawn/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-spawn" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/stop-handler/Cargo.toml b/util/stop-handler/Cargo.toml index d70a36d1f0..dfca296746 100644 --- a/util/stop-handler/Cargo.toml +++ b/util/stop-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-stop-handler" -version = "0.111.0-rc9" +version = "0.111.0-rc10" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,12 +9,12 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../logger", version = "= 0.111.0-rc9" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc10" } tokio = { version = "1", features = ["sync", "rt-multi-thread"] } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc9" } -ckb-util = { path = "..", version = "= 0.111.0-rc9" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc10" } +ckb-util = { path = "..", version = "= 0.111.0-rc10" } once_cell = "1.8.0" -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc9" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc10" } tokio-util = "0.7.8" diff --git a/util/systemtime/Cargo.toml b/util/systemtime/Cargo.toml index a4dbf8bf46..6095fa1ca1 100644 --- a/util/systemtime/Cargo.toml +++ b/util/systemtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-systemtime" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/test-chain-utils/Cargo.toml b/util/test-chain-utils/Cargo.toml index eb9cd2e4d8..ee8ebe7c66 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.111.0-rc9" +version = "0.111.0-rc10" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,18 +9,18 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = {path = "../types", version = "= 0.111.0-rc9"} -ckb-db = { path = "../../db", version = "= 0.111.0-rc9" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc9" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc9" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc9" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc9" } +ckb-types = {path = "../types", version = "= 0.111.0-rc10"} +ckb-db = { path = "../../db", version = "= 0.111.0-rc10" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc10" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc10" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc10" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc10" } lazy_static = "1.3.0" -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc9" } -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc9" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc9" } -ckb-util = { path = "..", version = "= 0.111.0-rc9" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc10" } +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc10" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc10" } +ckb-util = { path = "..", version = "= 0.111.0-rc10" } tempfile.workspace = true [dev-dependencies] -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc9", features = ["enable_faketime"] } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc10", features = ["enable_faketime"] } diff --git a/util/types/Cargo.toml b/util/types/Cargo.toml index 7fe033eeec..0b727788b1 100644 --- a/util/types/Cargo.toml +++ b/util/types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-types" -version = "0.111.0-rc9" +version = "0.111.0-rc10" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,17 +10,17 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] molecule = "=0.7.5" -ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc9" } +ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc10" } numext-fixed-uint = { version = "0.1", features = ["support_rand", "support_heapsize", "support_serde"] } bytes = { version="1", features = ["serde"] } merkle-cbt = "0.3" -ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc9" } -ckb-hash = { path = "../hash", version = "= 0.111.0-rc9" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc9" } -ckb-constant = { path = "../constant", version = "= 0.111.0-rc9" } +ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc10" } +ckb-hash = { path = "../hash", version = "= 0.111.0-rc10" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc10" } +ckb-constant = { path = "../constant", version = "= 0.111.0-rc10" } bit-vec = "0.6.3" -ckb-error = { path = "../../error", version = "= 0.111.0-rc9" } -ckb-rational = { path = "../rational", version = "= 0.111.0-rc9" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc10" } +ckb-rational = { path = "../rational", version = "= 0.111.0-rc10" } once_cell = "1.8.0" derive_more = { version = "0.99.0", default-features=false, features = ["display"] } ckb-merkle-mountain-range = "0.5.2" diff --git a/verification/Cargo.toml b/verification/Cargo.toml index 283e2828d8..dc580fbef5 100644 --- a/verification/Cargo.toml +++ b/verification/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,20 +9,20 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } -ckb-script = { path = "../script", version = "= 0.111.0-rc9" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc9" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc9" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } +ckb-script = { path = "../script", version = "= 0.111.0-rc10" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc10" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc10" } lru = "0.7.1" -ckb-traits = { path = "../traits", version = "= 0.111.0-rc9" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc9" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc9" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc9" } -ckb-error = { path = "../error", version = "= 0.111.0-rc9" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc10" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc10" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc10" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc10" } +ckb-error = { path = "../error", version = "= 0.111.0-rc10" } derive_more = { version = "0.99.0", default-features=false, features = ["display"] } -ckb-verification-traits = { path = "./traits", version = "= 0.111.0-rc9" } +ckb-verification-traits = { path = "./traits", version = "= 0.111.0-rc10" } [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc9" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc9" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc9", features=["enable_faketime"]} +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc10" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc10" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc10", features=["enable_faketime"]} diff --git a/verification/contextual/Cargo.toml b/verification/contextual/Cargo.toml index 8737b8cc7d..29ce630dfb 100644 --- a/verification/contextual/Cargo.toml +++ b/verification/contextual/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification-contextual" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,27 +9,27 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../../util/types", version = "= 0.111.0-rc9" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc9" } -ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc9" } +ckb-types = { path = "../../util/types", version = "= 0.111.0-rc10" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc10" } +ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc10" } rayon = "1.0" -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc9" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc9" } -ckb-dao = { path = "../../util/dao", version = "= 0.111.0-rc9" } -ckb-dao-utils = { path = "../../util/dao/utils", version = "= 0.111.0-rc9" } -ckb-logger = {path = "../../util/logger", version = "= 0.111.0-rc9"} -ckb-reward-calculator= { path = "../../util/reward-calculator", version = "= 0.111.0-rc9" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc9" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc10" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc10" } +ckb-dao = { path = "../../util/dao", version = "= 0.111.0-rc10" } +ckb-dao-utils = { path = "../../util/dao/utils", version = "= 0.111.0-rc10" } +ckb-logger = {path = "../../util/logger", version = "= 0.111.0-rc10"} +ckb-reward-calculator= { path = "../../util/reward-calculator", version = "= 0.111.0-rc10" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc10" } tokio = { version = "1", features = ["sync", "rt-multi-thread"] } -ckb-async-runtime = { path = "../../util/runtime", version = "= 0.111.0-rc9" } -ckb-verification-traits = { path = "../traits", version = "= 0.111.0-rc9" } -ckb-verification = { path = "..", version = "= 0.111.0-rc9" } +ckb-async-runtime = { path = "../../util/runtime", version = "= 0.111.0-rc10" } +ckb-verification-traits = { path = "../traits", version = "= 0.111.0-rc10" } +ckb-verification = { path = "..", version = "= 0.111.0-rc10" } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc9" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc9" } -ckb-launcher = { path = "../../util/launcher", version = "= 0.111.0-rc9" } -ckb-test-chain-utils = { path = "../../util/test-chain-utils", version = "= 0.111.0-rc9" } -ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc9", features = ["enable_faketime"]} +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc10" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc10" } +ckb-launcher = { path = "../../util/launcher", version = "= 0.111.0-rc10" } +ckb-test-chain-utils = { path = "../../util/test-chain-utils", version = "= 0.111.0-rc10" } +ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc10", features = ["enable_faketime"]} rand = "0.7" diff --git a/verification/traits/Cargo.toml b/verification/traits/Cargo.toml index cb8c0b1f4b..9ca7ba1d40 100644 --- a/verification/traits/Cargo.toml +++ b/verification/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification-traits" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,4 +10,4 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] bitflags = "1.0" -ckb-error = { path = "../../error", version = "= 0.111.0-rc9" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc10" } diff --git a/wasm-build-test/Cargo.toml b/wasm-build-test/Cargo.toml index 1a25506ff6..794d9da2bd 100644 --- a/wasm-build-test/Cargo.toml +++ b/wasm-build-test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-wasm-test" -version = "0.111.0-rc9" +version = "0.111.0-rc10" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,8 +9,8 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc9" } -ckb-script = { path = "../script", version = "= 0.111.0-rc9", default-features = false, features = [] } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } +ckb-script = { path = "../script", version = "= 0.111.0-rc10", default-features = false, features = [] } # Prevent this from interfering with workspaces [workspace] From 4a4cc2512ec85d8b825f2ce7492701316987c6b3 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Fri, 11 Aug 2023 16:43:50 +0800 Subject: [PATCH 074/125] Consensus: let `epoch_duration_target` affect epoch length Signed-off-by: Eval EXEC --- spec/src/consensus.rs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/spec/src/consensus.rs b/spec/src/consensus.rs index 4f39d87a77..0bbf219b33 100644 --- a/spec/src/consensus.rs +++ b/spec/src/consensus.rs @@ -804,6 +804,13 @@ impl Consensus { let remainder_reward = Capacity::shannons(primary_epoch_reward % epoch.length()); + let mut next_epoch_length = epoch.length(); + let epoch_length_from_param = + cmp::max(self.epoch_duration_target() / MIN_BLOCK_INTERVAL, 1); + if next_epoch_length != epoch_length_from_param { + next_epoch_length = self.epoch_duration_target() / MIN_BLOCK_INTERVAL; + } + let dummy_epoch_ext = epoch .clone() .into_builder() @@ -812,6 +819,7 @@ impl Consensus { .number(epoch.number() + 1) .last_block_hash_in_previous_epoch(header.hash()) .start_number(header.number() + 1) + .length(next_epoch_length) .build(); NextBlockEpoch::HeadBlock(dummy_epoch_ext) } else { From 3359141077e6a65398fda39a87cc06b9e3ed0aee Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Fri, 11 Aug 2023 17:38:46 +0800 Subject: [PATCH 075/125] Consensus: neat epoch_length calculation in permanent difficulty mode Co-authored-by: Quake Wang --- spec/src/consensus.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/spec/src/consensus.rs b/spec/src/consensus.rs index 0bbf219b33..b3e1e3b9b2 100644 --- a/spec/src/consensus.rs +++ b/spec/src/consensus.rs @@ -804,12 +804,7 @@ impl Consensus { let remainder_reward = Capacity::shannons(primary_epoch_reward % epoch.length()); - let mut next_epoch_length = epoch.length(); - let epoch_length_from_param = - cmp::max(self.epoch_duration_target() / MIN_BLOCK_INTERVAL, 1); - if next_epoch_length != epoch_length_from_param { - next_epoch_length = self.epoch_duration_target() / MIN_BLOCK_INTERVAL; - } +let next_epoch_length = (self.epoch_duration_target() + MIN_BLOCK_INTERVAL - 1) / MIN_BLOCK_INTERVAL let dummy_epoch_ext = epoch .clone() From 0fda8728d5f30a9bb86656ee16e9f4439de78f42 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Fri, 11 Aug 2023 17:39:26 +0800 Subject: [PATCH 076/125] Fix fmt --- spec/src/consensus.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/src/consensus.rs b/spec/src/consensus.rs index b3e1e3b9b2..776447aef0 100644 --- a/spec/src/consensus.rs +++ b/spec/src/consensus.rs @@ -804,7 +804,9 @@ impl Consensus { let remainder_reward = Capacity::shannons(primary_epoch_reward % epoch.length()); -let next_epoch_length = (self.epoch_duration_target() + MIN_BLOCK_INTERVAL - 1) / MIN_BLOCK_INTERVAL + let next_epoch_length = (self.epoch_duration_target() + MIN_BLOCK_INTERVAL + - 1) + / MIN_BLOCK_INTERVAL; let dummy_epoch_ext = epoch .clone() From a2159d05cb614506ddbe6176d8640cd651216675 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Thu, 10 Aug 2023 20:44:05 +0800 Subject: [PATCH 077/125] Test: Add bats test for `epoch_length_in_dummy` param Signed-off-by: Eval EXEC --- util/app-config/src/tests/cli_test.sh | 9 +- .../tests/later_bats_job/change_epoch.bats | 118 ++++++++++++++++++ 2 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 util/app-config/src/tests/later_bats_job/change_epoch.bats diff --git a/util/app-config/src/tests/cli_test.sh b/util/app-config/src/tests/cli_test.sh index 707b2b1dea..967e5c60e4 100755 --- a/util/app-config/src/tests/cli_test.sh +++ b/util/app-config/src/tests/cli_test.sh @@ -13,6 +13,7 @@ trap cleanup EXIT cp target/release/ckb ${CKB_BATS_TESTBED} cp util/app-config/src/tests/*.bats ${CKB_BATS_TESTBED} +cp -r util/app-config/src/tests/later_bats_job ${CKB_BATS_TESTBED} cp util/app-config/src/tests/*.sh ${CKB_BATS_TESTBED} if [ ! -d "/tmp/ckb_bats_assets/" ]; then @@ -47,9 +48,15 @@ export TMP_DIR=${CKB_BATS_TESTBED}/tmp_dir mkdir ${TMP_DIR} for bats_cases in *.bats; do - bats "$bats_cases" + bats --verbose-run --print-output-on-failure --show-output-of-passing-tests "$bats_cases" ret=$? if [ "$ret" -ne "0" ]; then exit "$ret" fi done + +bats --verbose-run --print-output-on-failure --show-output-of-passing-tests ./later_bats_job/change_epoch.bats +ret=$? +if [ "$ret" -ne "0" ]; then + exit "$ret" +fi diff --git a/util/app-config/src/tests/later_bats_job/change_epoch.bats b/util/app-config/src/tests/later_bats_job/change_epoch.bats new file mode 100644 index 0000000000..87cca69126 --- /dev/null +++ b/util/app-config/src/tests/later_bats_job/change_epoch.bats @@ -0,0 +1,118 @@ +#!/usr/bin/env bats +set -e + +bats_load_library 'bats-assert' +bats_load_library 'bats-support' + +NUMBER_OFFSET=0 +NUMBER_BITS=24 +NUMBER_MAXIMUM_VALUE=$((1 << NUMBER_BITS)) +NUMBER_MASK=$((NUMBER_MAXIMUM_VALUE - 1)) + +INDEX_OFFSET=$((NUMBER_BITS)) +INDEX_BITS=16 +INDEX_MAXIMUM_VALUE=$((1 << INDEX_BITS)) +INDEX_MASK=$((INDEX_MAXIMUM_VALUE - 1)) + +LENGTH_OFFSET=$((NUMBER_BITS + INDEX_BITS)) +LENGTH_BITS=16 +LENGTH_MAXIMUM_VALUE=$((1 << LENGTH_BITS)) +LENGTH_MASK=$((LENGTH_MAXIMUM_VALUE - 1)) + +function extract_epoch_number() { + local value=$1 + echo $(( (value >> NUMBER_OFFSET) & NUMBER_MASK )) +} + +function extract_epoch_index() { + local value=$1 + echo $(( (value >> INDEX_OFFSET) & INDEX_MASK )) +} + +function extract_epoch_length() { + local value=$1 + echo $(( (value >> LENGTH_OFFSET) & LENGTH_MASK )) +} + +function tip_header_epoch() { + curl -s -X POST http://127.0.0.1:8114 \ + -H 'Content-Type: application/json' \ + -d '{ "id": 42, "jsonrpc": "2.0", "method": "get_tip_header", "params": [ ] }' \ + | jq .result.epoch | xargs -I{} printf "%d\n" {} +} + +function tip_header_number() { + curl -s -X POST http://127.0.0.1:8114 \ + -H 'Content-Type: application/json' \ + -d '{ "id": 42, "jsonrpc": "2.0", "method": "get_tip_header", "params": [ ] }' \ + | jq .result.number | xargs -I{} printf "%d\n" {} +} + +function block_kill() { + kill $1 + while kill -0 $1; do + echo "waiting for $1 to exit" + sleep 1 + done +} + +function ckb_change_epoch_length_for_dumm_mode { #@test + ckb run -C ${CKB_DIRNAME} &> /dev/null & + + CKB_NODE_PID=$! + sleep 5 + + + TIP_EPOCH=$(tip_header_epoch) + + TIP_EPOCH_NUMBER=$(extract_epoch_number ${TIP_EPOCH}) + TIP_EPOCH_INDEX=$(extract_epoch_index ${TIP_EPOCH}) + TIP_EPOCH_LENGTH=$(extract_epoch_length ${TIP_EPOCH}) + TIP_NUMBER=$(tip_header_number) + + echo tip_number is ${TIP_NUMBER} + echo tip_epoch_number is ${TIP_EPOCH_NUMBER}, tip_epoch_index is ${TIP_EPOCH_INDEX}, tip_epoch_length is ${TIP_EPOCH_LENGTH} + + block_kill ${CKB_NODE_PID} + + wget https://raw.githubusercontent.com/nervosnetwork/ckb/develop/resource/specs/mainnet.toml + + ckb init -c dev --import-spec mainnet.toml --force + + sed -i 's/Eaglesong/Dummy/g' specs/dev.toml + sed -i '/genesis_epoch_length = 1743/a permanent_difficulty_in_dummy = true\nepoch_duration_target = 80\n' specs/dev.toml + + sed -i 's/poll_interval = 1000/poll_interval = 1/g' ckb-miner.toml + sed -i 's/value = 5000/value = 1/g' ckb-miner.toml + + sed -i 's/# \[block_assembler\]/\[block_assembler\]/g' ckb.toml + sed -i 's/# code_hash =/code_hash =/g' ckb.toml + sed -i 's/# args = "ckb-cli util blake2b --prefix-160 "/args = "0xc8328aabcd9b9e8e64fbc566c4385c3bdeb219d7"/g' ckb.toml + sed -i 's/# hash_type =/hash_type =/g' ckb.toml + sed -i 's/# message = "A 0x-prefixed hex string"/message = "0x"/g' ckb.toml + + + + ckb run --skip-spec-check --overwrite-spec -C ${CKB_DIRNAME} &> /dev/null & + CKB_NODE_PID=$! + + ckb miner -C ${CKB_DIRNAME} &> /dev/null & + CKB_MINER_PID=$! + + sleep 5 + + while [ $(tip_header_number) -lt $(( ${TIP_NUMBER} + ${TIP_EPOCH_LENGTH} )) ]; do + echo waiting for tip_number to be $(( ${TIP_NUMBER} + ${TIP_EPOCH_LENGTH} )) + sleep 1 + done + + echo latest tip_header_number is $(tip_header_number) + echo latest tip_header_epoch length is $(extract_epoch_length $(tip_header_epoch)) + echo latest tip_header_epoch number is $(extract_epoch_number $(tip_header_epoch)) + + # we specified epoch_duration_target = 80 in dev.toml, so the epoch length should be 10 + assert [ $(extract_epoch_length $(tip_header_epoch)) -eq 10 ] + + block_kill ${CKB_NODE_PID} + block_kill ${CKB_MINER_PID} +} From c1c3538b269e050747cf8e8c8a0050cbaf8145bc Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Thu, 10 Aug 2023 20:52:30 +0800 Subject: [PATCH 078/125] chore: bats test should use `make prod` --- .github/workflows/ci_integration_tests_ubuntu.yaml | 2 +- Makefile | 2 +- util/app-config/src/tests/cli_test.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_integration_tests_ubuntu.yaml b/.github/workflows/ci_integration_tests_ubuntu.yaml index 4af026b40b..467ea84cbc 100644 --- a/.github/workflows/ci_integration_tests_ubuntu.yaml +++ b/.github/workflows/ci_integration_tests_ubuntu.yaml @@ -93,7 +93,7 @@ jobs: - uses: actions/checkout@v3 - name: build ckb and run bats cli test run: | - make build + make prod make cli-test shell: bash env: diff --git a/Makefile b/Makefile index 7d7adb98fb..199a045172 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ doc-test: ## Run doc tests cargo test --all --doc .PHONY: cli-test -cli-test: build # Run ckb command line usage bats test +cli-test: prod # Run ckb command line usage bats test ./util/app-config/src/tests/cli_test.sh .PHONY: test diff --git a/util/app-config/src/tests/cli_test.sh b/util/app-config/src/tests/cli_test.sh index 967e5c60e4..fb592bc5b6 100755 --- a/util/app-config/src/tests/cli_test.sh +++ b/util/app-config/src/tests/cli_test.sh @@ -11,7 +11,7 @@ function cleanup { trap cleanup EXIT -cp target/release/ckb ${CKB_BATS_TESTBED} +cp target/prod/ckb ${CKB_BATS_TESTBED} cp util/app-config/src/tests/*.bats ${CKB_BATS_TESTBED} cp -r util/app-config/src/tests/later_bats_job ${CKB_BATS_TESTBED} cp util/app-config/src/tests/*.sh ${CKB_BATS_TESTBED} From cd81c548fed06686710a7d4430644cea60d283f1 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Mon, 14 Aug 2023 11:10:56 +0800 Subject: [PATCH 079/125] Fix `WithdrawDAO` usage of `epoch_duration_target` --- test/src/specs/dao/dao_tx.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/src/specs/dao/dao_tx.rs b/test/src/specs/dao/dao_tx.rs index ac4c8d1f4b..1026866542 100644 --- a/test/src/specs/dao/dao_tx.rs +++ b/test/src/specs/dao/dao_tx.rs @@ -12,7 +12,7 @@ pub struct WithdrawDAO; impl Spec for WithdrawDAO { fn modify_chain_spec(&self, spec: &mut ckb_chain_spec::ChainSpec) { spec.params.genesis_epoch_length = Some(2); - spec.params.epoch_duration_target = Some(2); + spec.params.epoch_duration_target = Some(16); spec.params.permanent_difficulty_in_dummy = Some(true); } From 0a716ece8eac1ddf59e511aa8d8505480604a27f Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Mon, 14 Aug 2023 11:11:32 +0800 Subject: [PATCH 080/125] Fix `epoch_duration_target` usages in integration tests --- test/src/specs/dao/dao_tx.rs | 2 +- test/src/specs/dao/satoshi_dao_occupied.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/src/specs/dao/dao_tx.rs b/test/src/specs/dao/dao_tx.rs index 1026866542..64eec88332 100644 --- a/test/src/specs/dao/dao_tx.rs +++ b/test/src/specs/dao/dao_tx.rs @@ -40,7 +40,7 @@ pub struct WithdrawDAOWithOverflowCapacity; impl Spec for WithdrawDAOWithOverflowCapacity { fn modify_chain_spec(&self, spec: &mut ckb_chain_spec::ChainSpec) { spec.params.genesis_epoch_length = Some(2); - spec.params.epoch_duration_target = Some(2); + spec.params.epoch_duration_target = Some(16); spec.params.permanent_difficulty_in_dummy = Some(true); } diff --git a/test/src/specs/dao/satoshi_dao_occupied.rs b/test/src/specs/dao/satoshi_dao_occupied.rs index d56d83b2c4..5756d25ceb 100644 --- a/test/src/specs/dao/satoshi_dao_occupied.rs +++ b/test/src/specs/dao/satoshi_dao_occupied.rs @@ -46,7 +46,7 @@ impl Spec for DAOWithSatoshiCellOccupied { let satoshi_cell = issue_satoshi_cell(); spec.genesis.issued_cells.push(satoshi_cell); spec.params.genesis_epoch_length = Some(2); - spec.params.epoch_duration_target = Some(2); + spec.params.epoch_duration_target = Some(16); spec.params.permanent_difficulty_in_dummy = Some(true); } } @@ -142,7 +142,7 @@ impl Spec for SpendSatoshiCell { spec.genesis.issued_cells.push(issue_satoshi_cell()); spec.genesis.satoshi_gift.satoshi_cell_occupied_ratio = satoshi_cell_occupied_ratio; spec.params.genesis_epoch_length = Some(2); - spec.params.epoch_duration_target = Some(2); + spec.params.epoch_duration_target = Some(16); spec.params.permanent_difficulty_in_dummy = Some(true); } } From 1fd74664fb9022cc72c5c5ae710df97fdf699458 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Tue, 15 Aug 2023 14:20:10 +0800 Subject: [PATCH 081/125] Fix integration test for `epoch_duration_target` --- test/src/specs/hardfork/v2021/since.rs | 2 ++ test/src/specs/hardfork/v2023/vm_version2.rs | 1 + 2 files changed, 3 insertions(+) diff --git a/test/src/specs/hardfork/v2021/since.rs b/test/src/specs/hardfork/v2021/since.rs index 2953c11fa8..527c599ba4 100644 --- a/test/src/specs/hardfork/v2021/since.rs +++ b/test/src/specs/hardfork/v2021/since.rs @@ -78,6 +78,7 @@ impl Spec for CheckAbsoluteEpochSince { fn modify_chain_spec(&self, spec: &mut ckb_chain_spec::ChainSpec) { spec.params.permanent_difficulty_in_dummy = Some(true); spec.params.genesis_epoch_length = Some(GENESIS_EPOCH_LENGTH); + spec.params.epoch_duration_target = Some(8 * GENESIS_EPOCH_LENGTH); } } @@ -113,6 +114,7 @@ impl Spec for CheckRelativeEpochSince { fn modify_chain_spec(&self, spec: &mut ckb_chain_spec::ChainSpec) { spec.params.permanent_difficulty_in_dummy = Some(true); spec.params.genesis_epoch_length = Some(GENESIS_EPOCH_LENGTH); + spec.params.epoch_duration_target = Some(8 * GENESIS_EPOCH_LENGTH); } } diff --git a/test/src/specs/hardfork/v2023/vm_version2.rs b/test/src/specs/hardfork/v2023/vm_version2.rs index adbc3258c5..43d5406b39 100644 --- a/test/src/specs/hardfork/v2023/vm_version2.rs +++ b/test/src/specs/hardfork/v2023/vm_version2.rs @@ -97,6 +97,7 @@ impl Spec for CheckVmVersion2 { fn modify_chain_spec(&self, spec: &mut ckb_chain_spec::ChainSpec) { spec.params.permanent_difficulty_in_dummy = Some(true); spec.params.genesis_epoch_length = Some(GENESIS_EPOCH_LENGTH); + spec.params.epoch_duration_target = Some(8 * GENESIS_EPOCH_LENGTH); if spec.params.hardfork.is_none() { spec.params.hardfork = Some(Default::default()); } From 46692da01853c1805388d4a3751fd0916fbe3777 Mon Sep 17 00:00:00 2001 From: yukang Date: Mon, 21 Aug 2023 10:52:31 +0800 Subject: [PATCH 082/125] Add reason to PoolTransactionReject Malformed error --- rpc/src/error.rs | 2 +- rpc/src/tests/error.rs | 2 +- test/src/main.rs | 1 + test/src/specs/mining/fee.rs | 48 ++++++++++++++++++++ tx-pool/src/component/tests/recent_reject.rs | 6 +-- tx-pool/src/util.rs | 12 ++++- util/jsonrpc-types/src/pool.rs | 2 +- util/types/src/core/tests/tx_pool.rs | 2 +- util/types/src/core/tx_pool.rs | 4 +- 9 files changed, 68 insertions(+), 11 deletions(-) diff --git a/rpc/src/error.rs b/rpc/src/error.rs index 1f86db9b72..4a9a93b477 100644 --- a/rpc/src/error.rs +++ b/rpc/src/error.rs @@ -169,7 +169,7 @@ impl RPCError { } Reject::Full(_) => RPCError::PoolIsFull, Reject::Duplicated(_) => RPCError::PoolRejectedDuplicatedTransaction, - Reject::Malformed(_) => RPCError::PoolRejectedMalformedTransaction, + Reject::Malformed(_, _) => RPCError::PoolRejectedMalformedTransaction, Reject::DeclaredWrongCycles(..) => RPCError::PoolRejectedMalformedTransaction, Reject::Resolve(_) => RPCError::TransactionFailedToResolve, Reject::Verification(_) => RPCError::TransactionFailedToVerify, diff --git a/rpc/src/tests/error.rs b/rpc/src/tests/error.rs index fc32e7f253..39fd18a539 100644 --- a/rpc/src/tests/error.rs +++ b/rpc/src/tests/error.rs @@ -47,7 +47,7 @@ fn test_submit_transaction_error() { RPCError::from_submit_transaction_reject(&reject).message ); - let reject = Reject::Malformed("cellbase like".to_owned()); + let reject = Reject::Malformed("cellbase like".to_owned(), "".to_owned()); assert_eq!( "PoolRejectedMalformedTransaction: Malformed cellbase like transaction", RPCError::from_submit_transaction_reject(&reject).message diff --git a/test/src/main.rs b/test/src/main.rs index 02e09c809b..c35dcada8e 100644 --- a/test/src/main.rs +++ b/test/src/main.rs @@ -517,6 +517,7 @@ fn all_specs() -> Vec> { Box::new(HandlingDescendantsOfCommitted), Box::new(ProposeOutOfOrder), Box::new(SubmitTransactionWhenItsParentInGap), + Box::new(MalformedTx), Box::new(SubmitTransactionWhenItsParentInProposed), Box::new(ProposeTransactionButParentNot), Box::new(ProposalExpireRuleForCommittingAndExpiredAtOneTime), diff --git a/test/src/specs/mining/fee.rs b/test/src/specs/mining/fee.rs index 12a77cab7a..42a3f36a76 100644 --- a/test/src/specs/mining/fee.rs +++ b/test/src/specs/mining/fee.rs @@ -6,8 +6,14 @@ use crate::util::transaction::always_success_transaction; use crate::{Node, Spec}; use crate::{DEFAULT_TX_PROPOSAL_WINDOW, FINALIZATION_DELAY_LENGTH}; use ckb_types::core::TransactionBuilder; +use ckb_types::packed::CellInput; use ckb_types::packed::CellOutput; +use ckb_types::packed::OutPoint; use ckb_types::prelude::*; +use ckb_types::{ + core::{capacity_bytes, Capacity}, + packed::CellOutputBuilder, +}; use rand::{thread_rng, Rng}; pub struct FeeOfTransaction; @@ -241,3 +247,45 @@ impl Spec for ProposeDuplicated { check_fee(node); } } + +pub struct MalformedTx; +impl Spec for MalformedTx { + fn run(&self, nodes: &mut Vec) { + let node0 = &nodes[0]; + + node0.mine_until_out_bootstrap_period(); + let tx0 = node0.new_transaction_spend_tip_cellbase(); + + let output = CellOutputBuilder::default() + .capacity(capacity_bytes!(1000).pack()) + .build(); + + let child = tx0 + .as_advanced_builder() + .set_inputs(vec![{ + CellInput::new_builder() + .previous_output(OutPoint::new(tx0.hash(), 0)) + .build() + }]) + .set_outputs(vec![output]) + .build(); + + let ret = node0 + .rpc_client() + .send_transaction_result(tx0.data().into()); + assert!(ret.is_ok()); + + node0.mine_until_transaction_confirm(&tx0.hash()); + + let ret = node0 + .rpc_client() + .send_transaction_result(child.data().into()); + + assert!(ret.is_err()); + let message = ret.unwrap_err().to_string(); + assert!( + message.contains("Malformed Overflow transaction") + && message.contains("expect (outputs capacity) <= (inputs capacity)") + ); + } +} diff --git a/tx-pool/src/component/tests/recent_reject.rs b/tx-pool/src/component/tests/recent_reject.rs index 35f1bbed86..843e3385bf 100644 --- a/tx-pool/src/component/tests/recent_reject.rs +++ b/tx-pool/src/component/tests/recent_reject.rs @@ -15,14 +15,14 @@ fn test_basic() { for i in 0..80u64 { let key = Byte32::new(blake2b_256(i.to_le_bytes())); recent_reject - .put(&key, Reject::Malformed(i.to_string())) + .put(&key, Reject::Malformed(i.to_string(), Default::default())) .unwrap(); } for i in 0..80u64 { let key = Byte32::new(blake2b_256(i.to_le_bytes())); let reject: ckb_jsonrpc_types::PoolTransactionReject = - Reject::Malformed(i.to_string()).into(); + Reject::Malformed(i.to_string(), Default::default()).into(); assert_eq!( recent_reject.get(&key).unwrap().unwrap(), serde_json::to_string(&reject).unwrap() @@ -32,7 +32,7 @@ fn test_basic() { for i in 0..80u64 { let key = Byte32::new(blake2b_256(i.to_le_bytes())); recent_reject - .put(&key, Reject::Malformed(i.to_string())) + .put(&key, Reject::Malformed(i.to_string(), Default::default())) .unwrap(); } diff --git a/tx-pool/src/util.rs b/tx-pool/src/util.rs index a330d2f058..28f141e2f1 100644 --- a/tx-pool/src/util.rs +++ b/tx-pool/src/util.rs @@ -33,7 +33,12 @@ pub(crate) fn check_tx_fee( ) -> Result { let fee = DaoCalculator::new(snapshot.consensus(), &snapshot.borrow_as_data_loader()) .transaction_fee(rtx) - .map_err(|err| Reject::Malformed(format!("{err}")))?; + .map_err(|err| { + Reject::Malformed( + format!("{err}"), + "expect (outputs capacity) <= (inputs capacity)".to_owned(), + ) + })?; // Theoretically we cannot use size as weight directly to calculate fee_rate, // here min fee rate is used as a cheap check, // so we will use size to calculate fee_rate directly @@ -68,7 +73,10 @@ pub(crate) fn non_contextual_verify( } // cellbase is only valid in a block, not as a loose transaction if tx.is_cellbase() { - return Err(Reject::Malformed("cellbase like".to_owned())); + return Err(Reject::Malformed( + "cellbase like".to_owned(), + Default::default(), + )); } Ok(()) diff --git a/util/jsonrpc-types/src/pool.rs b/util/jsonrpc-types/src/pool.rs index 4a18c73e7c..c08aefafd2 100644 --- a/util/jsonrpc-types/src/pool.rs +++ b/util/jsonrpc-types/src/pool.rs @@ -255,7 +255,7 @@ impl From for PoolTransactionReject { } Reject::Full(..) => Self::Full(format!("{reject}")), Reject::Duplicated(_) => Self::Duplicated(format!("{reject}")), - Reject::Malformed(_) => Self::Malformed(format!("{reject}")), + Reject::Malformed(_, _) => Self::Malformed(format!("{reject}")), Reject::DeclaredWrongCycles(..) => Self::DeclaredWrongCycles(format!("{reject}")), Reject::Resolve(_) => Self::Resolve(format!("{reject}")), Reject::Verification(_) => Self::Verification(format!("{reject}")), diff --git a/util/types/src/core/tests/tx_pool.rs b/util/types/src/core/tests/tx_pool.rs index 4930ffb3d2..3e73ae4606 100644 --- a/util/types/src/core/tests/tx_pool.rs +++ b/util/types/src/core/tests/tx_pool.rs @@ -22,7 +22,7 @@ fn test_if_is_malformed_tx() { let reject = Reject::Duplicated(Default::default()); assert!(!reject.is_malformed_tx()); - let reject = Reject::Malformed(Default::default()); + let reject = Reject::Malformed(Default::default(), Default::default()); assert!(reject.is_malformed_tx()); for error in vec![ diff --git a/util/types/src/core/tx_pool.rs b/util/types/src/core/tx_pool.rs index a1f182905d..b16709043c 100644 --- a/util/types/src/core/tx_pool.rs +++ b/util/types/src/core/tx_pool.rs @@ -35,7 +35,7 @@ pub enum Reject { /// Malformed transaction #[error("Malformed {0} transaction")] - Malformed(String), + Malformed(String, String), /// Declared wrong cycles #[error("Declared wrong cycles {0}, actual {1}")] @@ -76,7 +76,7 @@ impl Reject { /// Returns true if the reject reason is malformed tx. pub fn is_malformed_tx(&self) -> bool { match self { - Reject::Malformed(_) => true, + Reject::Malformed(_, _) => true, Reject::DeclaredWrongCycles(..) => true, Reject::Verification(err) => is_malformed_from_verification(err), Reject::Resolve(OutPointError::OverMaxDepExpansionLimit) => true, From ee88616e9fd72b0d4848a7eacd66c4b7d0b489fb Mon Sep 17 00:00:00 2001 From: driftluo Date: Thu, 24 Aug 2023 19:18:01 +0800 Subject: [PATCH 083/125] fix: fix disconnect miss await --- network/src/protocols/mod.rs | 4 ++-- network/src/protocols/support_protocols.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/network/src/protocols/mod.rs b/network/src/protocols/mod.rs index e0baaeab86..5697109d15 100644 --- a/network/src/protocols/mod.rs +++ b/network/src/protocols/mod.rs @@ -290,7 +290,7 @@ impl ServiceProtocol for CKBHandler { .network_state .ckb2023 .load(std::sync::atomic::Ordering::SeqCst) - && version != "3" + && version != crate::protocols::support_protocols::LASTEST_VERSION && context.proto_id != SupportProtocols::RelayV2.protocol_id() { debug!( @@ -298,7 +298,7 @@ impl ServiceProtocol for CKBHandler { context.session.id, context.proto_id, version ); let id = context.session.id; - let _ignore = context.disconnect(id); + let _ignore = context.disconnect(id).await; return; } self.network_state.with_peer_registry_mut(|reg| { diff --git a/network/src/protocols/support_protocols.rs b/network/src/protocols/support_protocols.rs index a4bbe9119a..8c56b3ab88 100644 --- a/network/src/protocols/support_protocols.rs +++ b/network/src/protocols/support_protocols.rs @@ -6,7 +6,7 @@ use p2p::{ }; use tokio_util::codec::length_delimited; -const LASTEST_VERSION: &str = "3"; +pub const LASTEST_VERSION: &str = "3"; /// All supported protocols /// From a2ee5c4e9c1365af9c6c87a633203807aea85355 Mon Sep 17 00:00:00 2001 From: zhangsoledad <787953403@qq.com> Date: Fri, 25 Aug 2023 15:58:13 +0800 Subject: [PATCH 084/125] chore: rename load_extension -> load_block_extension --- ...d_extension.rs => load_block_extension.rs} | 28 ++++++++++--------- script/src/syscalls/mod.rs | 6 ++-- .../syscalls/tests/vm_latest/syscalls_2.rs | 8 +++--- script/src/verify.rs | 12 ++++---- 4 files changed, 28 insertions(+), 26 deletions(-) rename script/src/syscalls/{load_extension.rs => load_block_extension.rs} (84%) diff --git a/script/src/syscalls/load_extension.rs b/script/src/syscalls/load_block_extension.rs similarity index 84% rename from script/src/syscalls/load_extension.rs rename to script/src/syscalls/load_block_extension.rs index cfbfc3e1b7..061bb7c4c8 100644 --- a/script/src/syscalls/load_extension.rs +++ b/script/src/syscalls/load_block_extension.rs @@ -2,8 +2,8 @@ use crate::types::Indices; use crate::{ cost_model::transferred_byte_cycles, syscalls::{ - utils::store_data, Source, SourceEntry, INDEX_OUT_OF_BOUND, ITEM_MISSING, LOAD_EXTENSION, - SUCCESS, + utils::store_data, Source, SourceEntry, INDEX_OUT_OF_BOUND, ITEM_MISSING, + LOAD_BLOCK_EXTENSION, SUCCESS, }, }; use ckb_traits::ExtensionProvider; @@ -19,19 +19,19 @@ use ckb_vm::{ use std::sync::Arc; #[derive(Debug)] -pub struct LoadExtension
{ +pub struct LoadBlockExtension
{ data_loader: DL, rtx: Arc, group_inputs: Indices, } -impl LoadExtension
{ +impl LoadBlockExtension
{ pub fn new( data_loader: DL, rtx: Arc, group_inputs: Indices, - ) -> LoadExtension
{ - LoadExtension { + ) -> LoadBlockExtension
{ + LoadBlockExtension { data_loader, rtx, group_inputs, @@ -53,11 +53,11 @@ impl LoadExtension
{ &self.rtx.resolved_cell_deps } - fn load_extension(&self, cell_meta: &CellMeta) -> Option { + fn load_block_extension(&self, cell_meta: &CellMeta) -> Option { let block_hash = &cell_meta .transaction_info .as_ref() - .expect("block_info of CellMeta should exists when load_extension in syscall") + .expect("block_info of CellMeta should exists when load_block_extension in syscall") .block_hash; if self .header_deps() @@ -76,13 +76,13 @@ impl LoadExtension
{ .resolved_inputs() .get(index) .ok_or(INDEX_OUT_OF_BOUND) - .and_then(|cell_meta| self.load_extension(cell_meta).ok_or(ITEM_MISSING)), + .and_then(|cell_meta| self.load_block_extension(cell_meta).ok_or(ITEM_MISSING)), Source::Transaction(SourceEntry::Output) => Err(INDEX_OUT_OF_BOUND), Source::Transaction(SourceEntry::CellDep) => self .resolved_cell_deps() .get(index) .ok_or(INDEX_OUT_OF_BOUND) - .and_then(|cell_meta| self.load_extension(cell_meta).ok_or(ITEM_MISSING)), + .and_then(|cell_meta| self.load_block_extension(cell_meta).ok_or(ITEM_MISSING)), Source::Transaction(SourceEntry::HeaderDep) => self .header_deps() .get(index) @@ -101,7 +101,7 @@ impl LoadExtension
{ .get(*actual_index) .ok_or(INDEX_OUT_OF_BOUND) }) - .and_then(|cell_meta| self.load_extension(cell_meta).ok_or(ITEM_MISSING)), + .and_then(|cell_meta| self.load_block_extension(cell_meta).ok_or(ITEM_MISSING)), Source::Group(SourceEntry::Output) => Err(INDEX_OUT_OF_BOUND), Source::Group(SourceEntry::CellDep) => Err(INDEX_OUT_OF_BOUND), Source::Group(SourceEntry::HeaderDep) => Err(INDEX_OUT_OF_BOUND), @@ -109,13 +109,15 @@ impl LoadExtension
{ } } -impl Syscalls for LoadExtension
{ +impl Syscalls + for LoadBlockExtension
+{ fn initialize(&mut self, _machine: &mut Mac) -> Result<(), VMError> { Ok(()) } fn ecall(&mut self, machine: &mut Mac) -> Result { - if machine.registers()[A7].to_u64() != LOAD_EXTENSION { + if machine.registers()[A7].to_u64() != LOAD_BLOCK_EXTENSION { return Ok(false); } diff --git a/script/src/syscalls/mod.rs b/script/src/syscalls/mod.rs index 17012469a5..ed0f5fc839 100644 --- a/script/src/syscalls/mod.rs +++ b/script/src/syscalls/mod.rs @@ -3,9 +3,9 @@ mod current_memory; mod debugger; mod exec; mod get_memory_limit; +mod load_block_extension; mod load_cell; mod load_cell_data; -mod load_extension; mod load_header; mod load_input; mod load_script; @@ -28,9 +28,9 @@ pub use self::current_memory::CurrentMemory; pub use self::debugger::Debugger; pub use self::exec::Exec; pub use self::get_memory_limit::GetMemoryLimit; +pub use self::load_block_extension::LoadBlockExtension; pub use self::load_cell::LoadCell; pub use self::load_cell_data::LoadCellData; -pub use self::load_extension::LoadExtension; pub use self::load_header::LoadHeader; pub use self::load_input::LoadInput; pub use self::load_script::LoadScript; @@ -78,7 +78,7 @@ pub const LOAD_CELL_DATA_SYSCALL_NUMBER: u64 = 2092; pub const SPAWN: u64 = 2101; pub const GET_MEMORY_LIMIT: u64 = 2102; pub const SET_CONTENT: u64 = 2103; -pub const LOAD_EXTENSION: u64 = 2104; +pub const LOAD_BLOCK_EXTENSION: u64 = 2104; pub const CURRENT_MEMORY: u64 = 2105; pub const DEBUG_PRINT_SYSCALL_NUMBER: u64 = 2177; #[cfg(test)] diff --git a/script/src/syscalls/tests/vm_latest/syscalls_2.rs b/script/src/syscalls/tests/vm_latest/syscalls_2.rs index b0ad504a91..372b0377d3 100644 --- a/script/src/syscalls/tests/vm_latest/syscalls_2.rs +++ b/script/src/syscalls/tests/vm_latest/syscalls_2.rs @@ -116,7 +116,7 @@ fn _test_load_extension( machine.set_register(A2, 0); // offset machine.set_register(A3, index); //index machine.set_register(A4, source); //source: 4 - machine.set_register(A7, LOAD_EXTENSION); // syscall number + machine.set_register(A7, LOAD_BLOCK_EXTENSION); // syscall number let data = Bytes::copy_from_slice(data); @@ -152,15 +152,15 @@ fn _test_load_extension( resolved_dep_groups: vec![], }); - let mut load_extension: LoadExtension = - LoadExtension::new(data_loader, rtx, group_inputs); + let mut load_block_extension: LoadBlockExtension = + LoadBlockExtension::new(data_loader, rtx, group_inputs); prop_assert!(machine .memory_mut() .store64(&size_addr, &(data.len() as u64 + 20)) .is_ok()); - prop_assert!(load_extension.ecall(&mut machine).is_ok()); + prop_assert!(load_block_extension.ecall(&mut machine).is_ok()); if let Err(code) = ret { prop_assert_eq!(machine.registers()[A0], u64::from(code)); diff --git a/script/src/verify.rs b/script/src/verify.rs index 653689e6dd..d75acf0c8c 100644 --- a/script/src/verify.rs +++ b/script/src/verify.rs @@ -5,8 +5,8 @@ use crate::{ error::{ScriptError, TransactionScriptError}, syscalls::{ spawn::{build_child_machine, update_caller_machine}, - CurrentCycles, CurrentMemory, Debugger, Exec, GetMemoryLimit, LoadCell, LoadCellData, - LoadExtension, LoadHeader, LoadInput, LoadScript, LoadScriptHash, LoadTx, LoadWitness, + CurrentCycles, CurrentMemory, Debugger, Exec, GetMemoryLimit, LoadBlockExtension, LoadCell, + LoadCellData, LoadHeader, LoadInput, LoadScript, LoadScriptHash, LoadTx, LoadWitness, SetContent, Spawn, VMVersion, }, type_id::TypeIdSystemScript, @@ -207,9 +207,9 @@ impl LoadExtension
{ - LoadExtension::new( + /// Build syscall: load_block_extension + pub fn build_load_block_extension(&self, group_inputs: Indices) -> LoadBlockExtension
{ + LoadBlockExtension::new( self.data_loader.clone(), Arc::clone(&self.rtx), group_inputs, @@ -308,7 +308,7 @@ impl= ScriptVersion::V2 { syscalls.push(Box::new( - self.build_load_extension(Arc::clone(&script_group_input_indices)), + self.build_load_block_extension(Arc::clone(&script_group_input_indices)), )); } syscalls From 284a0ba3b3df86364b25d7d651f4f0ecc58507d6 Mon Sep 17 00:00:00 2001 From: mohanson Date: Mon, 28 Aug 2023 13:53:01 +0800 Subject: [PATCH 085/125] chore(scripts): update ckb-vm to v0.24.6 --- Cargo.lock | 8 ++++---- script/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1ef3c681b9..50505ce8be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1528,9 +1528,9 @@ dependencies = [ [[package]] name = "ckb-vm" -version = "0.24.4" +version = "0.24.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40894adbde925bfc6584d324a06228e19d78bd877146fc7df085927552d29f50" +checksum = "0cc004a826b9bc9319ffae0b8415690e1b5f1482266d55fbd43843aa40ddcd63" dependencies = [ "byteorder", "bytes 1.4.0", @@ -1546,9 +1546,9 @@ dependencies = [ [[package]] name = "ckb-vm-definitions" -version = "0.24.4" +version = "0.24.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0253bdea8dc20db90b58fe54e01392f71989e0567d42e09e7f8e588f156551db" +checksum = "c4ced3ff9d79b53d93c106720f6c1f855694290e33581850e05c859500eee83f" dependencies = [ "paste", ] diff --git a/script/Cargo.toml b/script/Cargo.toml index 6010f49b34..0f6d6f7a63 100644 --- a/script/Cargo.toml +++ b/script/Cargo.toml @@ -22,7 +22,7 @@ ckb-traits = { path = "../traits", version = "= 0.111.0-rc10" } byteorder = "1.3.1" ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc10" } -ckb-vm = { version = "=0.24.4", default-features = false } +ckb-vm = { version = "=0.24.6", default-features = false } faster-hex = "0.6" ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10", optional = true } serde = { version = "1.0", features = ["derive"] } From d7cc2b77733c5afdd0ca589b1b234fbe8e11e1cf Mon Sep 17 00:00:00 2001 From: mohanson Date: Tue, 29 Aug 2023 10:45:29 +0800 Subject: [PATCH 086/125] fix(script/spawn): calucate the correct cycles_base --- script/src/syscalls/spawn.rs | 6 +++++- script/src/verify.rs | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/script/src/syscalls/spawn.rs b/script/src/syscalls/spawn.rs index 7c96b2b682..888a2a6a95 100644 --- a/script/src/syscalls/spawn.rs +++ b/script/src/syscalls/spawn.rs @@ -25,6 +25,7 @@ pub struct Spawn
{ script_version: ScriptVersion, syscalls_generator: TransactionScriptsSyscallsGenerator
, peak_memory: u64, + cycles_base: u64, context: Arc>, } @@ -34,6 +35,7 @@ impl Spaw script_version: ScriptVersion, syscalls_generator: TransactionScriptsSyscallsGenerator
, peak_memory: u64, + cycles_base: u64, context: Arc>, ) -> Self { Self { @@ -41,6 +43,7 @@ impl Spaw script_version, syscalls_generator, peak_memory, + cycles_base, context, } } @@ -155,7 +158,7 @@ where caller_exit_code_addr: exit_code_addr.to_u64(), caller_content_addr: content_addr.to_u64(), caller_content_length_addr: content_length_addr.to_u64(), - cycles_base: machine.cycles(), + cycles_base: self.cycles_base + machine.cycles(), }; let mut machine_child = build_child_machine( &self.script_group, @@ -290,6 +293,7 @@ pub fn build_child_machine< script_version, script_group, *callee_peak_memory, + *cycles_base, Arc::clone(context), ))); let machine_builder = machine_builder.syscall(Box::new( diff --git a/script/src/verify.rs b/script/src/verify.rs index d75acf0c8c..da950b7899 100644 --- a/script/src/verify.rs +++ b/script/src/verify.rs @@ -246,6 +246,7 @@ impl>, ) -> Spawn
{ Spawn::new( @@ -253,6 +254,7 @@ impl Date: Tue, 29 Aug 2023 11:02:20 +0800 Subject: [PATCH 087/125] fmt: cargo fmt --- script/src/verify.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/script/src/verify.rs b/script/src/verify.rs index da950b7899..8f8c406c7e 100644 --- a/script/src/verify.rs +++ b/script/src/verify.rs @@ -331,7 +331,13 @@ impl Date: Thu, 31 Aug 2023 15:36:39 +0800 Subject: [PATCH 088/125] Fix parse `RelayV3` message name --- sync/src/utils.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sync/src/utils.rs b/sync/src/utils.rs index dcf1f97118..fac6e7ef05 100644 --- a/sync/src/utils.rs +++ b/sync/src/utils.rs @@ -93,7 +93,9 @@ fn message_name(protocol_id: ProtocolId, message: &Message) -> .to_enum() .item_name() .to_owned() - } else if protocol_id == SupportProtocols::RelayV2.protocol_id() { + } else if protocol_id == SupportProtocols::RelayV2.protocol_id() + || protocol_id == SupportProtocols::RelayV3.protocol_id() + { RelayMessageReader::new_unchecked(message.as_slice()) .to_enum() .item_name() From 2ee232c1d5355bf159e37d734d0e4fdcc3143f89 Mon Sep 17 00:00:00 2001 From: quake Date: Wed, 30 Aug 2023 09:13:31 +0900 Subject: [PATCH 089/125] feat: notify dummy miner for new work --- docs/hashes.toml | 2 +- miner/src/worker/dummy.rs | 29 +++- resource/specs/dev.toml | 1 + spec/src/consensus.rs | 25 +++ spec/src/lib.rs | 23 ++- spec/src/tests/mod.rs | 31 ++++ tx-pool/src/chunk_process.rs | 2 +- tx-pool/src/process.rs | 2 +- tx-pool/src/util.rs | 4 +- .../src/contextual_block_verifier.rs | 2 +- .../src/tests/transaction_verifier.rs | 159 ++++++++++++++++-- verification/src/transaction_verifier.rs | 31 +++- 12 files changed, 274 insertions(+), 37 deletions(-) diff --git a/docs/hashes.toml b/docs/hashes.toml index 73c4e670b2..15808ef248 100644 --- a/docs/hashes.toml +++ b/docs/hashes.toml @@ -127,7 +127,7 @@ tx_hash = "0xd5780747735fd22c9ba7363bde8afe59061658caa836962867253b03cbda264e" index = 1 [ckb_dev] -spec_hash = "0x6cb679a15a7ff16596cad85f4680ab4335c87bcbf43956c591c23d11841719e4" +spec_hash = "0xab85c78cf9641a7709f9d48ba06415c283050888c9fb927d743bc521aa1ddfec" genesis = "0x823b2ff5785b12da8b1363cac9a5cbe566d8b715a4311441b119c39a0367488c" cellbase = "0xa563884b3686078ec7e7677a5f86449b15cf2693f3c1241766c6996f206cc541" diff --git a/miner/src/worker/dummy.rs b/miner/src/worker/dummy.rs index 6bf9f8f326..ee280bac0f 100644 --- a/miner/src/worker/dummy.rs +++ b/miner/src/worker/dummy.rs @@ -8,7 +8,7 @@ use indicatif::ProgressBar; use rand::thread_rng; use rand_distr::{self as dist, Distribution as _}; use std::thread; -use std::time::Duration; +use std::time::{Duration, Instant}; pub struct Dummy { delay: Delay, @@ -94,10 +94,29 @@ impl Dummy { } } - fn solve(&self, pow_hash: Byte32, work: Work, nonce: u128) { - thread::sleep(self.delay.duration()); - if let Err(err) = self.nonce_tx.send((pow_hash, work, nonce)) { - error!("nonce_tx send error {:?}", err); + fn solve(&mut self, mut pow_hash: Byte32, mut work: Work, nonce: u128) { + let instant = Instant::now(); + let delay = self.delay.duration(); + loop { + thread::sleep(Duration::from_millis(10)); + if instant.elapsed() > delay { + if let Err(err) = self.nonce_tx.send((pow_hash, work, nonce)) { + error!("nonce_tx send error {:?}", err); + } + return; + } + // if there is new work and pow_hash changed, start working on the new one + if let Ok(WorkerMessage::NewWork { + pow_hash: new_pow_hash, + work: new_work, + .. + }) = self.worker_rx.try_recv() + { + if new_pow_hash != pow_hash { + pow_hash = new_pow_hash; + work = new_work; + } + } } } } diff --git a/resource/specs/dev.toml b/resource/specs/dev.toml index 8ae8149df2..da6f72eff3 100644 --- a/resource/specs/dev.toml +++ b/resource/specs/dev.toml @@ -94,6 +94,7 @@ genesis_epoch_length = 1000 # For development and testing purposes only. # Keep difficulty be permanent if the pow is Dummy. (default: false) permanent_difficulty_in_dummy = true +starting_block_limiting_dao_withdrawing_lock = 0 [params.hardfork] ckb2023 = 0 diff --git a/spec/src/consensus.rs b/spec/src/consensus.rs index 776447aef0..461225a3d9 100644 --- a/spec/src/consensus.rs +++ b/spec/src/consensus.rs @@ -95,6 +95,10 @@ pub(crate) const SATOSHI_CELL_OCCUPIED_RATIO: Ratio = Ratio::new(6, 10); pub(crate) const LC_MAINNET_ACTIVATION_THRESHOLD: Ratio = Ratio::new(8, 10); pub(crate) const TESTNET_ACTIVATION_THRESHOLD: Ratio = Ratio::new(3, 4); +/// The starting block number from which the lock script size of a DAO withdrawing +/// cell shall be limited +pub(crate) const STARTING_BLOCK_LIMITING_DAO_WITHDRAWING_LOCK: u64 = 10_000_000; + /// The struct represent CKB two-step-transaction-confirmation params /// /// [two-step-transaction-confirmation params](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0020-ckb-consensus-protocol/0020-ckb-consensus-protocol.md#two-step-transaction-confirmation) @@ -289,6 +293,8 @@ impl ConsensusBuilder { hardfork_switch: HardForks::new_mirana(), deployments: HashMap::new(), versionbits_caches: VersionbitsCache::default(), + starting_block_limiting_dao_withdrawing_lock: + STARTING_BLOCK_LIMITING_DAO_WITHDRAWING_LOCK, }, } } @@ -483,6 +489,17 @@ impl ConsensusBuilder { self.inner.deployments = deployments; self } + + ///The starting block number where Nervos DAO withdrawing cell's lock is + /// size limited. + pub fn starting_block_limiting_dao_withdrawing_lock( + mut self, + starting_block_limiting_dao_withdrawing_lock: u64, + ) -> Self { + self.inner.starting_block_limiting_dao_withdrawing_lock = + starting_block_limiting_dao_withdrawing_lock; + self + } } /// Struct Consensus defines various parameters that influence chain consensus @@ -563,6 +580,8 @@ pub struct Consensus { pub deployments: HashMap, /// Soft fork state cache pub versionbits_caches: VersionbitsCache, + /// Starting block where DAO withdrawing lock is limited in size + pub starting_block_limiting_dao_withdrawing_lock: u64, } // genesis difficulty should not be zero @@ -741,6 +760,12 @@ impl Consensus { self.tx_proposal_window } + /// The starting block number where Nervos DAO withdrawing cell's lock is + /// size limited. + pub fn starting_block_limiting_dao_withdrawing_lock(&self) -> u64 { + self.starting_block_limiting_dao_withdrawing_lock + } + // Apply the dampening filter on hash_rate estimation calculate fn bounding_hash_rate( &self, diff --git a/spec/src/lib.rs b/spec/src/lib.rs index c08eb123e3..627e66c047 100644 --- a/spec/src/lib.rs +++ b/spec/src/lib.rs @@ -90,7 +90,7 @@ pub mod default_params { CELLBASE_MATURITY, DEFAULT_EPOCH_DURATION_TARGET, DEFAULT_ORPHAN_RATE_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, + MAX_BLOCK_PROPOSALS_LIMIT, STARTING_BLOCK_LIMITING_DAO_WITHDRAWING_LOCK, }; use ckb_types::core::{Capacity, Cycle, EpochNumber}; @@ -170,6 +170,13 @@ pub mod default_params { pub fn orphan_rate_target() -> (u32, u32) { DEFAULT_ORPHAN_RATE_TARGET } + + /// The default starting_block_limiting_dao_withdrawing_lock + /// + /// Apply to [`starting_block_limiting_dao_withdrawing_lock`](../consensus/struct.Consensus.html#structfield.starting_block_limiting_dao_withdrawing_lock) + pub fn starting_block_limiting_dao_withdrawing_lock() -> u64 { + STARTING_BLOCK_LIMITING_DAO_WITHDRAWING_LOCK + } } /// Parameters for CKB block chain @@ -231,6 +238,11 @@ pub struct Params { /// See [`orphan_rate_target`](consensus/struct.Consensus.html#structfield.orphan_rate_target) #[serde(skip_serializing_if = "Option::is_none")] pub orphan_rate_target: Option<(u32, u32)>, + /// The starting_block_limiting_dao_withdrawing_lock. + /// + /// See [`starting_block_limiting_dao_withdrawing_lock`](consensus/struct.Consensus.html#structfield.starting_block_limiting_dao_withdrawing_lock) + #[serde(skip_serializing_if = "Option::is_none")] + pub starting_block_limiting_dao_withdrawing_lock: Option, /// The parameters for hard fork features. /// /// See [`hardfork_switch`](consensus/struct.Consensus.html#structfield.hardfork_switch) @@ -304,6 +316,12 @@ impl Params { self.orphan_rate_target .unwrap_or_else(default_params::orphan_rate_target) } + + /// Return the `starting_block_limiting_dao_withdrawing_lock`, otherwise if None, returns the default value + pub fn starting_block_limiting_dao_withdrawing_lock(&self) -> u64 { + self.starting_block_limiting_dao_withdrawing_lock + .unwrap_or_else(default_params::starting_block_limiting_dao_withdrawing_lock) + } } /// The genesis information @@ -585,6 +603,9 @@ impl ChainSpec { .permanent_difficulty_in_dummy(self.params.permanent_difficulty_in_dummy()) .max_block_proposals_limit(self.params.max_block_proposals_limit()) .orphan_rate_target(self.params.orphan_rate_target()) + .starting_block_limiting_dao_withdrawing_lock( + self.params.starting_block_limiting_dao_withdrawing_lock(), + ) .hardfork_switch(hardfork_switch); if let Some(deployments) = self.softfork_deployments() { diff --git a/spec/src/tests/mod.rs b/spec/src/tests/mod.rs index 07bfd3362f..613381293b 100644 --- a/spec/src/tests/mod.rs +++ b/spec/src/tests/mod.rs @@ -213,6 +213,18 @@ fn test_default_params() { }; assert_eq!(params, expected); + + let test_params: &str = r#" + starting_block_limiting_dao_withdrawing_lock = 77 + "#; + + let params: Params = toml::from_str(test_params).unwrap(); + let expected = Params { + starting_block_limiting_dao_withdrawing_lock: Some(77), + ..Default::default() + }; + + assert_eq!(params, expected); } #[test] @@ -256,3 +268,22 @@ fn test_default_genesis_epoch_ext() { assert_eq!(genesis_epoch_ext, expected); } + +#[test] +fn test_devnet_limits_dao_withdrawing_lock_from_genesis() { + let chain_spec = load_spec_by_name("ckb_dev"); + let consensus = chain_spec.build_consensus().unwrap(); + + assert_eq!(consensus.starting_block_limiting_dao_withdrawing_lock(), 0); +} + +#[test] +fn test_mainnet_limits_dao_withdrawing_lock_from_10000000() { + let chain_spec = load_spec_by_name("ckb"); + let consensus = chain_spec.build_consensus().unwrap(); + + assert_eq!( + consensus.starting_block_limiting_dao_withdrawing_lock(), + 10000000 + ); +} diff --git a/tx-pool/src/chunk_process.rs b/tx-pool/src/chunk_process.rs index 889ce916f6..f64bb85504 100644 --- a/tx-pool/src/chunk_process.rs +++ b/tx-pool/src/chunk_process.rs @@ -279,7 +279,7 @@ impl ChunkProcess { .and_then(|result| { DaoScriptSizeVerifier::new( Arc::clone(&rtx), - consensus.dao_type_hash(), + Arc::clone(&consensus), data_loader.clone(), ) .verify()?; diff --git a/tx-pool/src/process.rs b/tx-pool/src/process.rs index b868de686e..c631bbc654 100644 --- a/tx-pool/src/process.rs +++ b/tx-pool/src/process.rs @@ -605,7 +605,7 @@ impl TxPoolService { ScriptVerifyResult::Completed(cycles) => { if let Err(e) = DaoScriptSizeVerifier::new( Arc::clone(&rtx), - self.consensus.dao_type_hash(), + Arc::clone(&self.consensus), snapshot.as_data_loader(), ) .verify() diff --git a/tx-pool/src/util.rs b/tx-pool/src/util.rs index 28f141e2f1..ea8757e997 100644 --- a/tx-pool/src/util.rs +++ b/tx-pool/src/util.rs @@ -106,7 +106,7 @@ pub(crate) fn verify_rtx( .and_then(|result| { DaoScriptSizeVerifier::new( rtx, - snapshot.cloned_consensus().dao_type_hash(), + snapshot.cloned_consensus(), snapshot.as_data_loader(), ) .verify()?; @@ -122,7 +122,7 @@ pub(crate) fn verify_rtx( .and_then(|result| { DaoScriptSizeVerifier::new( rtx, - snapshot.cloned_consensus().dao_type_hash(), + snapshot.cloned_consensus(), snapshot.as_data_loader(), ) .verify()?; diff --git a/verification/contextual/src/contextual_block_verifier.rs b/verification/contextual/src/contextual_block_verifier.rs index a3ed5c002c..18e848e69e 100644 --- a/verification/contextual/src/contextual_block_verifier.rs +++ b/verification/contextual/src/contextual_block_verifier.rs @@ -472,7 +472,7 @@ impl<'a, 'b, CS: ChainStore + VersionbitsIndexer + 'static> BlockTxsVerifier<'a, if self.context.versionbits_active(DeploymentPos::LightClient, self.parent) { DaoScriptSizeVerifier::new( Arc::clone(tx), - self.context.consensus.dao_type_hash(), + Arc::clone(&self.context.consensus), self.context.store.as_data_loader(), ).verify()?; } diff --git a/verification/src/tests/transaction_verifier.rs b/verification/src/tests/transaction_verifier.rs index 97813a9e30..4dd123e90b 100644 --- a/verification/src/tests/transaction_verifier.rs +++ b/verification/src/tests/transaction_verifier.rs @@ -4,7 +4,11 @@ use super::super::transaction_verifier::{ }; use crate::error::TransactionErrorSource; use crate::{TransactionError, TxVerifyEnv}; -use ckb_chain_spec::{build_genesis_type_id_script, consensus::ConsensusBuilder, OUTPUT_INDEX_DAO}; +use ckb_chain_spec::{ + build_genesis_type_id_script, + consensus::{Consensus, ConsensusBuilder}, + OUTPUT_INDEX_DAO, +}; use ckb_error::{assert_error_eq, Error}; use ckb_test_chain_utils::{MockMedianTime, MOCK_MEDIAN_TIME_COUNT}; use ckb_traits::CellDataProvider; @@ -15,7 +19,7 @@ use ckb_types::{ capacity_bytes, cell::{CellMetaBuilder, ResolvedTransaction}, hardfork::HardForks, - BlockNumber, Capacity, EpochNumber, EpochNumberWithFraction, HeaderView, + BlockNumber, Capacity, EpochNumber, EpochNumberWithFraction, HeaderView, ScriptHashType, TransactionBuilder, TransactionInfo, TransactionView, }, h256, @@ -793,9 +797,31 @@ impl CellDataProvider for EmptyDataProvider { } } +fn build_consensus_with_dao_limiting_block(block_number: u64) -> (Arc, Script) { + let dao_script = build_genesis_type_id_script(OUTPUT_INDEX_DAO); + let mut consensus = ConsensusBuilder::default() + .starting_block_limiting_dao_withdrawing_lock(block_number) + .build(); + + // Default consensus built this way only has one dummy output in the + // cellbase transaction from genesis block, meaning it will be missing + // the dao script. For simplicity, we are hacking consensus here with + // a dao_type_hash value, a proper way should be creating a proper genesis + // block here, but we will leave it till we really need it. + consensus.dao_type_hash = Some(dao_script.calc_script_hash()); + + let dao_type_script = Script::new_builder() + .code_hash(dao_script.calc_script_hash()) + .hash_type(ScriptHashType::Type.into()) + .build(); + + (Arc::new(consensus), dao_type_script) +} + #[test] fn test_dao_disables_different_lock_script_size() { - let dao_type_script = build_genesis_type_id_script(OUTPUT_INDEX_DAO); + let (consensus, dao_type_script) = build_consensus_with_dao_limiting_block(20000); + let transaction = TransactionBuilder::default() .outputs(vec![ CellOutput::new_builder() @@ -824,21 +850,30 @@ fn test_dao_disables_different_lock_script_size() { .build(), Bytes::new(), ) + .transaction_info(mock_transaction_info( + 20010, + EpochNumberWithFraction::new(10, 0, 10), + 0, + )) .build(), CellMetaBuilder::from_cell_output( CellOutput::new_builder() .capacity(capacity_bytes!(201).pack()) .lock(Script::new_builder().args(Bytes::new().pack()).build()) - .type_(Some(dao_type_script.clone()).pack()) + .type_(Some(dao_type_script).pack()) .build(), Bytes::from(vec![0; 8]), ) + .transaction_info(mock_transaction_info( + 20011, + EpochNumberWithFraction::new(10, 0, 10), + 0, + )) .build(), ], resolved_dep_groups: vec![], }); - let verifier = - DaoScriptSizeVerifier::new(rtx, Some(dao_type_script.code_hash()), EmptyDataProvider {}); + let verifier = DaoScriptSizeVerifier::new(rtx, consensus, EmptyDataProvider {}); assert_error_eq!( verifier.verify().unwrap_err(), @@ -846,9 +881,70 @@ fn test_dao_disables_different_lock_script_size() { ); } +#[test] +fn test_dao_disables_different_lock_script_size_before_limiting_block() { + let (consensus, dao_type_script) = build_consensus_with_dao_limiting_block(21000); + + let transaction = TransactionBuilder::default() + .outputs(vec![ + CellOutput::new_builder() + .capacity(capacity_bytes!(50).pack()) + .build(), + CellOutput::new_builder() + .capacity(capacity_bytes!(200).pack()) + .lock( + Script::new_builder() + .args(Bytes::from(vec![1; 20]).pack()) + .build(), + ) + .type_(Some(dao_type_script.clone()).pack()) + .build(), + ]) + .outputs_data(vec![Bytes::new().pack(); 2]) + .build(); + + let rtx = Arc::new(ResolvedTransaction { + transaction, + resolved_cell_deps: Vec::new(), + resolved_inputs: vec![ + CellMetaBuilder::from_cell_output( + CellOutput::new_builder() + .capacity(capacity_bytes!(50).pack()) + .build(), + Bytes::new(), + ) + .transaction_info(mock_transaction_info( + 20010, + EpochNumberWithFraction::new(10, 0, 10), + 0, + )) + .build(), + CellMetaBuilder::from_cell_output( + CellOutput::new_builder() + .capacity(capacity_bytes!(201).pack()) + .lock(Script::new_builder().args(Bytes::new().pack()).build()) + .type_(Some(dao_type_script).pack()) + .build(), + Bytes::from(vec![0; 8]), + ) + .transaction_info(mock_transaction_info( + 20011, + EpochNumberWithFraction::new(10, 0, 10), + 0, + )) + .build(), + ], + resolved_dep_groups: vec![], + }); + let verifier = DaoScriptSizeVerifier::new(rtx, consensus, EmptyDataProvider {}); + + assert!(verifier.verify().is_ok()); +} + #[test] fn test_non_dao_allows_lock_script_size() { - let dao_type_script = build_genesis_type_id_script(OUTPUT_INDEX_DAO); + let (consensus, _dao_type_script) = build_consensus_with_dao_limiting_block(20000); + let transaction = TransactionBuilder::default() .outputs(vec![ CellOutput::new_builder() @@ -876,6 +972,11 @@ fn test_non_dao_allows_lock_script_size() { .build(), Bytes::new(), ) + .transaction_info(mock_transaction_info( + 20010, + EpochNumberWithFraction::new(10, 0, 10), + 0, + )) .build(), CellMetaBuilder::from_cell_output( CellOutput::new_builder() @@ -884,19 +985,24 @@ fn test_non_dao_allows_lock_script_size() { .build(), Bytes::from(vec![0; 8]), ) + .transaction_info(mock_transaction_info( + 20011, + EpochNumberWithFraction::new(10, 0, 10), + 0, + )) .build(), ], resolved_dep_groups: vec![], }); - let verifier = - DaoScriptSizeVerifier::new(rtx, Some(dao_type_script.code_hash()), EmptyDataProvider {}); + let verifier = DaoScriptSizeVerifier::new(rtx, consensus, EmptyDataProvider {}); assert!(verifier.verify().is_ok()); } #[test] fn test_dao_allows_different_lock_script_size_in_withdraw_phase_2() { - let dao_type_script = build_genesis_type_id_script(OUTPUT_INDEX_DAO); + let (consensus, dao_type_script) = build_consensus_with_dao_limiting_block(20000); + let transaction = TransactionBuilder::default() .outputs(vec![ CellOutput::new_builder() @@ -925,28 +1031,38 @@ fn test_dao_allows_different_lock_script_size_in_withdraw_phase_2() { .build(), Bytes::new(), ) + .transaction_info(mock_transaction_info( + 20010, + EpochNumberWithFraction::new(10, 0, 10), + 0, + )) .build(), CellMetaBuilder::from_cell_output( CellOutput::new_builder() .capacity(capacity_bytes!(201).pack()) .lock(Script::new_builder().args(Bytes::new().pack()).build()) - .type_(Some(dao_type_script.clone()).pack()) + .type_(Some(dao_type_script).pack()) .build(), Bytes::from(vec![1; 8]), ) + .transaction_info(mock_transaction_info( + 20011, + EpochNumberWithFraction::new(10, 0, 10), + 0, + )) .build(), ], resolved_dep_groups: vec![], }); - let verifier = - DaoScriptSizeVerifier::new(rtx, Some(dao_type_script.code_hash()), EmptyDataProvider {}); + let verifier = DaoScriptSizeVerifier::new(rtx, consensus, EmptyDataProvider {}); assert!(verifier.verify().is_ok()); } #[test] fn test_dao_allows_different_lock_script_size_using_normal_cells_in_withdraw_phase_2() { - let dao_type_script = build_genesis_type_id_script(OUTPUT_INDEX_DAO); + let (consensus, dao_type_script) = build_consensus_with_dao_limiting_block(20000); + let transaction = TransactionBuilder::default() .outputs(vec![ CellOutput::new_builder() @@ -959,7 +1075,7 @@ fn test_dao_allows_different_lock_script_size_using_normal_cells_in_withdraw_pha .args(Bytes::from(vec![1; 20]).pack()) .build(), ) - .type_(Some(dao_type_script.clone()).pack()) + .type_(Some(dao_type_script).pack()) .build(), ]) .outputs_data(vec![]) @@ -975,6 +1091,11 @@ fn test_dao_allows_different_lock_script_size_using_normal_cells_in_withdraw_pha .build(), Bytes::new(), ) + .transaction_info(mock_transaction_info( + 20010, + EpochNumberWithFraction::new(10, 0, 10), + 0, + )) .build(), CellMetaBuilder::from_cell_output( CellOutput::new_builder() @@ -983,12 +1104,16 @@ fn test_dao_allows_different_lock_script_size_using_normal_cells_in_withdraw_pha .build(), Bytes::from(vec![1; 8]), ) + .transaction_info(mock_transaction_info( + 20011, + EpochNumberWithFraction::new(10, 0, 10), + 0, + )) .build(), ], resolved_dep_groups: vec![], }); - let verifier = - DaoScriptSizeVerifier::new(rtx, Some(dao_type_script.code_hash()), EmptyDataProvider {}); + let verifier = DaoScriptSizeVerifier::new(rtx, consensus, EmptyDataProvider {}); assert!(verifier.verify().is_ok()); } diff --git a/verification/src/transaction_verifier.rs b/verification/src/transaction_verifier.rs index 22468e862a..11214f583f 100644 --- a/verification/src/transaction_verifier.rs +++ b/verification/src/transaction_verifier.rs @@ -972,8 +972,7 @@ where /// It provides a temporary solution till Nervos DAO script can be properly upgraded. pub struct DaoScriptSizeVerifier
{ resolved_transaction: Arc, - // It's Option because genesis block might not always have dao system cell - dao_type_hash: Option, + consensus: Arc, data_loader: DL, } @@ -981,23 +980,27 @@ impl DaoScriptSizeVerifier
{ /// Create a new `DaoScriptSizeVerifier` pub fn new( resolved_transaction: Arc, - dao_type_hash: Option, + consensus: Arc, data_loader: DL, ) -> Self { DaoScriptSizeVerifier { resolved_transaction, - dao_type_hash, + consensus, data_loader, } } + fn dao_type_hash(&self) -> Option { + self.consensus.dao_type_hash() + } + /// Verifies that for all Nervos DAO transactions, withdrawing cells must use lock scripts /// of the same size as corresponding deposit cells pub fn verify(&self) -> Result<(), Error> { - if self.dao_type_hash.is_none() { + if self.dao_type_hash().is_none() { return Ok(()); } - let dao_type_hash = self.dao_type_hash.as_ref().unwrap(); + let dao_type_hash = self.dao_type_hash().unwrap(); for (i, (input_meta, cell_output)) in self .resolved_transaction .resolved_inputs @@ -1006,8 +1009,8 @@ impl DaoScriptSizeVerifier
{ .enumerate() { // Both the input and output cell must use Nervos DAO as type script - if !(cell_uses_dao_type_script(&input_meta.cell_output, dao_type_hash) - && cell_uses_dao_type_script(&cell_output, dao_type_hash)) + if !(cell_uses_dao_type_script(&input_meta.cell_output, &dao_type_hash) + && cell_uses_dao_type_script(&cell_output, &dao_type_hash)) { continue; } @@ -1023,6 +1026,18 @@ impl DaoScriptSizeVerifier
{ continue; } + // Only cells committed after the pre-defined block number in consensus is + // applied to this rule + if let Some(info) = &input_meta.transaction_info { + if info.block_number + < self + .consensus + .starting_block_limiting_dao_withdrawing_lock() + { + continue; + } + } + // Now we have a pair of DAO deposit and withdrawing cells, it is expected // they have the lock scripts of the same size. if input_meta.cell_output.lock().total_size() != cell_output.lock().total_size() { From cca4904657dd2a8a1f893e3298ce9aeda003f7dd Mon Sep 17 00:00:00 2001 From: mohanson Date: Wed, 30 Aug 2023 16:09:33 +0800 Subject: [PATCH 090/125] fix(scripts/spawn): always consume extra_cycles --- script/src/syscalls/spawn.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/script/src/syscalls/spawn.rs b/script/src/syscalls/spawn.rs index 888a2a6a95..cf6bc8dd80 100644 --- a/script/src/syscalls/spawn.rs +++ b/script/src/syscalls/spawn.rs @@ -222,6 +222,8 @@ where .add_cycles_no_checking(transferred_byte_cycles(size))?; } Err(_) => { + // If loading binary fails, we still need to consume extra_cycles. + machine.add_cycles_no_checking(extra_cycles)?; machine.set_register(A0, Mac::REG::from_u8(WRONG_FORMAT)); return Ok(true); } From ec55d2165ed85e32a7e74ec294be624ed5a4597a Mon Sep 17 00:00:00 2001 From: ian Date: Fri, 1 Sep 2023 16:45:44 +0800 Subject: [PATCH 091/125] chore: bump to v0.111.0-rc11 --- Cargo.lock | 136 +++++++++---------- Cargo.toml | 8 +- README.md | 2 +- benches/Cargo.toml | 36 ++--- block-filter/Cargo.toml | 14 +- chain/Cargo.toml | 52 +++---- ckb-bin/Cargo.toml | 48 +++---- db-migration/Cargo.toml | 12 +- db-schema/Cargo.toml | 2 +- db/Cargo.toml | 10 +- error/Cargo.toml | 4 +- freezer/Cargo.toml | 12 +- miner/Cargo.toml | 20 +-- network/Cargo.toml | 22 +-- notify/Cargo.toml | 12 +- pow/Cargo.toml | 6 +- resource/Cargo.toml | 6 +- rpc/Cargo.toml | 60 ++++---- script/Cargo.toml | 24 ++-- script/fuzz/Cargo.toml | 10 +- shared/Cargo.toml | 36 ++--- spec/Cargo.toml | 26 ++-- store/Cargo.toml | 20 +-- sync/Cargo.toml | 56 ++++---- test/Cargo.toml | 40 +++--- traits/Cargo.toml | 4 +- tx-pool/Cargo.toml | 44 +++--- util/Cargo.toml | 4 +- util/app-config/Cargo.toml | 24 ++-- util/build-info/Cargo.toml | 2 +- util/chain-iter/Cargo.toml | 6 +- util/channel/Cargo.toml | 2 +- util/constant/Cargo.toml | 2 +- util/crypto/Cargo.toml | 4 +- util/dao/Cargo.toml | 16 +-- util/dao/utils/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/indexer/Cargo.toml | 20 +-- util/instrument/Cargo.toml | 12 +- util/jsonrpc-types/Cargo.toml | 4 +- util/launcher/Cargo.toml | 66 ++++----- util/launcher/migration-template/Cargo.toml | 2 +- util/light-client-protocol-server/Cargo.toml | 32 ++--- util/logger-config/Cargo.toml | 2 +- util/logger-service/Cargo.toml | 10 +- util/logger/Cargo.toml | 2 +- util/memory-tracker/Cargo.toml | 8 +- util/metrics-config/Cargo.toml | 2 +- util/metrics-service/Cargo.toml | 14 +- util/metrics/Cargo.toml | 2 +- util/multisig/Cargo.toml | 8 +- util/network-alert/Cargo.toml | 28 ++-- 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 | 20 +-- util/runtime/Cargo.toml | 6 +- util/rust-unstable-port/Cargo.toml | 2 +- util/snapshot/Cargo.toml | 18 +-- util/spawn/Cargo.toml | 2 +- util/stop-handler/Cargo.toml | 10 +- util/systemtime/Cargo.toml | 2 +- util/test-chain-utils/Cargo.toml | 24 ++-- util/types/Cargo.toml | 16 +-- verification/Cargo.toml | 28 ++-- verification/contextual/Cargo.toml | 38 +++--- verification/traits/Cargo.toml | 4 +- wasm-build-test/Cargo.toml | 6 +- 73 files changed, 606 insertions(+), 606 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 50505ce8be..62f859e72d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -395,7 +395,7 @@ dependencies = [ [[package]] name = "ckb" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-bin", "ckb-build-info", @@ -404,7 +404,7 @@ dependencies = [ [[package]] name = "ckb-app-config" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-build-info", "ckb-chain-spec", @@ -433,7 +433,7 @@ dependencies = [ [[package]] name = "ckb-async-runtime" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-logger", "ckb-spawn", @@ -442,7 +442,7 @@ dependencies = [ [[package]] name = "ckb-benches" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-app-config", "ckb-chain", @@ -470,7 +470,7 @@ dependencies = [ [[package]] name = "ckb-bin" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "base64", "ckb-app-config", @@ -511,7 +511,7 @@ dependencies = [ [[package]] name = "ckb-block-filter" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-async-runtime", "ckb-logger", @@ -523,11 +523,11 @@ dependencies = [ [[package]] name = "ckb-build-info" -version = "0.111.0-rc10" +version = "0.111.0-rc11" [[package]] name = "ckb-chain" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -561,7 +561,7 @@ dependencies = [ [[package]] name = "ckb-chain-iter" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-store", "ckb-types", @@ -569,7 +569,7 @@ dependencies = [ [[package]] name = "ckb-chain-spec" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-constant", "ckb-crypto", @@ -589,18 +589,18 @@ dependencies = [ [[package]] name = "ckb-channel" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "crossbeam-channel", ] [[package]] name = "ckb-constant" -version = "0.111.0-rc10" +version = "0.111.0-rc11" [[package]] name = "ckb-crypto" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-fixed-hash", "faster-hex", @@ -612,7 +612,7 @@ dependencies = [ [[package]] name = "ckb-dao" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "byteorder", "ckb-chain-spec", @@ -627,7 +627,7 @@ dependencies = [ [[package]] name = "ckb-dao-utils" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "byteorder", "ckb-error", @@ -636,7 +636,7 @@ dependencies = [ [[package]] name = "ckb-db" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-app-config", "ckb-db-schema", @@ -649,7 +649,7 @@ dependencies = [ [[package]] name = "ckb-db-migration" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-app-config", "ckb-db", @@ -663,11 +663,11 @@ dependencies = [ [[package]] name = "ckb-db-schema" -version = "0.111.0-rc10" +version = "0.111.0-rc11" [[package]] name = "ckb-error" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "anyhow", "ckb-occupied-capacity", @@ -677,7 +677,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-fixed-hash-core", "ckb-fixed-hash-macros", @@ -685,7 +685,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-core" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "faster-hex", "serde", @@ -695,7 +695,7 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-macros" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-fixed-hash-core", "proc-macro2", @@ -705,7 +705,7 @@ dependencies = [ [[package]] name = "ckb-freezer" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-error", "ckb-logger", @@ -721,7 +721,7 @@ dependencies = [ [[package]] name = "ckb-hash" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "blake2b-ref", "blake2b-rs", @@ -729,7 +729,7 @@ dependencies = [ [[package]] name = "ckb-indexer" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -751,7 +751,7 @@ dependencies = [ [[package]] name = "ckb-instrument" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-chain", "ckb-chain-iter", @@ -764,7 +764,7 @@ dependencies = [ [[package]] name = "ckb-jsonrpc-types" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-types", "faster-hex", @@ -777,7 +777,7 @@ dependencies = [ [[package]] name = "ckb-launcher" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -832,7 +832,7 @@ dependencies = [ [[package]] name = "ckb-light-client-protocol-server" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-app-config", "ckb-chain", @@ -855,14 +855,14 @@ dependencies = [ [[package]] name = "ckb-logger" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "log", ] [[package]] name = "ckb-logger-config" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "serde", "toml", @@ -870,7 +870,7 @@ dependencies = [ [[package]] name = "ckb-logger-service" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "backtrace", "ckb-channel", @@ -889,7 +889,7 @@ dependencies = [ [[package]] name = "ckb-memory-tracker" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-db", "ckb-logger", @@ -911,7 +911,7 @@ dependencies = [ [[package]] name = "ckb-metrics" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "once_cell", "prometheus", @@ -920,14 +920,14 @@ dependencies = [ [[package]] name = "ckb-metrics-config" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "serde", ] [[package]] name = "ckb-metrics-service" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-async-runtime", "ckb-logger", @@ -941,7 +941,7 @@ dependencies = [ [[package]] name = "ckb-migration-template" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "quote", "syn", @@ -949,7 +949,7 @@ dependencies = [ [[package]] name = "ckb-miner" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "base64", "ckb-app-config", @@ -978,7 +978,7 @@ dependencies = [ [[package]] name = "ckb-multisig" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-crypto", "ckb-error", @@ -988,7 +988,7 @@ dependencies = [ [[package]] name = "ckb-network" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "bitflags", "bloom-filters", @@ -1026,7 +1026,7 @@ dependencies = [ [[package]] name = "ckb-network-alert" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1049,7 +1049,7 @@ dependencies = [ [[package]] name = "ckb-notify" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1061,7 +1061,7 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-occupied-capacity-core", "ckb-occupied-capacity-macros", @@ -1069,14 +1069,14 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity-core" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "serde", ] [[package]] name = "ckb-occupied-capacity-macros" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-occupied-capacity-core", "quote", @@ -1085,7 +1085,7 @@ dependencies = [ [[package]] name = "ckb-pow" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "byteorder", "ckb-hash", @@ -1097,7 +1097,7 @@ dependencies = [ [[package]] name = "ckb-proposal-table" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-chain-spec", "ckb-logger", @@ -1106,7 +1106,7 @@ dependencies = [ [[package]] name = "ckb-rational" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "numext-fixed-uint", "proptest", @@ -1115,7 +1115,7 @@ dependencies = [ [[package]] name = "ckb-resource" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-system-scripts", "ckb-types", @@ -1129,7 +1129,7 @@ dependencies = [ [[package]] name = "ckb-reward-calculator" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-chain-spec", "ckb-dao", @@ -1156,7 +1156,7 @@ dependencies = [ [[package]] name = "ckb-rpc" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-app-config", "ckb-chain", @@ -1205,14 +1205,14 @@ dependencies = [ [[package]] name = "ckb-rust-unstable-port" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "is_sorted", ] [[package]] name = "ckb-script" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "byteorder", "ckb-chain-spec", @@ -1237,7 +1237,7 @@ dependencies = [ [[package]] name = "ckb-shared" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "arc-swap", "ckb-async-runtime", @@ -1260,7 +1260,7 @@ dependencies = [ [[package]] name = "ckb-snapshot" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "arc-swap", "ckb-chain-spec", @@ -1276,11 +1276,11 @@ dependencies = [ [[package]] name = "ckb-spawn" -version = "0.111.0-rc10" +version = "0.111.0-rc11" [[package]] name = "ckb-stop-handler" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-async-runtime", "ckb-channel", @@ -1296,7 +1296,7 @@ dependencies = [ [[package]] name = "ckb-store" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -1314,7 +1314,7 @@ dependencies = [ [[package]] name = "ckb-sync" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "bitflags", "ckb-app-config", @@ -1372,11 +1372,11 @@ dependencies = [ [[package]] name = "ckb-systemtime" -version = "0.111.0-rc10" +version = "0.111.0-rc11" [[package]] name = "ckb-test-chain-utils" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-chain-spec", "ckb-dao-utils", @@ -1394,14 +1394,14 @@ dependencies = [ [[package]] name = "ckb-traits" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-types", ] [[package]] name = "ckb-tx-pool" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1438,7 +1438,7 @@ dependencies = [ [[package]] name = "ckb-types" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "bit-vec", "bytes 1.4.0", @@ -1462,7 +1462,7 @@ dependencies = [ [[package]] name = "ckb-util" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-fixed-hash", "linked-hash-map", @@ -1473,7 +1473,7 @@ dependencies = [ [[package]] name = "ckb-verification" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-chain-spec", "ckb-dao", @@ -1493,7 +1493,7 @@ dependencies = [ [[package]] name = "ckb-verification-contextual" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "ckb-async-runtime", "ckb-chain", @@ -1520,7 +1520,7 @@ dependencies = [ [[package]] name = "ckb-verification-traits" -version = "0.111.0-rc10" +version = "0.111.0-rc11" dependencies = [ "bitflags", "ckb-error", diff --git a/Cargo.toml b/Cargo.toml index 5fa0353291..97b8aa3de2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,11 +11,11 @@ repository = "https://github.com/nervosnetwork/ckb" rust-version = "1.67.1" [build-dependencies] -ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc10" } +ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc11" } [dependencies] -ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc10" } -ckb-bin = { path = "ckb-bin", version = "= 0.111.0-rc10" } +ckb-build-info = { path = "util/build-info", version = "= 0.111.0-rc11" } +ckb-bin = { path = "ckb-bin", version = "= 0.111.0-rc11" } [dev-dependencies] diff --git a/README.md b/README.md index af9ca15fa8..3fcb364897 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.111.0--rc10-orange.svg)](https://github.com/nervosnetwork/ckb/releases) +[![Version](https://img.shields.io/badge/version-0.111.0--rc11-orange.svg)](https://github.com/nervosnetwork/ckb/releases) [![Nervos Talk](https://img.shields.io/badge/discuss-on%20Nervos%20Talk-3CC68A.svg)](https://talk.nervos.org/t/where-to-discuss-ckb-and-how-to-ask-for-support/6024) master | develop diff --git a/benches/Cargo.toml b/benches/Cargo.toml index 7486da3b67..bd9cd4b898 100644 --- a/benches/Cargo.toml +++ b/benches/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-benches" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,26 +13,26 @@ repository = "https://github.com/nervosnetwork/ckb" [dev-dependencies] criterion = "0.4" -ckb-chain = { path = "../chain", version = "= 0.111.0-rc10" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc10" } -ckb-store = { path = "../store", version = "= 0.111.0-rc10" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc10" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc11" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc11" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc11" } +ckb-store = { path = "../store", version = "= 0.111.0-rc11" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc11" } rand = "0.7" -ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc10"} -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc10" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc10" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc10" } +ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc11"} +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc11" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc11" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc11" } ckb-system-scripts = { version = "= 0.5.4" } lazy_static = "1.3.0" -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc10" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc10" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc10" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc10" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc10" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc10" } -ckb-network = { path = "../network", version = "= 0.111.0-rc10" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc10" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc11" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc11" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc11" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc11" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc11" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc11" } +ckb-network = { path = "../network", version = "= 0.111.0-rc11" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc11" } tempfile.workspace = true [[bench]] diff --git a/block-filter/Cargo.toml b/block-filter/Cargo.toml index ef8bdca0bc..df7e772bc2 100644 --- a/block-filter/Cargo.toml +++ b/block-filter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-block-filter" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,9 +11,9 @@ repository = "https://github.com/nervosnetwork/ckb" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ckb-store = { path = "../store", version = "= 0.111.0-rc10" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc10" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc10" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc10" } +ckb-store = { path = "../store", version = "= 0.111.0-rc11" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc11" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc11" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc11" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc11" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc11" } diff --git a/chain/Cargo.toml b/chain/Cargo.toml index feb18e6672..d6ffa8913a 100644 --- a/chain/Cargo.toml +++ b/chain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,37 +9,37 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10" } -ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc10" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc10" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc10" } -ckb-store = { path = "../store", version = "= 0.111.0-rc10" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc10" } -ckb-verification-contextual = { path = "../verification/contextual", version = "= 0.111.0-rc10" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc10" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc10" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc10" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc10" } -ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc10" } -ckb-error = { path = "../error", version = "= 0.111.0-rc10" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc10" } -ckb-rust-unstable-port = { path = "../util/rust-unstable-port", version = "= 0.111.0-rc10" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc10" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc11" } +ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc11" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc11" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc11" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc11" } +ckb-store = { path = "../store", version = "= 0.111.0-rc11" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc11" } +ckb-verification-contextual = { path = "../verification/contextual", version = "= 0.111.0-rc11" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc11" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc11" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc11" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc11" } +ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc11" } +ckb-error = { path = "../error", version = "= 0.111.0-rc11" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc11" } +ckb-rust-unstable-port = { path = "../util/rust-unstable-port", version = "= 0.111.0-rc11" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc11" } faux = { version = "^0.1", optional = true } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc10" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc10" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc10" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc10", features = ["internal"] } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc10" } -ckb-network = { path = "../network", version = "= 0.111.0-rc10" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc10" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc11" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc11" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc11" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc11", features = ["internal"] } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc11" } +ckb-network = { path = "../network", version = "= 0.111.0-rc11" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc11" } lazy_static = "1.4" tempfile.workspace = true -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc10" ,features = ["enable_faketime"]} +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc11" ,features = ["enable_faketime"]} [features] default = [] diff --git a/ckb-bin/Cargo.toml b/ckb-bin/Cargo.toml index 29d366a1ca..68e7ed2fd1 100644 --- a/ckb-bin/Cargo.toml +++ b/ckb-bin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-bin" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -14,36 +14,36 @@ serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0" } serde_plain = "0.3.0" toml = "0.5" -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc10" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10" } -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc10" } -ckb-metrics-service = { path = "../util/metrics-service", version = "= 0.111.0-rc10" } -ckb-util = { path = "../util", version = "= 0.111.0-rc10" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc10" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc10" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc10" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc10" } -ckb-store = { path = "../store", version = "= 0.111.0-rc10" } -ckb-chain-spec = {path = "../spec", version = "= 0.111.0-rc10"} -ckb-miner = { path = "../miner", version = "= 0.111.0-rc10" } -ckb-network = { path = "../network", version = "= 0.111.0-rc10"} -ckb-resource = { path = "../resource", version = "= 0.111.0-rc10"} +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc11" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc11" } +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc11" } +ckb-metrics-service = { path = "../util/metrics-service", version = "= 0.111.0-rc11" } +ckb-util = { path = "../util", version = "= 0.111.0-rc11" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc11" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc11" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc11" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc11" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc11" } +ckb-store = { path = "../store", version = "= 0.111.0-rc11" } +ckb-chain-spec = {path = "../spec", version = "= 0.111.0-rc11"} +ckb-miner = { path = "../miner", version = "= 0.111.0-rc11" } +ckb-network = { path = "../network", version = "= 0.111.0-rc11"} +ckb-resource = { path = "../resource", version = "= 0.111.0-rc11"} ctrlc = { version = "3.1", features = ["termination"] } -ckb-instrument = { path = "../util/instrument", version = "= 0.111.0-rc10", features = ["progress_bar"] } -ckb-build-info = { path = "../util/build-info", version = "= 0.111.0-rc10" } -ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc10" } -ckb-chain-iter = { path = "../util/chain-iter", version = "= 0.111.0-rc10" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc10" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc10" } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc10" } +ckb-instrument = { path = "../util/instrument", version = "= 0.111.0-rc11", features = ["progress_bar"] } +ckb-build-info = { path = "../util/build-info", version = "= 0.111.0-rc11" } +ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc11" } +ckb-chain-iter = { path = "../util/chain-iter", version = "= 0.111.0-rc11" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc11" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc11" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc11" } base64 = "0.21.0" tempfile.workspace = true rayon = "1.0" sentry = { version = "0.26.0", optional = true } is-terminal = "0.4.7" fdlimit = "0.2.1" -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc10" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc11" } [features] deadlock_detection = ["ckb-util/deadlock_detection"] diff --git a/db-migration/Cargo.toml b/db-migration/Cargo.toml index d2bb256e29..360d342fd9 100644 --- a/db-migration/Cargo.toml +++ b/db-migration/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db-migration" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,16 +11,16 @@ 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.111.0-rc10" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10" } -ckb-error = { path = "../error", version = "= 0.111.0-rc10" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc10" } +ckb-db = { path = "../db", version = "= 0.111.0-rc11" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc11" } +ckb-error = { path = "../error", version = "= 0.111.0-rc11" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc11" } indicatif = "0.16" console = ">=0.9.1, <1.0.0" [dev-dependencies] tempfile.workspace = true -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc10" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc11" } [features] portable = ["ckb-db/portable"] diff --git a/db-schema/Cargo.toml b/db-schema/Cargo.toml index 614ff4c4ae..f27604cae3 100644 --- a/db-schema/Cargo.toml +++ b/db-schema/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db-schema" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/db/Cargo.toml b/db/Cargo.toml index d3131d84ee..e5178b197a 100644 --- a/db/Cargo.toml +++ b/db/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-db" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,12 +9,12 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc10" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10" } -ckb-error = { path = "../error", version = "= 0.111.0-rc10" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc11" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc11" } +ckb-error = { path = "../error", version = "= 0.111.0-rc11" } libc = "0.2" rocksdb = { package = "ckb-rocksdb", version ="=0.20.0", features = ["snappy"], default-features = false } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc10" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc11" } [dev-dependencies] tempfile.workspace = true diff --git a/error/Cargo.toml b/error/Cargo.toml index e632debe51..80b4bd3db6 100644 --- a/error/Cargo.toml +++ b/error/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-error" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,5 +11,5 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] thiserror = "1.0.22" anyhow = "1.0.34" -ckb-occupied-capacity = { path = "../util/occupied-capacity", version = "= 0.111.0-rc10" } +ckb-occupied-capacity = { path = "../util/occupied-capacity", version = "= 0.111.0-rc11" } derive_more = { version = "0.99.0", default-features = false, features = ["display"] } diff --git a/freezer/Cargo.toml b/freezer/Cargo.toml index 0c6028fd48..b654a05e5d 100644 --- a/freezer/Cargo.toml +++ b/freezer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-freezer" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,11 +10,11 @@ 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.111.0-rc10" } -ckb-error = { path = "../error", version = "= 0.111.0-rc10" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10" } -ckb-util = { path = "../util", version = "= 0.111.0-rc10" } -ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc10" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc11" } +ckb-error = { path = "../error", version = "= 0.111.0-rc11" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc11" } +ckb-util = { path = "../util", version = "= 0.111.0-rc11" } +ckb-metrics = { path = "../util/metrics", version = "= 0.111.0-rc11" } fs2 = "0.4.3" fail = "0.4" snap = "1" diff --git a/miner/Cargo.toml b/miner/Cargo.toml index 908e4b9896..ae05e8aff0 100644 --- a/miner/Cargo.toml +++ b/miner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-miner" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,23 +9,23 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc10" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc10" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc10" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc10" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc11" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc11" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc11" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc11" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc11" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc11" } rand = "0.7" rand_distr = "0.3" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc10" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc11" } hyper = { version = "0.14", features = ["client", "http2", "http1", "server"] } hyper-tls = "0.5" futures = "0.3" lru = "0.7.1" -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc10" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc10" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc11" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc11" } indicatif = "0.16" console = ">=0.9.1, <1.0.0" eaglesong = "0.1" diff --git a/network/Cargo.toml b/network/Cargo.toml index d2ac79d0ab..139cd366c7 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-network" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,28 +11,28 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] rand = "0.7" serde = { version = "1.0", features = ["derive"] } -ckb-util = { path = "../util", version = "= 0.111.0-rc10" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc10" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc10" } -ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc10"} +ckb-util = { path = "../util", version = "= 0.111.0-rc11" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc11" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc11" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc11" } +ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc11"} tokio = { version = "1", features = ["sync", "macros"] } tokio-util = { version = "0.7", features = ["codec"] } futures = "0.3" -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc10"} +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc11"} lazy_static = { version = "1.3.0", optional = true } bs58 = { version = "0.4.0", optional = true } sentry = { version = "0.26.0", optional = true } faster-hex = { version = "0.6", optional = true } -ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc10"} +ckb-hash = {path = "../util/hash", version = "= 0.111.0-rc11"} secp256k1 = {version = "0.24", features = ["recovery"], optional = true } trust-dns-resolver = { version = "0.20", optional = true } snap = "1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc11" } ipnetwork = "0.18" serde_json = "1.0" bloom-filters = "0.1" -ckb-spawn = { path = "../util/spawn", version = "= 0.111.0-rc10" } +ckb-spawn = { path = "../util/spawn", version = "= 0.111.0-rc11" } socket2 = "0.4" bitflags = "1.0" @@ -48,7 +48,7 @@ criterion = "0.4" proptest = "1.0" num_cpus = "1.10" once_cell = "1.8.0" -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc10", features = ["enable_faketime"]} +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc11", features = ["enable_faketime"]} [[bench]] name = "peer_store" diff --git a/notify/Cargo.toml b/notify/Cargo.toml index 05cba38fa7..3aac9eeb89 100644 --- a/notify/Cargo.toml +++ b/notify/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-notify" -version = "0.111.0-rc10" +version = "0.111.0-rc11" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc10" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc10" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc10" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc11" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc11" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc11" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc11" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc11" } tokio = { version = "1", features = ["sync"] } [dev-dependencies] diff --git a/pow/Cargo.toml b/pow/Cargo.toml index 54340c3dda..c8760c59c4 100644 --- a/pow/Cargo.toml +++ b/pow/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-pow" -version = "0.111.0-rc10" +version = "0.111.0-rc11" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,8 +10,8 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc10"} +ckb-types = { path = "../util/types", version = "= 0.111.0-rc11" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc11"} serde = { version = "1.0", features = ["derive"] } eaglesong = "0.1" log = "0.4" diff --git a/resource/Cargo.toml b/resource/Cargo.toml index 9096a43841..041f484e7a 100644 --- a/resource/Cargo.toml +++ b/resource/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-resource" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,13 +13,13 @@ repository = "https://github.com/nervosnetwork/ckb" phf = "0.8.0" includedir = "0.6.0" serde = { version = "1.0", features = ["derive"] } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc11" } ckb-system-scripts = { version = "= 0.5.4" } [build-dependencies] includedir_codegen = "0.6.0" walkdir = "2.1.4" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc11" } ckb-system-scripts = { version = "= 0.5.4" } [dev-dependencies] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 91fd560ccb..7d9e9b8a73 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-rpc" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,19 +9,19 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc10" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } -ckb-network = { path = "../network", version = "= 0.111.0-rc10" } -ckb-notify = { path = "../notify", version = "= 0.111.0-rc10" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc10" } -ckb-store = { path = "../store", version = "= 0.111.0-rc10" } -ckb-sync = { path = "../sync", version = "= 0.111.0-rc10" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc10" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10"} -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc10"} -ckb-network-alert = { path = "../util/network-alert", version = "= 0.111.0-rc10" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc10" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc10" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc11" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc11" } +ckb-network = { path = "../network", version = "= 0.111.0-rc11" } +ckb-notify = { path = "../notify", version = "= 0.111.0-rc11" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc11" } +ckb-store = { path = "../store", version = "= 0.111.0-rc11" } +ckb-sync = { path = "../sync", version = "= 0.111.0-rc11" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc11" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc11"} +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc11"} +ckb-network-alert = { path = "../util/network-alert", version = "= 0.111.0-rc11" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc11" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc11" } jsonrpc-core = "18.0" jsonrpc-derive = "18.0" jsonrpc-http-server = "18.0" @@ -30,27 +30,27 @@ jsonrpc-ws-server = "18.0" jsonrpc-server-utils = "18.0" jsonrpc-pubsub = "18.0" serde_json = "1.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc10" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc10" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc10" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc10" } -ckb-util = { path = "../util", version = "= 0.111.0-rc10" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc10" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc10" } -ckb-error = { path = "../error", version = "= 0.111.0-rc10" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc10" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc10" } -ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc10" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc10" } -ckb-indexer = { path = "../util/indexer", version = "= 0.111.0-rc10" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc11" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc11" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc11" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc11" } +ckb-util = { path = "../util", version = "= 0.111.0-rc11" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc11" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc11" } +ckb-error = { path = "../error", version = "= 0.111.0-rc11" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc11" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc11" } +ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.111.0-rc11" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc11" } +ckb-indexer = { path = "../util/indexer", version = "= 0.111.0-rc11" } itertools.workspace = true tokio = "1" [dev-dependencies] reqwest = { version = "0.11.4", features = ["blocking", "json"] } serde = { version = "1.0", features = ["derive"] } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc10" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc10" } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc11" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc11" } tempfile.workspace = true pretty_assertions = "1.3.0" -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc10" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc11" } diff --git a/script/Cargo.toml b/script/Cargo.toml index 0f6d6f7a63..68e2953549 100644 --- a/script/Cargo.toml +++ b/script/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-script" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -18,24 +18,24 @@ logging = ["ckb-logger"] flatmemory = [] [dependencies] -ckb-traits = { path = "../traits", version = "= 0.111.0-rc10" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc11" } byteorder = "1.3.1" -ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc10" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc11" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc11" } ckb-vm = { version = "=0.24.6", default-features = false } faster-hex = "0.6" -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10", optional = true } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc11", optional = true } serde = { version = "1.0", features = ["derive"] } -ckb-error = { path = "../error", version = "= 0.111.0-rc10" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc10" } +ckb-error = { path = "../error", version = "= 0.111.0-rc11" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc11" } [dev-dependencies] proptest = "1.0" -ckb-db = { path = "../db", version = "= 0.111.0-rc10" } -ckb-store = { path = "../store", version = "= 0.111.0-rc10" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc10" } +ckb-db = { path = "../db", version = "= 0.111.0-rc11" } +ckb-store = { path = "../store", version = "= 0.111.0-rc11" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc11" } tiny-keccak = { version = "2.0", features = ["sha3"] } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc10" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc10" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc11" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc11" } tempfile.workspace = true rand = "0.8.4" diff --git a/script/fuzz/Cargo.toml b/script/fuzz/Cargo.toml index 2affdc7c95..39a497d7ca 100644 --- a/script/fuzz/Cargo.toml +++ b/script/fuzz/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-script-fuzz" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -15,10 +15,10 @@ cargo-fuzz = true [dependencies] arbitrary = { version = "1", features = ["derive"] } libfuzzer-sys = { version="0.4.0", features=["arbitrary-derive"] } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc10" } -ckb-types = { path = "../../util/types", version = "= 0.111.0-rc10" } -ckb-script = { path = "../../script", version = "= 0.111.0-rc10" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc10" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc11" } +ckb-types = { path = "../../util/types", version = "= 0.111.0-rc11" } +ckb-script = { path = "../../script", version = "= 0.111.0-rc11" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc11" } # Prevent this from interfering with workspaces [workspace] diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 41148f6239..e4a5d30cbb 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-shared" -version = "0.111.0-rc10" +version = "0.111.0-rc11" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,26 +9,26 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc10" } -ckb-store = { path = "../store", version = "= 0.111.0-rc10" } -ckb-db = { path = "../db", version = "= 0.111.0-rc10" } -ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc10" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc11" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc11" } +ckb-store = { path = "../store", version = "= 0.111.0-rc11" } +ckb-db = { path = "../db", version = "= 0.111.0-rc11" } +ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.111.0-rc11" } arc-swap = "1.3" -ckb-error = { path = "../error", version = "= 0.111.0-rc10" } -ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc10" } -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc10" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc10" } -ckb-notify = { path = "../notify", version = "= 0.111.0-rc10" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc10" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc10" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc10" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc10" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc10" } +ckb-error = { path = "../error", version = "= 0.111.0-rc11" } +ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc11" } +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc11" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc11" } +ckb-notify = { path = "../notify", version = "= 0.111.0-rc11" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc11" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc11" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc11" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc11" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc11" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc11" } [dev-dependencies] -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc10", features = ["enable_faketime"] } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc11", features = ["enable_faketime"] } [features] portable = ["ckb-db/portable", "ckb-store/portable", "ckb-tx-pool/portable"] diff --git a/spec/Cargo.toml b/spec/Cargo.toml index 9f367e7c98..86335d320d 100644 --- a/spec/Cargo.toml +++ b/spec/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain-spec" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,15 +11,15 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] serde = { version = "1.0", features = ["derive"] } toml = "0.5" -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc10" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc10" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc10" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc10" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc10" } -ckb-rational = { path = "../util/rational", version = "= 0.111.0-rc10" } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc10"} -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc10"} -ckb-error = { path = "../error", version = "= 0.111.0-rc10" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc10" } -ckb-util = { path = "../util", version = "= 0.111.0-rc10" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc11" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc11" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc11" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc11" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc11" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc11" } +ckb-rational = { path = "../util/rational", version = "= 0.111.0-rc11" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc11"} +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc11"} +ckb-error = { path = "../error", version = "= 0.111.0-rc11" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc11" } +ckb-util = { path = "../util", version = "= 0.111.0-rc11" } diff --git a/store/Cargo.toml b/store/Cargo.toml index 6e1089530b..56df2293b0 100644 --- a/store/Cargo.toml +++ b/store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-store" -version = "0.111.0-rc10" +version = "0.111.0-rc11" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,16 +9,16 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } -ckb-db = { path = "../db", version = "= 0.111.0-rc10" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc10" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc11" } +ckb-db = { path = "../db", version = "= 0.111.0-rc11" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc11" } lru = "0.7.1" -ckb-traits = { path = "../traits", version = "= 0.111.0-rc10" } -ckb-util = { path = "../util", version = "= 0.111.0-rc10" } -ckb-error = { path = "../error", version = "= 0.111.0-rc10" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc10" } -ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc10" } -ckb-freezer = { path = "../freezer", version = "= 0.111.0-rc10" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc11" } +ckb-util = { path = "../util", version = "= 0.111.0-rc11" } +ckb-error = { path = "../error", version = "= 0.111.0-rc11" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc11" } +ckb-db-schema = { path = "../db-schema", version = "= 0.111.0-rc11" } +ckb-freezer = { path = "../freezer", version = "= 0.111.0-rc11" } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] diff --git a/sync/Cargo.toml b/sync/Cargo.toml index 6af264bfd3..f09606fd53 100644 --- a/sync/Cargo.toml +++ b/sync/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-sync" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,32 +9,32 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-chain = { path = "../chain", version = "= 0.111.0-rc10" } -ckb-shared = { path = "../shared", version = "= 0.111.0-rc10" } -ckb-store = { path = "../store", version = "= 0.111.0-rc10" } -ckb-app-config = {path = "../util/app-config", version = "= 0.111.0-rc10"} -ckb-types = {path = "../util/types", version = "= 0.111.0-rc10"} -ckb-network = { path = "../network", version = "= 0.111.0-rc10" } -ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc10"} -ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc10"} -ckb-util = { path = "../util", version = "= 0.111.0-rc10" } -ckb-verification = { path = "../verification", version = "= 0.111.0-rc10" } -ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc10" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc10" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc10" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc10" } -ckb-error = {path = "../error", version = "= 0.111.0-rc10"} -ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc10" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc11" } +ckb-shared = { path = "../shared", version = "= 0.111.0-rc11" } +ckb-store = { path = "../store", version = "= 0.111.0-rc11" } +ckb-app-config = {path = "../util/app-config", version = "= 0.111.0-rc11"} +ckb-types = {path = "../util/types", version = "= 0.111.0-rc11"} +ckb-network = { path = "../network", version = "= 0.111.0-rc11" } +ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc11"} +ckb-metrics = {path = "../util/metrics", version = "= 0.111.0-rc11"} +ckb-util = { path = "../util", version = "= 0.111.0-rc11" } +ckb-verification = { path = "../verification", version = "= 0.111.0-rc11" } +ckb-verification-traits = { path = "../verification/traits", version = "= 0.111.0-rc11" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc11" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc11" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc11" } +ckb-error = {path = "../error", version = "= 0.111.0-rc11"} +ckb-tx-pool = { path = "../tx-pool", version = "= 0.111.0-rc11" } sentry = { version = "0.26.0", optional = true } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc10" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc10" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc10" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc11" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc11" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc11" } tokio = { version = "1", features = ["sync"] } lru = "0.7.1" futures = "0.3" governor = "0.3.1" tempfile.workspace = true -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc10" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc11" } bitflags = "1.0" dashmap = "4.0" keyed_priority_queue = "0.3" @@ -42,16 +42,16 @@ sled = "0.34.7" itertools.workspace = true [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc10" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc11" } rand = "0.7" -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc10" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc10" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc10" } -ckb-chain = { path = "../chain", version = "= 0.111.0-rc10", features = ["mock"] } -ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc10" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc11" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc11" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc11" } +ckb-chain = { path = "../chain", version = "= 0.111.0-rc11", features = ["mock"] } +ckb-launcher = { path = "../util/launcher", version = "= 0.111.0-rc11" } faux = "^0.1" once_cell = "1.8.0" -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc10" , features = ["enable_faketime"]} +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc11" , features = ["enable_faketime"]} [features] default = [] diff --git a/test/Cargo.toml b/test/Cargo.toml index df68fd14f5..21a09175e6 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-test" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,28 +11,28 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] clap = { version = "=3.2.21" } toml = "0.5.0" -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc10" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc10" } -ckb-network = { path = "../network", version = "= 0.111.0-rc10" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc10" } -ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc10" } -ckb-util = { path = "../util", version = "= 0.111.0-rc10" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc10" } -ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc10" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc10" } -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc10" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc10" } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc10" } -ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc10" } -ckb-logger-config = { path = "../util/logger-config", version = "= 0.111.0-rc10" } -ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc10" } -ckb-error = { path = "../error", version = "= 0.111.0-rc10" } -ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc10" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc11" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc11" } +ckb-network = { path = "../network", version = "= 0.111.0-rc11" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc11" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc11" } +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc11" } +ckb-util = { path = "../util", version = "= 0.111.0-rc11" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc11" } +ckb-crypto = { path = "../util/crypto", version = "= 0.111.0-rc11" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc11" } +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc11" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc11" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc11" } +ckb-logger = { path = "../util/logger", version = "= 0.111.0-rc11" } +ckb-logger-config = { path = "../util/logger-config", version = "= 0.111.0-rc11" } +ckb-logger-service = { path = "../util/logger-service", version = "= 0.111.0-rc11" } +ckb-error = { path = "../error", version = "= 0.111.0-rc11" } +ckb-constant = { path = "../util/constant", version = "= 0.111.0-rc11" } tempfile = "3" reqwest = { version = "0.11.4", features = ["blocking", "json"] } rand = "0.7" -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc10" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc11" } serde_json = "1.0" lazy_static = "1.4.0" byteorder = "1.3.1" diff --git a/traits/Cargo.toml b/traits/Cargo.toml index cd2e6e3f6c..fc6132e77c 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-traits" -version = "0.111.0-rc10" +version = "0.111.0-rc11" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc10" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc11" } diff --git a/tx-pool/Cargo.toml b/tx-pool/Cargo.toml index bf8581c86e..5198b48d7c 100644 --- a/tx-pool/Cargo.toml +++ b/tx-pool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-tx-pool" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,27 +11,27 @@ 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.111.0-rc10" } -ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc10"} -ckb-verification = { path = "../verification", version = "= 0.111.0-rc10" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc10"} +ckb-types = { path = "../util/types", version = "= 0.111.0-rc11" } +ckb-logger = {path = "../util/logger", version = "= 0.111.0-rc11"} +ckb-verification = { path = "../verification", version = "= 0.111.0-rc11" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc11"} lru = "0.7.1" -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc10" } -ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc10" } -ckb-store = { path = "../store", version = "= 0.111.0-rc10" } -ckb-util = { path = "../util", version = "= 0.111.0-rc10" } -ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc10" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc10" } -ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc10" } -ckb-error = { path = "../error", version = "= 0.111.0-rc10" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc11" } +ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.111.0-rc11" } +ckb-store = { path = "../store", version = "= 0.111.0-rc11" } +ckb-util = { path = "../util", version = "= 0.111.0-rc11" } +ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.111.0-rc11" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc11" } +ckb-snapshot = { path = "../util/snapshot", version = "= 0.111.0-rc11" } +ckb-error = { path = "../error", version = "= 0.111.0-rc11" } tokio = { version = "1", features = ["sync", "process"] } -ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc10" } -ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc10" } -ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc10" } -ckb-network = { path = "../network", version = "= 0.111.0-rc10" } -ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc10" } -ckb-traits = { path = "../traits", version = "= 0.111.0-rc10" } -ckb-db = { path = "../db", version = "= 0.111.0-rc10" } +ckb-async-runtime = { path = "../util/runtime", version = "= 0.111.0-rc11" } +ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.111.0-rc11" } +ckb-app-config = { path = "../util/app-config", version = "= 0.111.0-rc11" } +ckb-network = { path = "../network", version = "= 0.111.0-rc11" } +ckb-channel = { path = "../util/channel", version = "= 0.111.0-rc11" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc11" } +ckb-db = { path = "../db", version = "= 0.111.0-rc11" } sentry = { version = "0.26.0", optional = true } serde_json = "1.0" rand = "0.8.4" @@ -43,8 +43,8 @@ tokio-util = "0.7.8" [dev-dependencies] tempfile.workspace = true -ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc10" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc10", features = ["enable_faketime"]} +ckb-hash = { path = "../util/hash", version = "= 0.111.0-rc11" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc11", features = ["enable_faketime"]} [features] default = [] diff --git a/util/Cargo.toml b/util/Cargo.toml index 733d9fc3f4..e4e37bd48d 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-util" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -15,7 +15,7 @@ regex = "1.1.6" once_cell = "1.8.0" [dev-dependencies] -ckb-fixed-hash = { path = "fixed-hash", version = "= 0.111.0-rc10" } +ckb-fixed-hash = { path = "fixed-hash", version = "= 0.111.0-rc11" } [features] deadlock_detection = ["parking_lot/deadlock_detection"] diff --git a/util/app-config/Cargo.toml b/util/app-config/Cargo.toml index 03f2cbb55d..87447d4276 100644 --- a/util/app-config/Cargo.toml +++ b/util/app-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-app-config" -version = "0.111.0-rc10" +version = "0.111.0-rc11" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -15,20 +15,20 @@ serde_plain = "0.3.0" serde_json = "1.0" toml = "0.5" path-clean = "0.1.0" -ckb-logger = { path = "../../util/logger", version = "= 0.111.0-rc10" } -ckb-logger-config = { path = "../../util/logger-config", version = "= 0.111.0-rc10" } -ckb-metrics-config = { path = "../../util/metrics-config", version = "= 0.111.0-rc10" } -ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc10"} -ckb-jsonrpc-types = {path = "../jsonrpc-types", version = "= 0.111.0-rc10"} -ckb-pow = { path = "../../pow", version = "= 0.111.0-rc10" } -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc10"} -ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc10" } -ckb-types = { path = "../types", version = "= 0.111.0-rc10" } +ckb-logger = { path = "../../util/logger", version = "= 0.111.0-rc11" } +ckb-logger-config = { path = "../../util/logger-config", version = "= 0.111.0-rc11" } +ckb-metrics-config = { path = "../../util/metrics-config", version = "= 0.111.0-rc11" } +ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc11"} +ckb-jsonrpc-types = {path = "../jsonrpc-types", version = "= 0.111.0-rc11"} +ckb-pow = { path = "../../pow", version = "= 0.111.0-rc11" } +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc11"} +ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc11" } +ckb-types = { path = "../types", version = "= 0.111.0-rc11" } secio = { version="0.5.7", package="tentacle-secio" } multiaddr = { version="0.3.0", package="tentacle-multiaddr" } rand = "0.7" sentry = { version = "0.26.0", optional = true } -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc10" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc11" } url = { version = "2.2.2", features = ["serde"] } ubyte = { version = "0.10", features = ["serde"] } @@ -37,4 +37,4 @@ with_sentry = ["sentry"] [dev-dependencies] tempfile.workspace = true -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc10" ,features = ["enable_faketime"]} +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc11" ,features = ["enable_faketime"]} diff --git a/util/build-info/Cargo.toml b/util/build-info/Cargo.toml index d2e97280f2..d7fc9079ee 100644 --- a/util/build-info/Cargo.toml +++ b/util/build-info/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-build-info" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/chain-iter/Cargo.toml b/util/chain-iter/Cargo.toml index 72ec709fc6..31f1f0d0c2 100644 --- a/util/chain-iter/Cargo.toml +++ b/util/chain-iter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-chain-iter" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc10" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc10" } +ckb-types = { path = "../types", version = "= 0.111.0-rc11" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc11" } diff --git a/util/channel/Cargo.toml b/util/channel/Cargo.toml index c4186aa16d..1e3c99d081 100644 --- a/util/channel/Cargo.toml +++ b/util/channel/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-channel" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/constant/Cargo.toml b/util/constant/Cargo.toml index 2fdb434f56..b5d2c40fb3 100644 --- a/util/constant/Cargo.toml +++ b/util/constant/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-constant" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/crypto/Cargo.toml b/util/crypto/Cargo.toml index 0d6d4cd3f1..c9c3706925 100644 --- a/util/crypto/Cargo.toml +++ b/util/crypto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-crypto" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc10" } +ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc11" } lazy_static = "1.3" secp256k1 = { version = "0.24", features = ["recovery"], optional = true } thiserror = "1.0.22" diff --git a/util/dao/Cargo.toml b/util/dao/Cargo.toml index 74bf9332ea..dd36476133 100644 --- a/util/dao/Cargo.toml +++ b/util/dao/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-dao" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,13 +10,13 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../types", version = "= 0.111.0-rc10" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc10" } -ckb-dao-utils = { path = "./utils", version = "= 0.111.0-rc10" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc10" } +ckb-types = { path = "../types", version = "= 0.111.0-rc11" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc11" } +ckb-dao-utils = { path = "./utils", version = "= 0.111.0-rc11" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc11" } [dev-dependencies] -ckb-db = { path = "../../db", version = "= 0.111.0-rc10" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc10" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc10" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc11" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc11" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc11" } tempfile.workspace = true diff --git a/util/dao/utils/Cargo.toml b/util/dao/utils/Cargo.toml index 8072f04c16..c1e6d8c887 100644 --- a/util/dao/utils/Cargo.toml +++ b/util/dao/utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-dao-utils" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,5 +10,5 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] byteorder = "1.3.1" -ckb-types = { path = "../../types", version = "= 0.111.0-rc10" } -ckb-error = { path = "../../../error", version = "= 0.111.0-rc10" } +ckb-types = { path = "../../types", version = "= 0.111.0-rc11" } +ckb-error = { path = "../../../error", version = "= 0.111.0-rc11" } diff --git a/util/fixed-hash/Cargo.toml b/util/fixed-hash/Cargo.toml index a79aea5f9a..2775dfad64 100644 --- a/util/fixed-hash/Cargo.toml +++ b/util/fixed-hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-fixed-hash" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -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.111.0-rc10" } -ckb-fixed-hash-macros = { path = "macros", version = "= 0.111.0-rc10" } +ckb-fixed-hash-core = { path = "core", version = "= 0.111.0-rc11" } +ckb-fixed-hash-macros = { path = "macros", version = "= 0.111.0-rc11" } diff --git a/util/fixed-hash/core/Cargo.toml b/util/fixed-hash/core/Cargo.toml index b0f0731c87..f12fa97224 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.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/fixed-hash/macros/Cargo.toml b/util/fixed-hash/macros/Cargo.toml index 64556117ae..3394bbe015 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.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -12,7 +12,7 @@ repository = "https://github.com/nervosnetwork/ckb" proc-macro = true [dependencies] -ckb-fixed-hash-core = { path = "../core", version = "= 0.111.0-rc10" } +ckb-fixed-hash-core = { path = "../core", version = "= 0.111.0-rc11" } quote = "1.0" syn = "1.0" proc-macro2 = "1.0" diff --git a/util/hash/Cargo.toml b/util/hash/Cargo.toml index 3f7629d3ec..c41c371909 100644 --- a/util/hash/Cargo.toml +++ b/util/hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-hash" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/indexer/Cargo.toml b/util/indexer/Cargo.toml index 3fb610d832..92105b52fd 100644 --- a/util/indexer/Cargo.toml +++ b/util/indexer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-indexer" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -13,15 +13,15 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] thiserror = "1.0" rocksdb = { package = "ckb-rocksdb", version ="=0.20.0", features = ["snappy"], default-features = false } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc10" } -ckb-types = { path = "../types", version = "= 0.111.0-rc10" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc10" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc10" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc10" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc10" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc10" } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc10" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc10" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc11" } +ckb-types = { path = "../types", version = "= 0.111.0-rc11" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc11" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc11" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc11" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc11" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc11" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc11" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc11" } rhai = { version = "1.10.0", features = ["no_function", "no_float", "no_module", "sync"]} serde_json = "1.0" numext-fixed-uint = "0.1" diff --git a/util/instrument/Cargo.toml b/util/instrument/Cargo.toml index bafd673f3e..495f3f0b58 100644 --- a/util/instrument/Cargo.toml +++ b/util/instrument/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-instrument" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc10" } -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc10" } -ckb-chain-iter = { path = "../chain-iter", version = "= 0.111.0-rc10" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc10" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc10" } +ckb-types = { path = "../types", version = "= 0.111.0-rc11" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc11" } +ckb-chain-iter = { path = "../chain-iter", version = "= 0.111.0-rc11" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc11" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc11" } serde_json = "1.0" indicatif = { version = "0.16", optional = true } diff --git a/util/jsonrpc-types/Cargo.toml b/util/jsonrpc-types/Cargo.toml index e1d20b0c70..3a7a8c04e6 100644 --- a/util/jsonrpc-types/Cargo.toml +++ b/util/jsonrpc-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-jsonrpc-types" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,7 +9,7 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc10" } +ckb-types = { path = "../types", version = "= 0.111.0-rc11" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" faster-hex = "0.6" diff --git a/util/launcher/Cargo.toml b/util/launcher/Cargo.toml index bdf79f0bff..e78921e87d 100644 --- a/util/launcher/Cargo.toml +++ b/util/launcher/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-launcher" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,43 +11,43 @@ 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.111.0-rc10" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc10" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc10" } -ckb-migration-template = { path = "migration-template", version = "= 0.111.0-rc10" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc10" } -ckb-db-migration = { path = "../../db-migration", version = "= 0.111.0-rc10" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc10" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc10" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc10" } -ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc10" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc10" } -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc10" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc10" } -ckb-network = { path = "../../network", version = "= 0.111.0-rc10"} -ckb-rpc = { path = "../../rpc", version = "= 0.111.0-rc10"} -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc10"} -ckb-network-alert = { path = "../network-alert", version = "= 0.111.0-rc10" } -ckb-sync = { path = "../../sync", version = "= 0.111.0-rc10"} -ckb-verification = { path = "../../verification", version = "= 0.111.0-rc10" } -ckb-verification-traits = { path = "../../verification/traits", version = "= 0.111.0-rc10" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc10" } -ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc10" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc10" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc10" } -ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc10" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc10" } -ckb-snapshot = { path = "../snapshot", version = "= 0.111.0-rc10" } -ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc10" } -ckb-light-client-protocol-server = { path = "../light-client-protocol-server", version = "= 0.111.0-rc10" } -ckb-block-filter = { path = "../../block-filter", version = "= 0.111.0-rc10" } -ckb-hash = { path = "../hash", version = "= 0.111.0-rc10" } +ckb-types = { path = "../types", version = "= 0.111.0-rc11" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc11" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc11" } +ckb-migration-template = { path = "migration-template", version = "= 0.111.0-rc11" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc11" } +ckb-db-migration = { path = "../../db-migration", version = "= 0.111.0-rc11" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc11" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc11" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc11" } +ckb-build-info = { path = "../build-info", version = "= 0.111.0-rc11" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc11" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc11" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc11" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc11"} +ckb-rpc = { path = "../../rpc", version = "= 0.111.0-rc11"} +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc11"} +ckb-network-alert = { path = "../network-alert", version = "= 0.111.0-rc11" } +ckb-sync = { path = "../../sync", version = "= 0.111.0-rc11"} +ckb-verification = { path = "../../verification", version = "= 0.111.0-rc11" } +ckb-verification-traits = { path = "../../verification/traits", version = "= 0.111.0-rc11" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc11" } +ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc11" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc11" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc11" } +ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc11" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc11" } +ckb-snapshot = { path = "../snapshot", version = "= 0.111.0-rc11" } +ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc11" } +ckb-light-client-protocol-server = { path = "../light-client-protocol-server", version = "= 0.111.0-rc11" } +ckb-block-filter = { path = "../../block-filter", version = "= 0.111.0-rc11" } +ckb-hash = { path = "../hash", version = "= 0.111.0-rc11" } num_cpus = "1.10" once_cell = "1.8.0" tempfile.workspace = true [dev-dependencies] -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc10", features = ["enable_faketime"] } +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc11", features = ["enable_faketime"] } [features] with_sentry = [ "ckb-sync/with_sentry", "ckb-network/with_sentry", "ckb-app-config/with_sentry" ] diff --git a/util/launcher/migration-template/Cargo.toml b/util/launcher/migration-template/Cargo.toml index df1dbb6b78..3e75e6e1d7 100644 --- a/util/launcher/migration-template/Cargo.toml +++ b/util/launcher/migration-template/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-migration-template" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/light-client-protocol-server/Cargo.toml b/util/light-client-protocol-server/Cargo.toml index f88957420c..cc1eae474d 100644 --- a/util/light-client-protocol-server/Cargo.toml +++ b/util/light-client-protocol-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-light-client-protocol-server" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,23 +9,23 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-network = { path = "../../network", version = "= 0.111.0-rc10" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc10" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc10" } -ckb-types = { path = "../types", version = "= 0.111.0-rc10" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc10" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc11" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc11" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc11" } +ckb-types = { path = "../types", version = "= 0.111.0-rc11" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc11" } ckb-merkle-mountain-range = "0.5.2" -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc10"} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc11"} [dev-dependencies] -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc10" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc10" } -ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc10" } -ckb-launcher = { path = "../launcher", version = "= 0.111.0-rc10" } -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc10" } -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc10" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc10" } -ckb-test-chain-utils = { path = "../test-chain-utils", version = "= 0.111.0-rc10" } +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc11" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc11" } +ckb-tx-pool = { path = "../../tx-pool", version = "= 0.111.0-rc11" } +ckb-launcher = { path = "../launcher", version = "= 0.111.0-rc11" } +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc11" } +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc11" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc11" } +ckb-test-chain-utils = { path = "../test-chain-utils", version = "= 0.111.0-rc11" } tempfile.workspace = true -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc10", features = ["enable_faketime"]} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc11", features = ["enable_faketime"]} tokio = "1.20" diff --git a/util/logger-config/Cargo.toml b/util/logger-config/Cargo.toml index 100bf0da6b..0e54c32e41 100644 --- a/util/logger-config/Cargo.toml +++ b/util/logger-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger-config" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/logger-service/Cargo.toml b/util/logger-service/Cargo.toml index 9e22a0b0d5..6f98e2c3fc 100644 --- a/util/logger-service/Cargo.toml +++ b/util/logger-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger-service" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -9,9 +9,9 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-util = { path = "..", version = "= 0.111.0-rc10" } -ckb-logger-config = { path = "../logger-config", version = "= 0.111.0-rc10" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc10" } +ckb-util = { path = "..", version = "= 0.111.0-rc11" } +ckb-logger-config = { path = "../logger-config", version = "= 0.111.0-rc11" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc11" } yansi = "0.5" log = "0.4" env_logger = "0.6" @@ -22,7 +22,7 @@ sentry = { version = "0.26.0", optional = true, features = ["log"] } time = { version = "0.3.11", features = ["formatting"] } [dev-dependencies] -ckb-logger = { path = "../logger", version = "= 0.111.0-rc10" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc11" } tempfile.workspace = true [features] diff --git a/util/logger/Cargo.toml b/util/logger/Cargo.toml index 1efcc3df22..6c93a7b867 100644 --- a/util/logger/Cargo.toml +++ b/util/logger/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-logger" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/memory-tracker/Cargo.toml b/util/memory-tracker/Cargo.toml index ffbe84a279..3bd5f0daa2 100644 --- a/util/memory-tracker/Cargo.toml +++ b/util/memory-tracker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-memory-tracker" -version = "0.111.0-rc10" +version = "0.111.0-rc11" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc10" } -ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc10" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc10" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc11" } +ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc11" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc11" } [target.'cfg(all(not(target_env = "msvc"), not(target_os="macos")))'.dependencies] jemalloc-ctl = { package = "tikv-jemalloc-ctl", version = "0.5.0" } diff --git a/util/metrics-config/Cargo.toml b/util/metrics-config/Cargo.toml index e467edde58..4ac7e71726 100644 --- a/util/metrics-config/Cargo.toml +++ b/util/metrics-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics-config" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/metrics-service/Cargo.toml b/util/metrics-service/Cargo.toml index 0e5bcce492..d9aa0fd2b0 100644 --- a/util/metrics-service/Cargo.toml +++ b/util/metrics-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics-service" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos "] edition = "2021" @@ -9,11 +9,11 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-metrics-config = { path = "../metrics-config", version = "= 0.111.0-rc10" } -ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc10" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc10" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc10" } -ckb-util = { path = "..", version = "= 0.111.0-rc10" } +ckb-metrics-config = { path = "../metrics-config", version = "= 0.111.0-rc11" } +ckb-metrics = { path = "../metrics", version = "= 0.111.0-rc11" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc11" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc11" } +ckb-util = { path = "..", version = "= 0.111.0-rc11" } prometheus = "0.13.3" hyper = { version = "0.14", features = ["http1", "tcp", "server"] } -ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc10" } +ckb-stop-handler = { path = "../stop-handler", version = "= 0.111.0-rc11" } diff --git a/util/metrics/Cargo.toml b/util/metrics/Cargo.toml index 5800c79daa..dbaf4257bd 100644 --- a/util/metrics/Cargo.toml +++ b/util/metrics/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-metrics" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/multisig/Cargo.toml b/util/multisig/Cargo.toml index 868d2a295a..0a25ec2127 100644 --- a/util/multisig/Cargo.toml +++ b/util/multisig/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-multisig" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,9 +9,9 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-error = { path = "../../error", version = "= 0.111.0-rc10" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc10" } -ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc10" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc11" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc11" } +ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc11" } [dev-dependencies] rand = "0.7" diff --git a/util/network-alert/Cargo.toml b/util/network-alert/Cargo.toml index 82ffa3aa19..63d62fc8a0 100644 --- a/util/network-alert/Cargo.toml +++ b/util/network-alert/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-network-alert" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,23 +9,23 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-multisig = { path = "../multisig", version = "= 0.111.0-rc10" } -ckb-types = { path = "../types", version = "= 0.111.0-rc10" } -ckb-util = { path = "..", version = "= 0.111.0-rc10" } -ckb-network = { path = "../../network", version = "= 0.111.0-rc10" } -ckb-notify = { path = "../../notify", version = "= 0.111.0-rc10"} -ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc10" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc10"} -ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc10" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc10" } -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc10" } +ckb-multisig = { path = "../multisig", version = "= 0.111.0-rc11" } +ckb-types = { path = "../types", version = "= 0.111.0-rc11" } +ckb-util = { path = "..", version = "= 0.111.0-rc11" } +ckb-network = { path = "../../network", version = "= 0.111.0-rc11" } +ckb-notify = { path = "../../notify", version = "= 0.111.0-rc11"} +ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.111.0-rc11" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc11"} +ckb-app-config = { path = "../app-config", version = "= 0.111.0-rc11" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc11" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc11" } lru = "0.7.1" semver = "1.0" [dev-dependencies] -ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc10" } -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc10" } +ckb-crypto = { path = "../crypto", version = "= 0.111.0-rc11" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc11" } once_cell = "1.8.0" -ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc10", features = ["enable_faketime"]} +ckb-systemtime = {path = "../systemtime", version = "= 0.111.0-rc11", features = ["enable_faketime"]} faster-hex = "0.6" serde_json = "1.0" diff --git a/util/occupied-capacity/Cargo.toml b/util/occupied-capacity/Cargo.toml index 08f27ea2bb..f37e14da69 100644 --- a/util/occupied-capacity/Cargo.toml +++ b/util/occupied-capacity/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-occupied-capacity" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -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.111.0-rc10" } -ckb-occupied-capacity-core = { path = "core", version = "= 0.111.0-rc10" } +ckb-occupied-capacity-macros = { path = "macros", version = "= 0.111.0-rc11" } +ckb-occupied-capacity-core = { path = "core", version = "= 0.111.0-rc11" } diff --git a/util/occupied-capacity/core/Cargo.toml b/util/occupied-capacity/core/Cargo.toml index 02c480284e..bf5567ba1d 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.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/occupied-capacity/macros/Cargo.toml b/util/occupied-capacity/macros/Cargo.toml index 511763cc02..8b7fd132ef 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.111.0-rc10" +version = "0.111.0-rc11" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -14,4 +14,4 @@ proc-macro = true [dependencies] quote = "1.0" syn = "1.0" -ckb-occupied-capacity-core = { path = "../core", version = "= 0.111.0-rc10" } +ckb-occupied-capacity-core = { path = "../core", version = "= 0.111.0-rc11" } diff --git a/util/proposal-table/Cargo.toml b/util/proposal-table/Cargo.toml index ab43b49d30..e5fdb1fd8e 100644 --- a/util/proposal-table/Cargo.toml +++ b/util/proposal-table/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-proposal-table" -version = "0.111.0-rc10" +version = "0.111.0-rc11" authors = ["Nervos Core Dev "] edition = "2021" 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.111.0-rc10" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc10" } -ckb-types = { path = "../types", version = "= 0.111.0-rc10" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc11" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc11" } +ckb-types = { path = "../types", version = "= 0.111.0-rc11" } diff --git a/util/rational/Cargo.toml b/util/rational/Cargo.toml index 2a1ebcd61c..2a3b9fe82d 100644 --- a/util/rational/Cargo.toml +++ b/util/rational/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-rational" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/reward-calculator/Cargo.toml b/util/reward-calculator/Cargo.toml index c363d160d1..976355c4bf 100644 --- a/util/reward-calculator/Cargo.toml +++ b/util/reward-calculator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-reward-calculator" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,15 +9,15 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../types", version = "= 0.111.0-rc10" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc10" } -ckb-dao = { path = "../dao", version = "= 0.111.0-rc10" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc10" } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc10" } -ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc10"} +ckb-types = { path = "../types", version = "= 0.111.0-rc11" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc11" } +ckb-dao = { path = "../dao", version = "= 0.111.0-rc11" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc11" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc11" } +ckb-chain-spec = {path = "../../spec", version = "= 0.111.0-rc11"} [dev-dependencies] -ckb-db = { path = "../../db", version = "= 0.111.0-rc10" } -ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc10" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc10" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc11" } +ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc11" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc11" } tempfile.workspace = true diff --git a/util/runtime/Cargo.toml b/util/runtime/Cargo.toml index 4b24e149bb..31f5ed0853 100644 --- a/util/runtime/Cargo.toml +++ b/util/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-async-runtime" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,5 +10,5 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] tokio = { version = "1", features = ["full"] } -ckb-logger = { path = "../logger", version = "= 0.111.0-rc10" } -ckb-spawn = { path = "../spawn", version = "= 0.111.0-rc10" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc11" } +ckb-spawn = { path = "../spawn", version = "= 0.111.0-rc11" } diff --git a/util/rust-unstable-port/Cargo.toml b/util/rust-unstable-port/Cargo.toml index a18dda8a2b..acca6afbca 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.111.0-rc10" +version = "0.111.0-rc11" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" diff --git a/util/snapshot/Cargo.toml b/util/snapshot/Cargo.toml index 41a0e064a1..48fc7f096a 100644 --- a/util/snapshot/Cargo.toml +++ b/util/snapshot/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-snapshot" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -11,15 +11,15 @@ 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.111.0-rc10" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc10" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc10" } -ckb-db = { path = "../../db", version = "= 0.111.0-rc10" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc10" } -ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc10" } +ckb-types = { path = "../types", version = "= 0.111.0-rc11" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc11" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc11" } +ckb-db = { path = "../../db", version = "= 0.111.0-rc11" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc11" } +ckb-proposal-table = { path = "../proposal-table", version = "= 0.111.0-rc11" } arc-swap = "1.3" -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc10" } -ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc10" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc11" } +ckb-freezer = { path = "../../freezer", version = "= 0.111.0-rc11" } ckb-merkle-mountain-range = "0.5.2" [features] diff --git a/util/spawn/Cargo.toml b/util/spawn/Cargo.toml index f8fdb918de..e2272ae05c 100644 --- a/util/spawn/Cargo.toml +++ b/util/spawn/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-spawn" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" diff --git a/util/stop-handler/Cargo.toml b/util/stop-handler/Cargo.toml index dfca296746..470a47bab2 100644 --- a/util/stop-handler/Cargo.toml +++ b/util/stop-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-stop-handler" -version = "0.111.0-rc10" +version = "0.111.0-rc11" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,12 +9,12 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-logger = { path = "../logger", version = "= 0.111.0-rc10" } +ckb-logger = { path = "../logger", version = "= 0.111.0-rc11" } tokio = { version = "1", features = ["sync", "rt-multi-thread"] } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc10" } -ckb-util = { path = "..", version = "= 0.111.0-rc10" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc11" } +ckb-util = { path = "..", version = "= 0.111.0-rc11" } once_cell = "1.8.0" -ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc10" } +ckb-async-runtime = { path = "../runtime", version = "= 0.111.0-rc11" } tokio-util = "0.7.8" diff --git a/util/systemtime/Cargo.toml b/util/systemtime/Cargo.toml index 6095fa1ca1..0e3daa120f 100644 --- a/util/systemtime/Cargo.toml +++ b/util/systemtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-systemtime" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos "] edition = "2021" diff --git a/util/test-chain-utils/Cargo.toml b/util/test-chain-utils/Cargo.toml index ee8ebe7c66..b44510bfa0 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.111.0-rc10" +version = "0.111.0-rc11" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,18 +9,18 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = {path = "../types", version = "= 0.111.0-rc10"} -ckb-db = { path = "../../db", version = "= 0.111.0-rc10" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc10" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc10" } -ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc10" } -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc10" } +ckb-types = {path = "../types", version = "= 0.111.0-rc11"} +ckb-db = { path = "../../db", version = "= 0.111.0-rc11" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc11" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc11" } +ckb-dao-utils = { path = "../dao/utils", version = "= 0.111.0-rc11" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc11" } lazy_static = "1.3.0" -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc10" } -ckb-resource = { path = "../../resource", version = "= 0.111.0-rc10" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc10" } -ckb-util = { path = "..", version = "= 0.111.0-rc10" } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc11" } +ckb-resource = { path = "../../resource", version = "= 0.111.0-rc11" } +ckb-db-schema = { path = "../../db-schema", version = "= 0.111.0-rc11" } +ckb-util = { path = "..", version = "= 0.111.0-rc11" } tempfile.workspace = true [dev-dependencies] -ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc10", features = ["enable_faketime"] } +ckb-systemtime = { path = "../systemtime", version = "= 0.111.0-rc11", features = ["enable_faketime"] } diff --git a/util/types/Cargo.toml b/util/types/Cargo.toml index 0b727788b1..6582fd92e1 100644 --- a/util/types/Cargo.toml +++ b/util/types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-types" -version = "0.111.0-rc10" +version = "0.111.0-rc11" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -10,17 +10,17 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] molecule = "=0.7.5" -ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc10" } +ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc11" } numext-fixed-uint = { version = "0.1", features = ["support_rand", "support_heapsize", "support_serde"] } bytes = { version="1", features = ["serde"] } merkle-cbt = "0.3" -ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc10" } -ckb-hash = { path = "../hash", version = "= 0.111.0-rc10" } -ckb-channel = { path = "../channel", version = "= 0.111.0-rc10" } -ckb-constant = { path = "../constant", version = "= 0.111.0-rc10" } +ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc11" } +ckb-hash = { path = "../hash", version = "= 0.111.0-rc11" } +ckb-channel = { path = "../channel", version = "= 0.111.0-rc11" } +ckb-constant = { path = "../constant", version = "= 0.111.0-rc11" } bit-vec = "0.6.3" -ckb-error = { path = "../../error", version = "= 0.111.0-rc10" } -ckb-rational = { path = "../rational", version = "= 0.111.0-rc10" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc11" } +ckb-rational = { path = "../rational", version = "= 0.111.0-rc11" } once_cell = "1.8.0" derive_more = { version = "0.99.0", default-features=false, features = ["display"] } ckb-merkle-mountain-range = "0.5.2" diff --git a/verification/Cargo.toml b/verification/Cargo.toml index dc580fbef5..5a6c7829ca 100644 --- a/verification/Cargo.toml +++ b/verification/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,20 +9,20 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } -ckb-script = { path = "../script", version = "= 0.111.0-rc10" } -ckb-pow = { path = "../pow", version = "= 0.111.0-rc10" } -ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc10" } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc11" } +ckb-script = { path = "../script", version = "= 0.111.0-rc11" } +ckb-pow = { path = "../pow", version = "= 0.111.0-rc11" } +ckb-systemtime = { path = "../util/systemtime", version = "= 0.111.0-rc11" } lru = "0.7.1" -ckb-traits = { path = "../traits", version = "= 0.111.0-rc10" } -ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc10" } -ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc10" } -ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc10" } -ckb-error = { path = "../error", version = "= 0.111.0-rc10" } +ckb-traits = { path = "../traits", version = "= 0.111.0-rc11" } +ckb-chain-spec = { path = "../spec", version = "= 0.111.0-rc11" } +ckb-dao = { path = "../util/dao", version = "= 0.111.0-rc11" } +ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.111.0-rc11" } +ckb-error = { path = "../error", version = "= 0.111.0-rc11" } derive_more = { version = "0.99.0", default-features=false, features = ["display"] } -ckb-verification-traits = { path = "./traits", version = "= 0.111.0-rc10" } +ckb-verification-traits = { path = "./traits", version = "= 0.111.0-rc11" } [dev-dependencies] -ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc10" } -ckb-resource = { path = "../resource", version = "= 0.111.0-rc10" } -ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc10", features=["enable_faketime"]} +ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.111.0-rc11" } +ckb-resource = { path = "../resource", version = "= 0.111.0-rc11" } +ckb-systemtime = {path = "../util/systemtime", version = "= 0.111.0-rc11", features=["enable_faketime"]} diff --git a/verification/contextual/Cargo.toml b/verification/contextual/Cargo.toml index 29ce630dfb..b1c0a046eb 100644 --- a/verification/contextual/Cargo.toml +++ b/verification/contextual/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification-contextual" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,27 +9,27 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../../util/types", version = "= 0.111.0-rc10" } -ckb-store = { path = "../../store", version = "= 0.111.0-rc10" } -ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc10" } +ckb-types = { path = "../../util/types", version = "= 0.111.0-rc11" } +ckb-store = { path = "../../store", version = "= 0.111.0-rc11" } +ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc11" } rayon = "1.0" -ckb-traits = { path = "../../traits", version = "= 0.111.0-rc10" } -ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc10" } -ckb-dao = { path = "../../util/dao", version = "= 0.111.0-rc10" } -ckb-dao-utils = { path = "../../util/dao/utils", version = "= 0.111.0-rc10" } -ckb-logger = {path = "../../util/logger", version = "= 0.111.0-rc10"} -ckb-reward-calculator= { path = "../../util/reward-calculator", version = "= 0.111.0-rc10" } -ckb-error = { path = "../../error", version = "= 0.111.0-rc10" } +ckb-traits = { path = "../../traits", version = "= 0.111.0-rc11" } +ckb-chain-spec = { path = "../../spec", version = "= 0.111.0-rc11" } +ckb-dao = { path = "../../util/dao", version = "= 0.111.0-rc11" } +ckb-dao-utils = { path = "../../util/dao/utils", version = "= 0.111.0-rc11" } +ckb-logger = {path = "../../util/logger", version = "= 0.111.0-rc11"} +ckb-reward-calculator= { path = "../../util/reward-calculator", version = "= 0.111.0-rc11" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc11" } tokio = { version = "1", features = ["sync", "rt-multi-thread"] } -ckb-async-runtime = { path = "../../util/runtime", version = "= 0.111.0-rc10" } -ckb-verification-traits = { path = "../traits", version = "= 0.111.0-rc10" } -ckb-verification = { path = "..", version = "= 0.111.0-rc10" } +ckb-async-runtime = { path = "../../util/runtime", version = "= 0.111.0-rc11" } +ckb-verification-traits = { path = "../traits", version = "= 0.111.0-rc11" } +ckb-verification = { path = "..", version = "= 0.111.0-rc11" } ckb-merkle-mountain-range = "0.5.2" [dev-dependencies] -ckb-chain = { path = "../../chain", version = "= 0.111.0-rc10" } -ckb-shared = { path = "../../shared", version = "= 0.111.0-rc10" } -ckb-launcher = { path = "../../util/launcher", version = "= 0.111.0-rc10" } -ckb-test-chain-utils = { path = "../../util/test-chain-utils", version = "= 0.111.0-rc10" } -ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc10", features = ["enable_faketime"]} +ckb-chain = { path = "../../chain", version = "= 0.111.0-rc11" } +ckb-shared = { path = "../../shared", version = "= 0.111.0-rc11" } +ckb-launcher = { path = "../../util/launcher", version = "= 0.111.0-rc11" } +ckb-test-chain-utils = { path = "../../util/test-chain-utils", version = "= 0.111.0-rc11" } +ckb-systemtime = { path = "../../util/systemtime", version = "= 0.111.0-rc11", features = ["enable_faketime"]} rand = "0.7" diff --git a/verification/traits/Cargo.toml b/verification/traits/Cargo.toml index 9ca7ba1d40..9496e89b18 100644 --- a/verification/traits/Cargo.toml +++ b/verification/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-verification-traits" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -10,4 +10,4 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] bitflags = "1.0" -ckb-error = { path = "../../error", version = "= 0.111.0-rc10" } +ckb-error = { path = "../../error", version = "= 0.111.0-rc11" } diff --git a/wasm-build-test/Cargo.toml b/wasm-build-test/Cargo.toml index 794d9da2bd..0dbe5df02a 100644 --- a/wasm-build-test/Cargo.toml +++ b/wasm-build-test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-wasm-test" -version = "0.111.0-rc10" +version = "0.111.0-rc11" license = "MIT" authors = ["Nervos Core Dev "] edition = "2021" @@ -9,8 +9,8 @@ homepage = "https://github.com/nervosnetwork/ckb" repository = "https://github.com/nervosnetwork/ckb" [dependencies] -ckb-types = { path = "../util/types", version = "= 0.111.0-rc10" } -ckb-script = { path = "../script", version = "= 0.111.0-rc10", default-features = false, features = [] } +ckb-types = { path = "../util/types", version = "= 0.111.0-rc11" } +ckb-script = { path = "../script", version = "= 0.111.0-rc11", default-features = false, features = [] } # Prevent this from interfering with workspaces [workspace] From 532d0df7fde43dffb1f3620cfeef6e6c37f0045c Mon Sep 17 00:00:00 2001 From: EthanYuan Date: Wed, 12 Jul 2023 22:52:33 +0800 Subject: [PATCH 092/125] create crate ckb-gen-types --- Cargo.lock | 17 +- Cargo.toml | 1 + util/gen-types/Cargo.toml | 19 + util/gen-types/schemas/blockchain.mol | 118 + util/gen-types/src/conversion/blockchain.rs | 62 + util/gen-types/src/conversion/mod.rs | 4 + util/gen-types/src/conversion/primitive.rs | 114 + util/gen-types/src/conversion/utilities.rs | 82 + util/gen-types/src/core/mod.rs | 8 + util/gen-types/src/core/types.rs | 29 + util/gen-types/src/core/view.rs | 53 + util/gen-types/src/generated/blockchain.rs | 8938 +++++++++++++++++++ util/gen-types/src/generated/mod.rs | 8 + util/gen-types/src/hash/calc_hash.rs | 290 + util/gen-types/src/hash/hash.rs | 86 + util/gen-types/src/hash/mod.rs | 8 + util/gen-types/src/hash/utils.rs | 206 + util/gen-types/src/lib.rs | 22 + util/gen-types/src/prelude.rs | 13 + 19 files changed, 10077 insertions(+), 1 deletion(-) create mode 100644 util/gen-types/Cargo.toml create mode 100644 util/gen-types/schemas/blockchain.mol create mode 100644 util/gen-types/src/conversion/blockchain.rs create mode 100644 util/gen-types/src/conversion/mod.rs create mode 100644 util/gen-types/src/conversion/primitive.rs create mode 100644 util/gen-types/src/conversion/utilities.rs create mode 100644 util/gen-types/src/core/mod.rs create mode 100644 util/gen-types/src/core/types.rs create mode 100644 util/gen-types/src/core/view.rs create mode 100644 util/gen-types/src/generated/blockchain.rs create mode 100644 util/gen-types/src/generated/mod.rs create mode 100644 util/gen-types/src/hash/calc_hash.rs create mode 100644 util/gen-types/src/hash/hash.rs create mode 100644 util/gen-types/src/hash/mod.rs create mode 100644 util/gen-types/src/hash/utils.rs create mode 100644 util/gen-types/src/lib.rs create mode 100644 util/gen-types/src/prelude.rs diff --git a/Cargo.lock b/Cargo.lock index 62f859e72d..fb05354df5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -194,6 +194,12 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95916998c798756098a4eb1b3f2cd510659705a9817bf203d61abd30fbec3e7b" +[[package]] +name = "blake2b-ref" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "294d17c72e0ba59fad763caa112368d0672083779cdebbb97164f4bb4c1e339a" + [[package]] name = "blake2b-rs" version = "0.2.0" @@ -719,11 +725,20 @@ dependencies = [ "tempfile", ] +[[package]] +name = "ckb-gen-types" +version = "0.112.0-pre" +dependencies = [ + "blake2b-ref 0.3.1", + "cfg-if 1.0.0", + "molecule", +] + [[package]] name = "ckb-hash" version = "0.111.0-rc11" dependencies = [ - "blake2b-ref", + "blake2b-ref 0.2.1", "blake2b-rs", ] diff --git a/Cargo.toml b/Cargo.toml index 97b8aa3de2..2e7a979691 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,6 +50,7 @@ members = [ "util/constant", "error", "util/multisig", + "util/gen-types", "util/types", "util/jsonrpc-types", "freezer", diff --git a/util/gen-types/Cargo.toml b/util/gen-types/Cargo.toml new file mode 100644 index 0000000000..1202ce315f --- /dev/null +++ b/util/gen-types/Cargo.toml @@ -0,0 +1,19 @@ +[package] +name = "ckb-gen-types" +version = "0.112.0-pre" +authors = ["Nervos Core Dev "] +edition = "2021" +license = "MIT" +description = "Provides the generated types for CKB." +homepage = "https://github.com/nervosnetwork/ckb" +repository = "https://github.com/nervosnetwork/ckb" + +[features] +default = ["std"] +calc-hash = ["blake2b-ref"] +std = ["molecule/std"] + +[dependencies] +molecule = { version = "0.7.5", default-features = false } +cfg-if = "1.0" +blake2b-ref = { version = "0.3.1", default-features = false, optional = true } \ No newline at end of file diff --git a/util/gen-types/schemas/blockchain.mol b/util/gen-types/schemas/blockchain.mol new file mode 100644 index 0000000000..3ab343d856 --- /dev/null +++ b/util/gen-types/schemas/blockchain.mol @@ -0,0 +1,118 @@ +/* Basic Types */ + +// The `UintN` is used to store a `N` bits unsigned integer +// as a byte array in little endian. +array Uint32 [byte; 4]; +array Uint64 [byte; 8]; +array Uint128 [byte; 16]; +array Byte32 [byte; 32]; +array Uint256 [byte; 32]; + +vector Bytes ; +option BytesOpt (Bytes); + +vector BytesVec ; +vector Byte32Vec ; + +/* Types for Chain */ + +option ScriptOpt (Script); + +array ProposalShortId [byte; 10]; + +vector UncleBlockVec ; +vector TransactionVec ; +vector ProposalShortIdVec ; +vector CellDepVec ; +vector CellInputVec ; +vector CellOutputVec ; + +table Script { + code_hash: Byte32, + hash_type: byte, + args: Bytes, +} + +struct OutPoint { + tx_hash: Byte32, + index: Uint32, +} + +struct CellInput { + since: Uint64, + previous_output: OutPoint, +} + +table CellOutput { + capacity: Uint64, + lock: Script, + type_: ScriptOpt, +} + +struct CellDep { + out_point: OutPoint, + dep_type: byte, +} + +table RawTransaction { + version: Uint32, + cell_deps: CellDepVec, + header_deps: Byte32Vec, + inputs: CellInputVec, + outputs: CellOutputVec, + outputs_data: BytesVec, +} + +table Transaction { + raw: RawTransaction, + witnesses: BytesVec, +} + +struct RawHeader { + version: Uint32, + compact_target: Uint32, + timestamp: Uint64, + number: Uint64, + epoch: Uint64, + parent_hash: Byte32, + transactions_root: Byte32, + proposals_hash: Byte32, + extra_hash: Byte32, + dao: Byte32, +} + +struct Header { + raw: RawHeader, + nonce: Uint128, +} + +table UncleBlock { + header: Header, + proposals: ProposalShortIdVec, +} + +table Block { + header: Header, + uncles: UncleBlockVec, + transactions: TransactionVec, + proposals: ProposalShortIdVec, +} + +table BlockV1 { + header: Header, + uncles: UncleBlockVec, + transactions: TransactionVec, + proposals: ProposalShortIdVec, + extension: Bytes, +} + +table CellbaseWitness { + lock: Script, + message: Bytes, +} + +table WitnessArgs { + lock: BytesOpt, // Lock args + input_type: BytesOpt, // Type args for input + output_type: BytesOpt, // Type args for output +} diff --git a/util/gen-types/src/conversion/blockchain.rs b/util/gen-types/src/conversion/blockchain.rs new file mode 100644 index 0000000000..6a18a51984 --- /dev/null +++ b/util/gen-types/src/conversion/blockchain.rs @@ -0,0 +1,62 @@ +use crate::{bytes::Bytes, generated::packed, prelude::*, vec::Vec}; +impl Pack for [u8; 32] { + fn pack(&self) -> packed::Byte32 { + packed::Byte32::from_slice(&self[..]).expect("impossible: fail to pack [u8; 32]") + } +} + +impl<'r> Unpack<[u8; 32]> for packed::Byte32Reader<'r> { + fn unpack(&self) -> [u8; 32] { + let ptr = self.as_slice().as_ptr() as *const [u8; 32]; + unsafe { *ptr } + } +} +impl_conversion_for_entity_unpack!([u8; 32], Byte32); + +impl Pack for [u8; 10] { + fn pack(&self) -> packed::ProposalShortId { + packed::ProposalShortId::from_slice(&self[..]) + .expect("impossible: fail to pack to ProposalShortId") + } +} + +impl<'r> Unpack<[u8; 10]> for packed::ProposalShortIdReader<'r> { + fn unpack(&self) -> [u8; 10] { + let ptr = self.as_slice().as_ptr() as *const [u8; 10]; + unsafe { *ptr } + } +} +impl_conversion_for_entity_unpack!([u8; 10], ProposalShortId); + +impl Pack for Bytes { + fn pack(&self) -> packed::Bytes { + let len = (self.len() as u32).to_le_bytes(); + let mut v = Vec::with_capacity(4 + self.len()); + v.extend_from_slice(&len[..]); + v.extend_from_slice(&self[..]); + packed::Bytes::new_unchecked(v.into()) + } +} + +impl<'r> Unpack for packed::BytesReader<'r> { + fn unpack(&self) -> Bytes { + Bytes::from(self.raw_data().to_vec()) + } +} + +impl Unpack for packed::Bytes { + fn unpack(&self) -> Bytes { + self.raw_data() + } +} + +impl_conversion_for_vector!(Bytes, BytesVec, BytesVecReader); +impl_conversion_for_packed_optional_pack!(Script, ScriptOpt); +impl_conversion_for_packed_iterator_pack!(ProposalShortId, ProposalShortIdVec); +impl_conversion_for_packed_iterator_pack!(Bytes, BytesVec); +impl_conversion_for_packed_iterator_pack!(Transaction, TransactionVec); +impl_conversion_for_packed_iterator_pack!(CellDep, CellDepVec); +impl_conversion_for_packed_iterator_pack!(CellOutput, CellOutputVec); +impl_conversion_for_packed_iterator_pack!(CellInput, CellInputVec); +impl_conversion_for_packed_iterator_pack!(UncleBlock, UncleBlockVec); +impl_conversion_for_packed_iterator_pack!(Byte32, Byte32Vec); diff --git a/util/gen-types/src/conversion/mod.rs b/util/gen-types/src/conversion/mod.rs new file mode 100644 index 0000000000..e284a9e5f6 --- /dev/null +++ b/util/gen-types/src/conversion/mod.rs @@ -0,0 +1,4 @@ +#[macro_use] +mod utilities; +mod blockchain; +mod primitive; diff --git a/util/gen-types/src/conversion/primitive.rs b/util/gen-types/src/conversion/primitive.rs new file mode 100644 index 0000000000..d638116507 --- /dev/null +++ b/util/gen-types/src/conversion/primitive.rs @@ -0,0 +1,114 @@ +use crate::{bytes::Bytes, prelude::*}; + +use crate::generated::packed; +#[cfg(not(feature = "std"))] +use alloc::{borrow::ToOwned, str, string::String, vec::Vec}; +#[cfg(feature = "std")] +use std::str; + +impl Pack for u32 { + fn pack(&self) -> packed::Uint32 { + packed::Uint32::new_unchecked(Bytes::from(self.to_le_bytes().to_vec())) + } +} + +impl Pack for u64 { + fn pack(&self) -> packed::Uint64 { + packed::Uint64::new_unchecked(Bytes::from(self.to_le_bytes().to_vec())) + } +} + +impl Pack for u128 { + fn pack(&self) -> packed::Uint128 { + packed::Uint128::new_unchecked(Bytes::from(self.to_le_bytes().to_vec())) + } +} + +impl Pack for usize { + fn pack(&self) -> packed::Uint32 { + (*self as u32).pack() + } +} + +impl<'r> Unpack for packed::Uint32Reader<'r> { + #[allow(clippy::cast_ptr_alignment)] + fn unpack(&self) -> u32 { + let le = self.as_slice().as_ptr() as *const u32; + u32::from_le(unsafe { *le }) + } +} +impl_conversion_for_entity_unpack!(u32, Uint32); + +impl<'r> Unpack for packed::Uint64Reader<'r> { + #[allow(clippy::cast_ptr_alignment)] + fn unpack(&self) -> u64 { + let le = self.as_slice().as_ptr() as *const u64; + u64::from_le(unsafe { *le }) + } +} +impl_conversion_for_entity_unpack!(u64, Uint64); + +impl<'r> Unpack for packed::Uint128Reader<'r> { + #[allow(clippy::cast_ptr_alignment)] + fn unpack(&self) -> u128 { + let le = self.as_slice().as_ptr() as *const u128; + u128::from_le(unsafe { *le }) + } +} +impl_conversion_for_entity_unpack!(u128, Uint128); + +impl<'r> Unpack for packed::Uint32Reader<'r> { + fn unpack(&self) -> usize { + let x: u32 = self.unpack(); + x as usize + } +} +impl_conversion_for_entity_unpack!(usize, Uint32); + +impl Pack for [u8] { + fn pack(&self) -> packed::Bytes { + let len = self.len(); + let mut vec: Vec = Vec::with_capacity(4 + len); + vec.extend_from_slice(&(len as u32).to_le_bytes()[..]); + vec.extend_from_slice(self); + packed::Bytes::new_unchecked(Bytes::from(vec)) + } +} + +impl<'r> Unpack> for packed::BytesReader<'r> { + fn unpack(&self) -> Vec { + self.raw_data().to_owned() + } +} +impl_conversion_for_entity_unpack!(Vec, Bytes); + +impl Pack for str { + fn pack(&self) -> packed::Bytes { + self.as_bytes().pack() + } +} + +impl<'r> packed::BytesReader<'r> { + pub fn as_utf8(&self) -> Result<&str, str::Utf8Error> { + str::from_utf8(self.raw_data()) + } + + #[allow(clippy::missing_safety_doc)] + pub unsafe fn as_utf8_unchecked(&self) -> &str { + str::from_utf8_unchecked(self.raw_data()) + } + + pub fn is_utf8(&self) -> bool { + self.as_utf8().is_ok() + } +} + +impl Pack for String { + fn pack(&self) -> packed::Bytes { + self.as_str().pack() + } +} + +impl_conversion_for_option_pack!(&str, BytesOpt); +impl_conversion_for_option_pack!(String, BytesOpt); +impl_conversion_for_option_pack!(Bytes, BytesOpt); diff --git a/util/gen-types/src/conversion/utilities.rs b/util/gen-types/src/conversion/utilities.rs new file mode 100644 index 0000000000..ed8719652f --- /dev/null +++ b/util/gen-types/src/conversion/utilities.rs @@ -0,0 +1,82 @@ +// https://github.com/nervosnetwork/ckb/blob/develop/util/types/src/conversion/utilities.rs + +macro_rules! impl_conversion_for_entity_unpack { + ($original:ty, $entity:ident) => { + impl Unpack<$original> for packed::$entity { + fn unpack(&self) -> $original { + self.as_reader().unpack() + } + } + }; +} + +macro_rules! impl_conversion_for_option_pack { + ($original:ty, $entity:ident) => { + impl Pack for Option<$original> { + fn pack(&self) -> packed::$entity { + if let Some(ref inner) = self { + packed::$entity::new_unchecked(inner.pack().as_bytes()) + } else { + packed::$entity::default() + } + } + } + }; +} + +macro_rules! impl_conversion_for_vector_pack { + ($original:ty, $entity:ident) => { + impl Pack for [$original] { + fn pack(&self) -> packed::$entity { + packed::$entity::new_builder() + .set(self.iter().map(|v| v.pack()).collect()) + .build() + } + } + }; +} + +macro_rules! impl_conversion_for_vector_unpack { + ($original:ty, $entity:ident, $reader:ident) => { + impl<'r> Unpack> for packed::$reader<'r> { + fn unpack(&self) -> Vec<$original> { + self.iter().map(|x| x.unpack()).collect() + } + } + impl_conversion_for_entity_unpack!(Vec<$original>, $entity); + }; +} + +macro_rules! impl_conversion_for_vector { + ($original:ty, $entity:ident, $reader:ident) => { + impl_conversion_for_vector_pack!($original, $entity); + impl_conversion_for_vector_unpack!($original, $entity, $reader); + }; +} + +macro_rules! impl_conversion_for_packed_optional_pack { + ($original:ident, $entity:ident) => { + impl Pack for Option { + fn pack(&self) -> packed::$entity { + if let Some(ref inner) = self { + packed::$entity::new_unchecked(inner.as_bytes()) + } else { + packed::$entity::default() + } + } + } + }; +} + +macro_rules! impl_conversion_for_packed_iterator_pack { + ($item:ident, $vec:ident) => { + impl PackVec for T + where + T: IntoIterator, + { + fn pack(self) -> packed::$vec { + packed::$vec::new_builder().extend(self).build() + } + } + }; +} diff --git a/util/gen-types/src/core/mod.rs b/util/gen-types/src/core/mod.rs new file mode 100644 index 0000000000..85a22a17d7 --- /dev/null +++ b/util/gen-types/src/core/mod.rs @@ -0,0 +1,8 @@ +mod types; +#[cfg(feature = "calc-hash")] +mod view; + +pub use types::*; + +#[cfg(feature = "calc-hash")] +pub use view::*; diff --git a/util/gen-types/src/core/types.rs b/util/gen-types/src/core/types.rs new file mode 100644 index 0000000000..d74902f8e1 --- /dev/null +++ b/util/gen-types/src/core/types.rs @@ -0,0 +1,29 @@ +use crate::generated::packed; + +pub type BlockNumber = u64; + +/// Specifies how the script `code_hash` is used to match the script code and how to run the code. +#[derive(Clone, Copy, PartialEq, Eq)] +pub enum ScriptHashType { + /// Type "data" matches script code via cell data hash, and run the script code in v0 CKB VM. + Data = 0, + /// Type "type" matches script code via cell type script hash. + Type = 1, + /// Type "data1" matches script code via cell data hash, and run the script code in v1 CKB VM. + Data1 = 2, + /// Type "data2" matches script code via cell data hash, and run the script code in v2 CKB VM. + #[cfg(feature = "ckb2023")] + Data2 = 3, +} + +impl Into for ScriptHashType { + fn into(self) -> u8 { + self as u8 + } +} + +impl Into for ScriptHashType { + fn into(self) -> packed::Byte { + (self as u8).into() + } +} diff --git a/util/gen-types/src/core/view.rs b/util/gen-types/src/core/view.rs new file mode 100644 index 0000000000..d8d981c1d0 --- /dev/null +++ b/util/gen-types/src/core/view.rs @@ -0,0 +1,53 @@ +use crate::generated::packed; +use crate::hash::hash::new_blake2b; +use crate::prelude::*; +use molecule::prelude::*; + +/// A readonly and immutable struct which includes extra hash and the decoupled +/// parts of it. +#[derive(Debug, Clone)] +pub struct ExtraHashView { + /// The uncles hash which is used to combine to the extra hash. + pub(crate) uncles_hash: packed::Byte32, + /// The first item is the new field hash, which is used to combine to the extra hash. + /// The second item is the extra hash. + pub(crate) extension_hash_and_extra_hash: Option<(packed::Byte32, packed::Byte32)>, +} + +impl ExtraHashView { + /// Creates `ExtraHashView` with `uncles_hash` and optional `extension_hash`. + pub fn new(uncles_hash: packed::Byte32, extension_hash_opt: Option) -> Self { + let extension_hash_and_extra_hash = extension_hash_opt.map(|extension_hash| { + let mut ret = [0u8; 32]; + let mut blake2b = new_blake2b(); + blake2b.update(uncles_hash.as_slice()); + blake2b.update(extension_hash.as_slice()); + blake2b.finalize(&mut ret); + (extension_hash, ret.pack()) + }); + Self { + uncles_hash, + extension_hash_and_extra_hash, + } + } + + /// Gets `uncles_hash`. + pub fn uncles_hash(&self) -> packed::Byte32 { + self.uncles_hash.clone() + } + + /// Gets `extension_hash`. + pub fn extension_hash(&self) -> Option { + self.extension_hash_and_extra_hash + .as_ref() + .map(|(ref extension_hash, _)| extension_hash.clone()) + } + + /// Gets `extra_hash`. + pub fn extra_hash(&self) -> packed::Byte32 { + self.extension_hash_and_extra_hash + .as_ref() + .map(|(_, ref extra_hash)| extra_hash.clone()) + .unwrap_or_else(|| self.uncles_hash.clone()) + } +} diff --git a/util/gen-types/src/generated/blockchain.rs b/util/gen-types/src/generated/blockchain.rs new file mode 100644 index 0000000000..c7f33186fa --- /dev/null +++ b/util/gen-types/src/generated/blockchain.rs @@ -0,0 +1,8938 @@ +// Generated by Molecule 0.7.5 + +use molecule::prelude::*; +#[derive(Clone)] +pub struct Uint32(molecule::bytes::Bytes); +impl ::core::fmt::LowerHex for Uint32 { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + if f.alternate() { + write!(f, "0x")?; + } + write!(f, "{}", hex_string(self.as_slice())) + } +} +impl ::core::fmt::Debug for Uint32 { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{}({:#x})", Self::NAME, self) + } +} +impl ::core::fmt::Display for Uint32 { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + let raw_data = hex_string(&self.raw_data()); + write!(f, "{}(0x{})", Self::NAME, raw_data) + } +} +impl ::core::default::Default for Uint32 { + fn default() -> Self { + let v = molecule::bytes::Bytes::from_static(&Self::DEFAULT_VALUE); + Uint32::new_unchecked(v) + } +} +impl Uint32 { + const DEFAULT_VALUE: [u8; 4] = [0, 0, 0, 0]; + pub const TOTAL_SIZE: usize = 4; + pub const ITEM_SIZE: usize = 1; + pub const ITEM_COUNT: usize = 4; + pub fn nth0(&self) -> Byte { + Byte::new_unchecked(self.0.slice(0..1)) + } + pub fn nth1(&self) -> Byte { + Byte::new_unchecked(self.0.slice(1..2)) + } + pub fn nth2(&self) -> Byte { + Byte::new_unchecked(self.0.slice(2..3)) + } + pub fn nth3(&self) -> Byte { + Byte::new_unchecked(self.0.slice(3..4)) + } + pub fn raw_data(&self) -> molecule::bytes::Bytes { + self.as_bytes() + } + pub fn as_reader<'r>(&'r self) -> Uint32Reader<'r> { + Uint32Reader::new_unchecked(self.as_slice()) + } +} +impl molecule::prelude::Entity for Uint32 { + type Builder = Uint32Builder; + const NAME: &'static str = "Uint32"; + fn new_unchecked(data: molecule::bytes::Bytes) -> Self { + Uint32(data) + } + fn as_bytes(&self) -> molecule::bytes::Bytes { + self.0.clone() + } + fn as_slice(&self) -> &[u8] { + &self.0[..] + } + fn from_slice(slice: &[u8]) -> molecule::error::VerificationResult { + Uint32Reader::from_slice(slice).map(|reader| reader.to_entity()) + } + fn from_compatible_slice(slice: &[u8]) -> molecule::error::VerificationResult { + Uint32Reader::from_compatible_slice(slice).map(|reader| reader.to_entity()) + } + fn new_builder() -> Self::Builder { + ::core::default::Default::default() + } + fn as_builder(self) -> Self::Builder { + Self::new_builder().set([self.nth0(), self.nth1(), self.nth2(), self.nth3()]) + } +} +#[derive(Clone, Copy)] +pub struct Uint32Reader<'r>(&'r [u8]); +impl<'r> ::core::fmt::LowerHex for Uint32Reader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + if f.alternate() { + write!(f, "0x")?; + } + write!(f, "{}", hex_string(self.as_slice())) + } +} +impl<'r> ::core::fmt::Debug for Uint32Reader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{}({:#x})", Self::NAME, self) + } +} +impl<'r> ::core::fmt::Display for Uint32Reader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + let raw_data = hex_string(&self.raw_data()); + write!(f, "{}(0x{})", Self::NAME, raw_data) + } +} +impl<'r> Uint32Reader<'r> { + pub const TOTAL_SIZE: usize = 4; + pub const ITEM_SIZE: usize = 1; + pub const ITEM_COUNT: usize = 4; + pub fn nth0(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[0..1]) + } + pub fn nth1(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[1..2]) + } + pub fn nth2(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[2..3]) + } + pub fn nth3(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[3..4]) + } + pub fn raw_data(&self) -> &'r [u8] { + self.as_slice() + } +} +impl<'r> molecule::prelude::Reader<'r> for Uint32Reader<'r> { + type Entity = Uint32; + const NAME: &'static str = "Uint32Reader"; + fn to_entity(&self) -> Self::Entity { + Self::Entity::new_unchecked(self.as_slice().to_owned().into()) + } + fn new_unchecked(slice: &'r [u8]) -> Self { + Uint32Reader(slice) + } + fn as_slice(&self) -> &'r [u8] { + self.0 + } + fn verify(slice: &[u8], _compatible: bool) -> molecule::error::VerificationResult<()> { + use molecule::verification_error as ve; + let slice_len = slice.len(); + if slice_len != Self::TOTAL_SIZE { + return ve!(Self, TotalSizeNotMatch, Self::TOTAL_SIZE, slice_len); + } + Ok(()) + } +} +pub struct Uint32Builder(pub(crate) [Byte; 4]); +impl ::core::fmt::Debug for Uint32Builder { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{}({:?})", Self::NAME, &self.0[..]) + } +} +impl ::core::default::Default for Uint32Builder { + fn default() -> Self { + Uint32Builder([ + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + ]) + } +} +impl Uint32Builder { + pub const TOTAL_SIZE: usize = 4; + pub const ITEM_SIZE: usize = 1; + pub const ITEM_COUNT: usize = 4; + pub fn set(mut self, v: [Byte; 4]) -> Self { + self.0 = v; + self + } + pub fn nth0(mut self, v: Byte) -> Self { + self.0[0] = v; + self + } + pub fn nth1(mut self, v: Byte) -> Self { + self.0[1] = v; + self + } + pub fn nth2(mut self, v: Byte) -> Self { + self.0[2] = v; + self + } + pub fn nth3(mut self, v: Byte) -> Self { + self.0[3] = v; + self + } +} +impl molecule::prelude::Builder for Uint32Builder { + type Entity = Uint32; + const NAME: &'static str = "Uint32Builder"; + fn expected_length(&self) -> usize { + Self::TOTAL_SIZE + } + fn write(&self, writer: &mut W) -> molecule::io::Result<()> { + writer.write_all(self.0[0].as_slice())?; + writer.write_all(self.0[1].as_slice())?; + writer.write_all(self.0[2].as_slice())?; + writer.write_all(self.0[3].as_slice())?; + Ok(()) + } + fn build(&self) -> Self::Entity { + let mut inner = Vec::with_capacity(self.expected_length()); + self.write(&mut inner) + .unwrap_or_else(|_| panic!("{} build should be ok", Self::NAME)); + Uint32::new_unchecked(inner.into()) + } +} +#[derive(Clone)] +pub struct Uint64(molecule::bytes::Bytes); +impl ::core::fmt::LowerHex for Uint64 { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + if f.alternate() { + write!(f, "0x")?; + } + write!(f, "{}", hex_string(self.as_slice())) + } +} +impl ::core::fmt::Debug for Uint64 { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{}({:#x})", Self::NAME, self) + } +} +impl ::core::fmt::Display for Uint64 { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + let raw_data = hex_string(&self.raw_data()); + write!(f, "{}(0x{})", Self::NAME, raw_data) + } +} +impl ::core::default::Default for Uint64 { + fn default() -> Self { + let v = molecule::bytes::Bytes::from_static(&Self::DEFAULT_VALUE); + Uint64::new_unchecked(v) + } +} +impl Uint64 { + const DEFAULT_VALUE: [u8; 8] = [0, 0, 0, 0, 0, 0, 0, 0]; + pub const TOTAL_SIZE: usize = 8; + pub const ITEM_SIZE: usize = 1; + pub const ITEM_COUNT: usize = 8; + pub fn nth0(&self) -> Byte { + Byte::new_unchecked(self.0.slice(0..1)) + } + pub fn nth1(&self) -> Byte { + Byte::new_unchecked(self.0.slice(1..2)) + } + pub fn nth2(&self) -> Byte { + Byte::new_unchecked(self.0.slice(2..3)) + } + pub fn nth3(&self) -> Byte { + Byte::new_unchecked(self.0.slice(3..4)) + } + pub fn nth4(&self) -> Byte { + Byte::new_unchecked(self.0.slice(4..5)) + } + pub fn nth5(&self) -> Byte { + Byte::new_unchecked(self.0.slice(5..6)) + } + pub fn nth6(&self) -> Byte { + Byte::new_unchecked(self.0.slice(6..7)) + } + pub fn nth7(&self) -> Byte { + Byte::new_unchecked(self.0.slice(7..8)) + } + pub fn raw_data(&self) -> molecule::bytes::Bytes { + self.as_bytes() + } + pub fn as_reader<'r>(&'r self) -> Uint64Reader<'r> { + Uint64Reader::new_unchecked(self.as_slice()) + } +} +impl molecule::prelude::Entity for Uint64 { + type Builder = Uint64Builder; + const NAME: &'static str = "Uint64"; + fn new_unchecked(data: molecule::bytes::Bytes) -> Self { + Uint64(data) + } + fn as_bytes(&self) -> molecule::bytes::Bytes { + self.0.clone() + } + fn as_slice(&self) -> &[u8] { + &self.0[..] + } + fn from_slice(slice: &[u8]) -> molecule::error::VerificationResult { + Uint64Reader::from_slice(slice).map(|reader| reader.to_entity()) + } + fn from_compatible_slice(slice: &[u8]) -> molecule::error::VerificationResult { + Uint64Reader::from_compatible_slice(slice).map(|reader| reader.to_entity()) + } + fn new_builder() -> Self::Builder { + ::core::default::Default::default() + } + fn as_builder(self) -> Self::Builder { + Self::new_builder().set([ + self.nth0(), + self.nth1(), + self.nth2(), + self.nth3(), + self.nth4(), + self.nth5(), + self.nth6(), + self.nth7(), + ]) + } +} +#[derive(Clone, Copy)] +pub struct Uint64Reader<'r>(&'r [u8]); +impl<'r> ::core::fmt::LowerHex for Uint64Reader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + if f.alternate() { + write!(f, "0x")?; + } + write!(f, "{}", hex_string(self.as_slice())) + } +} +impl<'r> ::core::fmt::Debug for Uint64Reader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{}({:#x})", Self::NAME, self) + } +} +impl<'r> ::core::fmt::Display for Uint64Reader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + let raw_data = hex_string(&self.raw_data()); + write!(f, "{}(0x{})", Self::NAME, raw_data) + } +} +impl<'r> Uint64Reader<'r> { + pub const TOTAL_SIZE: usize = 8; + pub const ITEM_SIZE: usize = 1; + pub const ITEM_COUNT: usize = 8; + pub fn nth0(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[0..1]) + } + pub fn nth1(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[1..2]) + } + pub fn nth2(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[2..3]) + } + pub fn nth3(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[3..4]) + } + pub fn nth4(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[4..5]) + } + pub fn nth5(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[5..6]) + } + pub fn nth6(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[6..7]) + } + pub fn nth7(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[7..8]) + } + pub fn raw_data(&self) -> &'r [u8] { + self.as_slice() + } +} +impl<'r> molecule::prelude::Reader<'r> for Uint64Reader<'r> { + type Entity = Uint64; + const NAME: &'static str = "Uint64Reader"; + fn to_entity(&self) -> Self::Entity { + Self::Entity::new_unchecked(self.as_slice().to_owned().into()) + } + fn new_unchecked(slice: &'r [u8]) -> Self { + Uint64Reader(slice) + } + fn as_slice(&self) -> &'r [u8] { + self.0 + } + fn verify(slice: &[u8], _compatible: bool) -> molecule::error::VerificationResult<()> { + use molecule::verification_error as ve; + let slice_len = slice.len(); + if slice_len != Self::TOTAL_SIZE { + return ve!(Self, TotalSizeNotMatch, Self::TOTAL_SIZE, slice_len); + } + Ok(()) + } +} +pub struct Uint64Builder(pub(crate) [Byte; 8]); +impl ::core::fmt::Debug for Uint64Builder { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{}({:?})", Self::NAME, &self.0[..]) + } +} +impl ::core::default::Default for Uint64Builder { + fn default() -> Self { + Uint64Builder([ + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + ]) + } +} +impl Uint64Builder { + pub const TOTAL_SIZE: usize = 8; + pub const ITEM_SIZE: usize = 1; + pub const ITEM_COUNT: usize = 8; + pub fn set(mut self, v: [Byte; 8]) -> Self { + self.0 = v; + self + } + pub fn nth0(mut self, v: Byte) -> Self { + self.0[0] = v; + self + } + pub fn nth1(mut self, v: Byte) -> Self { + self.0[1] = v; + self + } + pub fn nth2(mut self, v: Byte) -> Self { + self.0[2] = v; + self + } + pub fn nth3(mut self, v: Byte) -> Self { + self.0[3] = v; + self + } + pub fn nth4(mut self, v: Byte) -> Self { + self.0[4] = v; + self + } + pub fn nth5(mut self, v: Byte) -> Self { + self.0[5] = v; + self + } + pub fn nth6(mut self, v: Byte) -> Self { + self.0[6] = v; + self + } + pub fn nth7(mut self, v: Byte) -> Self { + self.0[7] = v; + self + } +} +impl molecule::prelude::Builder for Uint64Builder { + type Entity = Uint64; + const NAME: &'static str = "Uint64Builder"; + fn expected_length(&self) -> usize { + Self::TOTAL_SIZE + } + fn write(&self, writer: &mut W) -> molecule::io::Result<()> { + writer.write_all(self.0[0].as_slice())?; + writer.write_all(self.0[1].as_slice())?; + writer.write_all(self.0[2].as_slice())?; + writer.write_all(self.0[3].as_slice())?; + writer.write_all(self.0[4].as_slice())?; + writer.write_all(self.0[5].as_slice())?; + writer.write_all(self.0[6].as_slice())?; + writer.write_all(self.0[7].as_slice())?; + Ok(()) + } + fn build(&self) -> Self::Entity { + let mut inner = Vec::with_capacity(self.expected_length()); + self.write(&mut inner) + .unwrap_or_else(|_| panic!("{} build should be ok", Self::NAME)); + Uint64::new_unchecked(inner.into()) + } +} +#[derive(Clone)] +pub struct Uint128(molecule::bytes::Bytes); +impl ::core::fmt::LowerHex for Uint128 { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + if f.alternate() { + write!(f, "0x")?; + } + write!(f, "{}", hex_string(self.as_slice())) + } +} +impl ::core::fmt::Debug for Uint128 { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{}({:#x})", Self::NAME, self) + } +} +impl ::core::fmt::Display for Uint128 { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + let raw_data = hex_string(&self.raw_data()); + write!(f, "{}(0x{})", Self::NAME, raw_data) + } +} +impl ::core::default::Default for Uint128 { + fn default() -> Self { + let v = molecule::bytes::Bytes::from_static(&Self::DEFAULT_VALUE); + Uint128::new_unchecked(v) + } +} +impl Uint128 { + const DEFAULT_VALUE: [u8; 16] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; + pub const TOTAL_SIZE: usize = 16; + pub const ITEM_SIZE: usize = 1; + pub const ITEM_COUNT: usize = 16; + pub fn nth0(&self) -> Byte { + Byte::new_unchecked(self.0.slice(0..1)) + } + pub fn nth1(&self) -> Byte { + Byte::new_unchecked(self.0.slice(1..2)) + } + pub fn nth2(&self) -> Byte { + Byte::new_unchecked(self.0.slice(2..3)) + } + pub fn nth3(&self) -> Byte { + Byte::new_unchecked(self.0.slice(3..4)) + } + pub fn nth4(&self) -> Byte { + Byte::new_unchecked(self.0.slice(4..5)) + } + pub fn nth5(&self) -> Byte { + Byte::new_unchecked(self.0.slice(5..6)) + } + pub fn nth6(&self) -> Byte { + Byte::new_unchecked(self.0.slice(6..7)) + } + pub fn nth7(&self) -> Byte { + Byte::new_unchecked(self.0.slice(7..8)) + } + pub fn nth8(&self) -> Byte { + Byte::new_unchecked(self.0.slice(8..9)) + } + pub fn nth9(&self) -> Byte { + Byte::new_unchecked(self.0.slice(9..10)) + } + pub fn nth10(&self) -> Byte { + Byte::new_unchecked(self.0.slice(10..11)) + } + pub fn nth11(&self) -> Byte { + Byte::new_unchecked(self.0.slice(11..12)) + } + pub fn nth12(&self) -> Byte { + Byte::new_unchecked(self.0.slice(12..13)) + } + pub fn nth13(&self) -> Byte { + Byte::new_unchecked(self.0.slice(13..14)) + } + pub fn nth14(&self) -> Byte { + Byte::new_unchecked(self.0.slice(14..15)) + } + pub fn nth15(&self) -> Byte { + Byte::new_unchecked(self.0.slice(15..16)) + } + pub fn raw_data(&self) -> molecule::bytes::Bytes { + self.as_bytes() + } + pub fn as_reader<'r>(&'r self) -> Uint128Reader<'r> { + Uint128Reader::new_unchecked(self.as_slice()) + } +} +impl molecule::prelude::Entity for Uint128 { + type Builder = Uint128Builder; + const NAME: &'static str = "Uint128"; + fn new_unchecked(data: molecule::bytes::Bytes) -> Self { + Uint128(data) + } + fn as_bytes(&self) -> molecule::bytes::Bytes { + self.0.clone() + } + fn as_slice(&self) -> &[u8] { + &self.0[..] + } + fn from_slice(slice: &[u8]) -> molecule::error::VerificationResult { + Uint128Reader::from_slice(slice).map(|reader| reader.to_entity()) + } + fn from_compatible_slice(slice: &[u8]) -> molecule::error::VerificationResult { + Uint128Reader::from_compatible_slice(slice).map(|reader| reader.to_entity()) + } + fn new_builder() -> Self::Builder { + ::core::default::Default::default() + } + fn as_builder(self) -> Self::Builder { + Self::new_builder().set([ + self.nth0(), + self.nth1(), + self.nth2(), + self.nth3(), + self.nth4(), + self.nth5(), + self.nth6(), + self.nth7(), + self.nth8(), + self.nth9(), + self.nth10(), + self.nth11(), + self.nth12(), + self.nth13(), + self.nth14(), + self.nth15(), + ]) + } +} +#[derive(Clone, Copy)] +pub struct Uint128Reader<'r>(&'r [u8]); +impl<'r> ::core::fmt::LowerHex for Uint128Reader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + if f.alternate() { + write!(f, "0x")?; + } + write!(f, "{}", hex_string(self.as_slice())) + } +} +impl<'r> ::core::fmt::Debug for Uint128Reader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{}({:#x})", Self::NAME, self) + } +} +impl<'r> ::core::fmt::Display for Uint128Reader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + let raw_data = hex_string(&self.raw_data()); + write!(f, "{}(0x{})", Self::NAME, raw_data) + } +} +impl<'r> Uint128Reader<'r> { + pub const TOTAL_SIZE: usize = 16; + pub const ITEM_SIZE: usize = 1; + pub const ITEM_COUNT: usize = 16; + pub fn nth0(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[0..1]) + } + pub fn nth1(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[1..2]) + } + pub fn nth2(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[2..3]) + } + pub fn nth3(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[3..4]) + } + pub fn nth4(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[4..5]) + } + pub fn nth5(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[5..6]) + } + pub fn nth6(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[6..7]) + } + pub fn nth7(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[7..8]) + } + pub fn nth8(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[8..9]) + } + pub fn nth9(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[9..10]) + } + pub fn nth10(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[10..11]) + } + pub fn nth11(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[11..12]) + } + pub fn nth12(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[12..13]) + } + pub fn nth13(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[13..14]) + } + pub fn nth14(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[14..15]) + } + pub fn nth15(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[15..16]) + } + pub fn raw_data(&self) -> &'r [u8] { + self.as_slice() + } +} +impl<'r> molecule::prelude::Reader<'r> for Uint128Reader<'r> { + type Entity = Uint128; + const NAME: &'static str = "Uint128Reader"; + fn to_entity(&self) -> Self::Entity { + Self::Entity::new_unchecked(self.as_slice().to_owned().into()) + } + fn new_unchecked(slice: &'r [u8]) -> Self { + Uint128Reader(slice) + } + fn as_slice(&self) -> &'r [u8] { + self.0 + } + fn verify(slice: &[u8], _compatible: bool) -> molecule::error::VerificationResult<()> { + use molecule::verification_error as ve; + let slice_len = slice.len(); + if slice_len != Self::TOTAL_SIZE { + return ve!(Self, TotalSizeNotMatch, Self::TOTAL_SIZE, slice_len); + } + Ok(()) + } +} +pub struct Uint128Builder(pub(crate) [Byte; 16]); +impl ::core::fmt::Debug for Uint128Builder { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{}({:?})", Self::NAME, &self.0[..]) + } +} +impl ::core::default::Default for Uint128Builder { + fn default() -> Self { + Uint128Builder([ + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + ]) + } +} +impl Uint128Builder { + pub const TOTAL_SIZE: usize = 16; + pub const ITEM_SIZE: usize = 1; + pub const ITEM_COUNT: usize = 16; + pub fn set(mut self, v: [Byte; 16]) -> Self { + self.0 = v; + self + } + pub fn nth0(mut self, v: Byte) -> Self { + self.0[0] = v; + self + } + pub fn nth1(mut self, v: Byte) -> Self { + self.0[1] = v; + self + } + pub fn nth2(mut self, v: Byte) -> Self { + self.0[2] = v; + self + } + pub fn nth3(mut self, v: Byte) -> Self { + self.0[3] = v; + self + } + pub fn nth4(mut self, v: Byte) -> Self { + self.0[4] = v; + self + } + pub fn nth5(mut self, v: Byte) -> Self { + self.0[5] = v; + self + } + pub fn nth6(mut self, v: Byte) -> Self { + self.0[6] = v; + self + } + pub fn nth7(mut self, v: Byte) -> Self { + self.0[7] = v; + self + } + pub fn nth8(mut self, v: Byte) -> Self { + self.0[8] = v; + self + } + pub fn nth9(mut self, v: Byte) -> Self { + self.0[9] = v; + self + } + pub fn nth10(mut self, v: Byte) -> Self { + self.0[10] = v; + self + } + pub fn nth11(mut self, v: Byte) -> Self { + self.0[11] = v; + self + } + pub fn nth12(mut self, v: Byte) -> Self { + self.0[12] = v; + self + } + pub fn nth13(mut self, v: Byte) -> Self { + self.0[13] = v; + self + } + pub fn nth14(mut self, v: Byte) -> Self { + self.0[14] = v; + self + } + pub fn nth15(mut self, v: Byte) -> Self { + self.0[15] = v; + self + } +} +impl molecule::prelude::Builder for Uint128Builder { + type Entity = Uint128; + const NAME: &'static str = "Uint128Builder"; + fn expected_length(&self) -> usize { + Self::TOTAL_SIZE + } + fn write(&self, writer: &mut W) -> molecule::io::Result<()> { + writer.write_all(self.0[0].as_slice())?; + writer.write_all(self.0[1].as_slice())?; + writer.write_all(self.0[2].as_slice())?; + writer.write_all(self.0[3].as_slice())?; + writer.write_all(self.0[4].as_slice())?; + writer.write_all(self.0[5].as_slice())?; + writer.write_all(self.0[6].as_slice())?; + writer.write_all(self.0[7].as_slice())?; + writer.write_all(self.0[8].as_slice())?; + writer.write_all(self.0[9].as_slice())?; + writer.write_all(self.0[10].as_slice())?; + writer.write_all(self.0[11].as_slice())?; + writer.write_all(self.0[12].as_slice())?; + writer.write_all(self.0[13].as_slice())?; + writer.write_all(self.0[14].as_slice())?; + writer.write_all(self.0[15].as_slice())?; + Ok(()) + } + fn build(&self) -> Self::Entity { + let mut inner = Vec::with_capacity(self.expected_length()); + self.write(&mut inner) + .unwrap_or_else(|_| panic!("{} build should be ok", Self::NAME)); + Uint128::new_unchecked(inner.into()) + } +} +#[derive(Clone)] +pub struct Byte32(molecule::bytes::Bytes); +impl ::core::fmt::LowerHex for Byte32 { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + if f.alternate() { + write!(f, "0x")?; + } + write!(f, "{}", hex_string(self.as_slice())) + } +} +impl ::core::fmt::Debug for Byte32 { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{}({:#x})", Self::NAME, self) + } +} +impl ::core::fmt::Display for Byte32 { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + let raw_data = hex_string(&self.raw_data()); + write!(f, "{}(0x{})", Self::NAME, raw_data) + } +} +impl ::core::default::Default for Byte32 { + fn default() -> Self { + let v = molecule::bytes::Bytes::from_static(&Self::DEFAULT_VALUE); + Byte32::new_unchecked(v) + } +} +impl Byte32 { + const DEFAULT_VALUE: [u8; 32] = [ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, + ]; + pub const TOTAL_SIZE: usize = 32; + pub const ITEM_SIZE: usize = 1; + pub const ITEM_COUNT: usize = 32; + pub fn nth0(&self) -> Byte { + Byte::new_unchecked(self.0.slice(0..1)) + } + pub fn nth1(&self) -> Byte { + Byte::new_unchecked(self.0.slice(1..2)) + } + pub fn nth2(&self) -> Byte { + Byte::new_unchecked(self.0.slice(2..3)) + } + pub fn nth3(&self) -> Byte { + Byte::new_unchecked(self.0.slice(3..4)) + } + pub fn nth4(&self) -> Byte { + Byte::new_unchecked(self.0.slice(4..5)) + } + pub fn nth5(&self) -> Byte { + Byte::new_unchecked(self.0.slice(5..6)) + } + pub fn nth6(&self) -> Byte { + Byte::new_unchecked(self.0.slice(6..7)) + } + pub fn nth7(&self) -> Byte { + Byte::new_unchecked(self.0.slice(7..8)) + } + pub fn nth8(&self) -> Byte { + Byte::new_unchecked(self.0.slice(8..9)) + } + pub fn nth9(&self) -> Byte { + Byte::new_unchecked(self.0.slice(9..10)) + } + pub fn nth10(&self) -> Byte { + Byte::new_unchecked(self.0.slice(10..11)) + } + pub fn nth11(&self) -> Byte { + Byte::new_unchecked(self.0.slice(11..12)) + } + pub fn nth12(&self) -> Byte { + Byte::new_unchecked(self.0.slice(12..13)) + } + pub fn nth13(&self) -> Byte { + Byte::new_unchecked(self.0.slice(13..14)) + } + pub fn nth14(&self) -> Byte { + Byte::new_unchecked(self.0.slice(14..15)) + } + pub fn nth15(&self) -> Byte { + Byte::new_unchecked(self.0.slice(15..16)) + } + pub fn nth16(&self) -> Byte { + Byte::new_unchecked(self.0.slice(16..17)) + } + pub fn nth17(&self) -> Byte { + Byte::new_unchecked(self.0.slice(17..18)) + } + pub fn nth18(&self) -> Byte { + Byte::new_unchecked(self.0.slice(18..19)) + } + pub fn nth19(&self) -> Byte { + Byte::new_unchecked(self.0.slice(19..20)) + } + pub fn nth20(&self) -> Byte { + Byte::new_unchecked(self.0.slice(20..21)) + } + pub fn nth21(&self) -> Byte { + Byte::new_unchecked(self.0.slice(21..22)) + } + pub fn nth22(&self) -> Byte { + Byte::new_unchecked(self.0.slice(22..23)) + } + pub fn nth23(&self) -> Byte { + Byte::new_unchecked(self.0.slice(23..24)) + } + pub fn nth24(&self) -> Byte { + Byte::new_unchecked(self.0.slice(24..25)) + } + pub fn nth25(&self) -> Byte { + Byte::new_unchecked(self.0.slice(25..26)) + } + pub fn nth26(&self) -> Byte { + Byte::new_unchecked(self.0.slice(26..27)) + } + pub fn nth27(&self) -> Byte { + Byte::new_unchecked(self.0.slice(27..28)) + } + pub fn nth28(&self) -> Byte { + Byte::new_unchecked(self.0.slice(28..29)) + } + pub fn nth29(&self) -> Byte { + Byte::new_unchecked(self.0.slice(29..30)) + } + pub fn nth30(&self) -> Byte { + Byte::new_unchecked(self.0.slice(30..31)) + } + pub fn nth31(&self) -> Byte { + Byte::new_unchecked(self.0.slice(31..32)) + } + pub fn raw_data(&self) -> molecule::bytes::Bytes { + self.as_bytes() + } + pub fn as_reader<'r>(&'r self) -> Byte32Reader<'r> { + Byte32Reader::new_unchecked(self.as_slice()) + } +} +impl molecule::prelude::Entity for Byte32 { + type Builder = Byte32Builder; + const NAME: &'static str = "Byte32"; + fn new_unchecked(data: molecule::bytes::Bytes) -> Self { + Byte32(data) + } + fn as_bytes(&self) -> molecule::bytes::Bytes { + self.0.clone() + } + fn as_slice(&self) -> &[u8] { + &self.0[..] + } + fn from_slice(slice: &[u8]) -> molecule::error::VerificationResult { + Byte32Reader::from_slice(slice).map(|reader| reader.to_entity()) + } + fn from_compatible_slice(slice: &[u8]) -> molecule::error::VerificationResult { + Byte32Reader::from_compatible_slice(slice).map(|reader| reader.to_entity()) + } + fn new_builder() -> Self::Builder { + ::core::default::Default::default() + } + fn as_builder(self) -> Self::Builder { + Self::new_builder().set([ + self.nth0(), + self.nth1(), + self.nth2(), + self.nth3(), + self.nth4(), + self.nth5(), + self.nth6(), + self.nth7(), + self.nth8(), + self.nth9(), + self.nth10(), + self.nth11(), + self.nth12(), + self.nth13(), + self.nth14(), + self.nth15(), + self.nth16(), + self.nth17(), + self.nth18(), + self.nth19(), + self.nth20(), + self.nth21(), + self.nth22(), + self.nth23(), + self.nth24(), + self.nth25(), + self.nth26(), + self.nth27(), + self.nth28(), + self.nth29(), + self.nth30(), + self.nth31(), + ]) + } +} +#[derive(Clone, Copy)] +pub struct Byte32Reader<'r>(&'r [u8]); +impl<'r> ::core::fmt::LowerHex for Byte32Reader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + if f.alternate() { + write!(f, "0x")?; + } + write!(f, "{}", hex_string(self.as_slice())) + } +} +impl<'r> ::core::fmt::Debug for Byte32Reader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{}({:#x})", Self::NAME, self) + } +} +impl<'r> ::core::fmt::Display for Byte32Reader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + let raw_data = hex_string(&self.raw_data()); + write!(f, "{}(0x{})", Self::NAME, raw_data) + } +} +impl<'r> Byte32Reader<'r> { + pub const TOTAL_SIZE: usize = 32; + pub const ITEM_SIZE: usize = 1; + pub const ITEM_COUNT: usize = 32; + pub fn nth0(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[0..1]) + } + pub fn nth1(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[1..2]) + } + pub fn nth2(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[2..3]) + } + pub fn nth3(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[3..4]) + } + pub fn nth4(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[4..5]) + } + pub fn nth5(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[5..6]) + } + pub fn nth6(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[6..7]) + } + pub fn nth7(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[7..8]) + } + pub fn nth8(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[8..9]) + } + pub fn nth9(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[9..10]) + } + pub fn nth10(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[10..11]) + } + pub fn nth11(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[11..12]) + } + pub fn nth12(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[12..13]) + } + pub fn nth13(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[13..14]) + } + pub fn nth14(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[14..15]) + } + pub fn nth15(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[15..16]) + } + pub fn nth16(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[16..17]) + } + pub fn nth17(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[17..18]) + } + pub fn nth18(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[18..19]) + } + pub fn nth19(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[19..20]) + } + pub fn nth20(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[20..21]) + } + pub fn nth21(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[21..22]) + } + pub fn nth22(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[22..23]) + } + pub fn nth23(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[23..24]) + } + pub fn nth24(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[24..25]) + } + pub fn nth25(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[25..26]) + } + pub fn nth26(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[26..27]) + } + pub fn nth27(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[27..28]) + } + pub fn nth28(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[28..29]) + } + pub fn nth29(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[29..30]) + } + pub fn nth30(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[30..31]) + } + pub fn nth31(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[31..32]) + } + pub fn raw_data(&self) -> &'r [u8] { + self.as_slice() + } +} +impl<'r> molecule::prelude::Reader<'r> for Byte32Reader<'r> { + type Entity = Byte32; + const NAME: &'static str = "Byte32Reader"; + fn to_entity(&self) -> Self::Entity { + Self::Entity::new_unchecked(self.as_slice().to_owned().into()) + } + fn new_unchecked(slice: &'r [u8]) -> Self { + Byte32Reader(slice) + } + fn as_slice(&self) -> &'r [u8] { + self.0 + } + fn verify(slice: &[u8], _compatible: bool) -> molecule::error::VerificationResult<()> { + use molecule::verification_error as ve; + let slice_len = slice.len(); + if slice_len != Self::TOTAL_SIZE { + return ve!(Self, TotalSizeNotMatch, Self::TOTAL_SIZE, slice_len); + } + Ok(()) + } +} +pub struct Byte32Builder(pub(crate) [Byte; 32]); +impl ::core::fmt::Debug for Byte32Builder { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{}({:?})", Self::NAME, &self.0[..]) + } +} +impl ::core::default::Default for Byte32Builder { + fn default() -> Self { + Byte32Builder([ + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + ]) + } +} +impl Byte32Builder { + pub const TOTAL_SIZE: usize = 32; + pub const ITEM_SIZE: usize = 1; + pub const ITEM_COUNT: usize = 32; + pub fn set(mut self, v: [Byte; 32]) -> Self { + self.0 = v; + self + } + pub fn nth0(mut self, v: Byte) -> Self { + self.0[0] = v; + self + } + pub fn nth1(mut self, v: Byte) -> Self { + self.0[1] = v; + self + } + pub fn nth2(mut self, v: Byte) -> Self { + self.0[2] = v; + self + } + pub fn nth3(mut self, v: Byte) -> Self { + self.0[3] = v; + self + } + pub fn nth4(mut self, v: Byte) -> Self { + self.0[4] = v; + self + } + pub fn nth5(mut self, v: Byte) -> Self { + self.0[5] = v; + self + } + pub fn nth6(mut self, v: Byte) -> Self { + self.0[6] = v; + self + } + pub fn nth7(mut self, v: Byte) -> Self { + self.0[7] = v; + self + } + pub fn nth8(mut self, v: Byte) -> Self { + self.0[8] = v; + self + } + pub fn nth9(mut self, v: Byte) -> Self { + self.0[9] = v; + self + } + pub fn nth10(mut self, v: Byte) -> Self { + self.0[10] = v; + self + } + pub fn nth11(mut self, v: Byte) -> Self { + self.0[11] = v; + self + } + pub fn nth12(mut self, v: Byte) -> Self { + self.0[12] = v; + self + } + pub fn nth13(mut self, v: Byte) -> Self { + self.0[13] = v; + self + } + pub fn nth14(mut self, v: Byte) -> Self { + self.0[14] = v; + self + } + pub fn nth15(mut self, v: Byte) -> Self { + self.0[15] = v; + self + } + pub fn nth16(mut self, v: Byte) -> Self { + self.0[16] = v; + self + } + pub fn nth17(mut self, v: Byte) -> Self { + self.0[17] = v; + self + } + pub fn nth18(mut self, v: Byte) -> Self { + self.0[18] = v; + self + } + pub fn nth19(mut self, v: Byte) -> Self { + self.0[19] = v; + self + } + pub fn nth20(mut self, v: Byte) -> Self { + self.0[20] = v; + self + } + pub fn nth21(mut self, v: Byte) -> Self { + self.0[21] = v; + self + } + pub fn nth22(mut self, v: Byte) -> Self { + self.0[22] = v; + self + } + pub fn nth23(mut self, v: Byte) -> Self { + self.0[23] = v; + self + } + pub fn nth24(mut self, v: Byte) -> Self { + self.0[24] = v; + self + } + pub fn nth25(mut self, v: Byte) -> Self { + self.0[25] = v; + self + } + pub fn nth26(mut self, v: Byte) -> Self { + self.0[26] = v; + self + } + pub fn nth27(mut self, v: Byte) -> Self { + self.0[27] = v; + self + } + pub fn nth28(mut self, v: Byte) -> Self { + self.0[28] = v; + self + } + pub fn nth29(mut self, v: Byte) -> Self { + self.0[29] = v; + self + } + pub fn nth30(mut self, v: Byte) -> Self { + self.0[30] = v; + self + } + pub fn nth31(mut self, v: Byte) -> Self { + self.0[31] = v; + self + } +} +impl molecule::prelude::Builder for Byte32Builder { + type Entity = Byte32; + const NAME: &'static str = "Byte32Builder"; + fn expected_length(&self) -> usize { + Self::TOTAL_SIZE + } + fn write(&self, writer: &mut W) -> molecule::io::Result<()> { + writer.write_all(self.0[0].as_slice())?; + writer.write_all(self.0[1].as_slice())?; + writer.write_all(self.0[2].as_slice())?; + writer.write_all(self.0[3].as_slice())?; + writer.write_all(self.0[4].as_slice())?; + writer.write_all(self.0[5].as_slice())?; + writer.write_all(self.0[6].as_slice())?; + writer.write_all(self.0[7].as_slice())?; + writer.write_all(self.0[8].as_slice())?; + writer.write_all(self.0[9].as_slice())?; + writer.write_all(self.0[10].as_slice())?; + writer.write_all(self.0[11].as_slice())?; + writer.write_all(self.0[12].as_slice())?; + writer.write_all(self.0[13].as_slice())?; + writer.write_all(self.0[14].as_slice())?; + writer.write_all(self.0[15].as_slice())?; + writer.write_all(self.0[16].as_slice())?; + writer.write_all(self.0[17].as_slice())?; + writer.write_all(self.0[18].as_slice())?; + writer.write_all(self.0[19].as_slice())?; + writer.write_all(self.0[20].as_slice())?; + writer.write_all(self.0[21].as_slice())?; + writer.write_all(self.0[22].as_slice())?; + writer.write_all(self.0[23].as_slice())?; + writer.write_all(self.0[24].as_slice())?; + writer.write_all(self.0[25].as_slice())?; + writer.write_all(self.0[26].as_slice())?; + writer.write_all(self.0[27].as_slice())?; + writer.write_all(self.0[28].as_slice())?; + writer.write_all(self.0[29].as_slice())?; + writer.write_all(self.0[30].as_slice())?; + writer.write_all(self.0[31].as_slice())?; + Ok(()) + } + fn build(&self) -> Self::Entity { + let mut inner = Vec::with_capacity(self.expected_length()); + self.write(&mut inner) + .unwrap_or_else(|_| panic!("{} build should be ok", Self::NAME)); + Byte32::new_unchecked(inner.into()) + } +} +#[derive(Clone)] +pub struct Uint256(molecule::bytes::Bytes); +impl ::core::fmt::LowerHex for Uint256 { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + if f.alternate() { + write!(f, "0x")?; + } + write!(f, "{}", hex_string(self.as_slice())) + } +} +impl ::core::fmt::Debug for Uint256 { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{}({:#x})", Self::NAME, self) + } +} +impl ::core::fmt::Display for Uint256 { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + let raw_data = hex_string(&self.raw_data()); + write!(f, "{}(0x{})", Self::NAME, raw_data) + } +} +impl ::core::default::Default for Uint256 { + fn default() -> Self { + let v = molecule::bytes::Bytes::from_static(&Self::DEFAULT_VALUE); + Uint256::new_unchecked(v) + } +} +impl Uint256 { + const DEFAULT_VALUE: [u8; 32] = [ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, + ]; + pub const TOTAL_SIZE: usize = 32; + pub const ITEM_SIZE: usize = 1; + pub const ITEM_COUNT: usize = 32; + pub fn nth0(&self) -> Byte { + Byte::new_unchecked(self.0.slice(0..1)) + } + pub fn nth1(&self) -> Byte { + Byte::new_unchecked(self.0.slice(1..2)) + } + pub fn nth2(&self) -> Byte { + Byte::new_unchecked(self.0.slice(2..3)) + } + pub fn nth3(&self) -> Byte { + Byte::new_unchecked(self.0.slice(3..4)) + } + pub fn nth4(&self) -> Byte { + Byte::new_unchecked(self.0.slice(4..5)) + } + pub fn nth5(&self) -> Byte { + Byte::new_unchecked(self.0.slice(5..6)) + } + pub fn nth6(&self) -> Byte { + Byte::new_unchecked(self.0.slice(6..7)) + } + pub fn nth7(&self) -> Byte { + Byte::new_unchecked(self.0.slice(7..8)) + } + pub fn nth8(&self) -> Byte { + Byte::new_unchecked(self.0.slice(8..9)) + } + pub fn nth9(&self) -> Byte { + Byte::new_unchecked(self.0.slice(9..10)) + } + pub fn nth10(&self) -> Byte { + Byte::new_unchecked(self.0.slice(10..11)) + } + pub fn nth11(&self) -> Byte { + Byte::new_unchecked(self.0.slice(11..12)) + } + pub fn nth12(&self) -> Byte { + Byte::new_unchecked(self.0.slice(12..13)) + } + pub fn nth13(&self) -> Byte { + Byte::new_unchecked(self.0.slice(13..14)) + } + pub fn nth14(&self) -> Byte { + Byte::new_unchecked(self.0.slice(14..15)) + } + pub fn nth15(&self) -> Byte { + Byte::new_unchecked(self.0.slice(15..16)) + } + pub fn nth16(&self) -> Byte { + Byte::new_unchecked(self.0.slice(16..17)) + } + pub fn nth17(&self) -> Byte { + Byte::new_unchecked(self.0.slice(17..18)) + } + pub fn nth18(&self) -> Byte { + Byte::new_unchecked(self.0.slice(18..19)) + } + pub fn nth19(&self) -> Byte { + Byte::new_unchecked(self.0.slice(19..20)) + } + pub fn nth20(&self) -> Byte { + Byte::new_unchecked(self.0.slice(20..21)) + } + pub fn nth21(&self) -> Byte { + Byte::new_unchecked(self.0.slice(21..22)) + } + pub fn nth22(&self) -> Byte { + Byte::new_unchecked(self.0.slice(22..23)) + } + pub fn nth23(&self) -> Byte { + Byte::new_unchecked(self.0.slice(23..24)) + } + pub fn nth24(&self) -> Byte { + Byte::new_unchecked(self.0.slice(24..25)) + } + pub fn nth25(&self) -> Byte { + Byte::new_unchecked(self.0.slice(25..26)) + } + pub fn nth26(&self) -> Byte { + Byte::new_unchecked(self.0.slice(26..27)) + } + pub fn nth27(&self) -> Byte { + Byte::new_unchecked(self.0.slice(27..28)) + } + pub fn nth28(&self) -> Byte { + Byte::new_unchecked(self.0.slice(28..29)) + } + pub fn nth29(&self) -> Byte { + Byte::new_unchecked(self.0.slice(29..30)) + } + pub fn nth30(&self) -> Byte { + Byte::new_unchecked(self.0.slice(30..31)) + } + pub fn nth31(&self) -> Byte { + Byte::new_unchecked(self.0.slice(31..32)) + } + pub fn raw_data(&self) -> molecule::bytes::Bytes { + self.as_bytes() + } + pub fn as_reader<'r>(&'r self) -> Uint256Reader<'r> { + Uint256Reader::new_unchecked(self.as_slice()) + } +} +impl molecule::prelude::Entity for Uint256 { + type Builder = Uint256Builder; + const NAME: &'static str = "Uint256"; + fn new_unchecked(data: molecule::bytes::Bytes) -> Self { + Uint256(data) + } + fn as_bytes(&self) -> molecule::bytes::Bytes { + self.0.clone() + } + fn as_slice(&self) -> &[u8] { + &self.0[..] + } + fn from_slice(slice: &[u8]) -> molecule::error::VerificationResult { + Uint256Reader::from_slice(slice).map(|reader| reader.to_entity()) + } + fn from_compatible_slice(slice: &[u8]) -> molecule::error::VerificationResult { + Uint256Reader::from_compatible_slice(slice).map(|reader| reader.to_entity()) + } + fn new_builder() -> Self::Builder { + ::core::default::Default::default() + } + fn as_builder(self) -> Self::Builder { + Self::new_builder().set([ + self.nth0(), + self.nth1(), + self.nth2(), + self.nth3(), + self.nth4(), + self.nth5(), + self.nth6(), + self.nth7(), + self.nth8(), + self.nth9(), + self.nth10(), + self.nth11(), + self.nth12(), + self.nth13(), + self.nth14(), + self.nth15(), + self.nth16(), + self.nth17(), + self.nth18(), + self.nth19(), + self.nth20(), + self.nth21(), + self.nth22(), + self.nth23(), + self.nth24(), + self.nth25(), + self.nth26(), + self.nth27(), + self.nth28(), + self.nth29(), + self.nth30(), + self.nth31(), + ]) + } +} +#[derive(Clone, Copy)] +pub struct Uint256Reader<'r>(&'r [u8]); +impl<'r> ::core::fmt::LowerHex for Uint256Reader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + if f.alternate() { + write!(f, "0x")?; + } + write!(f, "{}", hex_string(self.as_slice())) + } +} +impl<'r> ::core::fmt::Debug for Uint256Reader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{}({:#x})", Self::NAME, self) + } +} +impl<'r> ::core::fmt::Display for Uint256Reader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + let raw_data = hex_string(&self.raw_data()); + write!(f, "{}(0x{})", Self::NAME, raw_data) + } +} +impl<'r> Uint256Reader<'r> { + pub const TOTAL_SIZE: usize = 32; + pub const ITEM_SIZE: usize = 1; + pub const ITEM_COUNT: usize = 32; + pub fn nth0(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[0..1]) + } + pub fn nth1(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[1..2]) + } + pub fn nth2(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[2..3]) + } + pub fn nth3(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[3..4]) + } + pub fn nth4(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[4..5]) + } + pub fn nth5(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[5..6]) + } + pub fn nth6(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[6..7]) + } + pub fn nth7(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[7..8]) + } + pub fn nth8(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[8..9]) + } + pub fn nth9(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[9..10]) + } + pub fn nth10(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[10..11]) + } + pub fn nth11(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[11..12]) + } + pub fn nth12(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[12..13]) + } + pub fn nth13(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[13..14]) + } + pub fn nth14(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[14..15]) + } + pub fn nth15(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[15..16]) + } + pub fn nth16(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[16..17]) + } + pub fn nth17(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[17..18]) + } + pub fn nth18(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[18..19]) + } + pub fn nth19(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[19..20]) + } + pub fn nth20(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[20..21]) + } + pub fn nth21(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[21..22]) + } + pub fn nth22(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[22..23]) + } + pub fn nth23(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[23..24]) + } + pub fn nth24(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[24..25]) + } + pub fn nth25(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[25..26]) + } + pub fn nth26(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[26..27]) + } + pub fn nth27(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[27..28]) + } + pub fn nth28(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[28..29]) + } + pub fn nth29(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[29..30]) + } + pub fn nth30(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[30..31]) + } + pub fn nth31(&self) -> ByteReader<'r> { + ByteReader::new_unchecked(&self.as_slice()[31..32]) + } + pub fn raw_data(&self) -> &'r [u8] { + self.as_slice() + } +} +impl<'r> molecule::prelude::Reader<'r> for Uint256Reader<'r> { + type Entity = Uint256; + const NAME: &'static str = "Uint256Reader"; + fn to_entity(&self) -> Self::Entity { + Self::Entity::new_unchecked(self.as_slice().to_owned().into()) + } + fn new_unchecked(slice: &'r [u8]) -> Self { + Uint256Reader(slice) + } + fn as_slice(&self) -> &'r [u8] { + self.0 + } + fn verify(slice: &[u8], _compatible: bool) -> molecule::error::VerificationResult<()> { + use molecule::verification_error as ve; + let slice_len = slice.len(); + if slice_len != Self::TOTAL_SIZE { + return ve!(Self, TotalSizeNotMatch, Self::TOTAL_SIZE, slice_len); + } + Ok(()) + } +} +pub struct Uint256Builder(pub(crate) [Byte; 32]); +impl ::core::fmt::Debug for Uint256Builder { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{}({:?})", Self::NAME, &self.0[..]) + } +} +impl ::core::default::Default for Uint256Builder { + fn default() -> Self { + Uint256Builder([ + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + Byte::default(), + ]) + } +} +impl Uint256Builder { + pub const TOTAL_SIZE: usize = 32; + pub const ITEM_SIZE: usize = 1; + pub const ITEM_COUNT: usize = 32; + pub fn set(mut self, v: [Byte; 32]) -> Self { + self.0 = v; + self + } + pub fn nth0(mut self, v: Byte) -> Self { + self.0[0] = v; + self + } + pub fn nth1(mut self, v: Byte) -> Self { + self.0[1] = v; + self + } + pub fn nth2(mut self, v: Byte) -> Self { + self.0[2] = v; + self + } + pub fn nth3(mut self, v: Byte) -> Self { + self.0[3] = v; + self + } + pub fn nth4(mut self, v: Byte) -> Self { + self.0[4] = v; + self + } + pub fn nth5(mut self, v: Byte) -> Self { + self.0[5] = v; + self + } + pub fn nth6(mut self, v: Byte) -> Self { + self.0[6] = v; + self + } + pub fn nth7(mut self, v: Byte) -> Self { + self.0[7] = v; + self + } + pub fn nth8(mut self, v: Byte) -> Self { + self.0[8] = v; + self + } + pub fn nth9(mut self, v: Byte) -> Self { + self.0[9] = v; + self + } + pub fn nth10(mut self, v: Byte) -> Self { + self.0[10] = v; + self + } + pub fn nth11(mut self, v: Byte) -> Self { + self.0[11] = v; + self + } + pub fn nth12(mut self, v: Byte) -> Self { + self.0[12] = v; + self + } + pub fn nth13(mut self, v: Byte) -> Self { + self.0[13] = v; + self + } + pub fn nth14(mut self, v: Byte) -> Self { + self.0[14] = v; + self + } + pub fn nth15(mut self, v: Byte) -> Self { + self.0[15] = v; + self + } + pub fn nth16(mut self, v: Byte) -> Self { + self.0[16] = v; + self + } + pub fn nth17(mut self, v: Byte) -> Self { + self.0[17] = v; + self + } + pub fn nth18(mut self, v: Byte) -> Self { + self.0[18] = v; + self + } + pub fn nth19(mut self, v: Byte) -> Self { + self.0[19] = v; + self + } + pub fn nth20(mut self, v: Byte) -> Self { + self.0[20] = v; + self + } + pub fn nth21(mut self, v: Byte) -> Self { + self.0[21] = v; + self + } + pub fn nth22(mut self, v: Byte) -> Self { + self.0[22] = v; + self + } + pub fn nth23(mut self, v: Byte) -> Self { + self.0[23] = v; + self + } + pub fn nth24(mut self, v: Byte) -> Self { + self.0[24] = v; + self + } + pub fn nth25(mut self, v: Byte) -> Self { + self.0[25] = v; + self + } + pub fn nth26(mut self, v: Byte) -> Self { + self.0[26] = v; + self + } + pub fn nth27(mut self, v: Byte) -> Self { + self.0[27] = v; + self + } + pub fn nth28(mut self, v: Byte) -> Self { + self.0[28] = v; + self + } + pub fn nth29(mut self, v: Byte) -> Self { + self.0[29] = v; + self + } + pub fn nth30(mut self, v: Byte) -> Self { + self.0[30] = v; + self + } + pub fn nth31(mut self, v: Byte) -> Self { + self.0[31] = v; + self + } +} +impl molecule::prelude::Builder for Uint256Builder { + type Entity = Uint256; + const NAME: &'static str = "Uint256Builder"; + fn expected_length(&self) -> usize { + Self::TOTAL_SIZE + } + fn write(&self, writer: &mut W) -> molecule::io::Result<()> { + writer.write_all(self.0[0].as_slice())?; + writer.write_all(self.0[1].as_slice())?; + writer.write_all(self.0[2].as_slice())?; + writer.write_all(self.0[3].as_slice())?; + writer.write_all(self.0[4].as_slice())?; + writer.write_all(self.0[5].as_slice())?; + writer.write_all(self.0[6].as_slice())?; + writer.write_all(self.0[7].as_slice())?; + writer.write_all(self.0[8].as_slice())?; + writer.write_all(self.0[9].as_slice())?; + writer.write_all(self.0[10].as_slice())?; + writer.write_all(self.0[11].as_slice())?; + writer.write_all(self.0[12].as_slice())?; + writer.write_all(self.0[13].as_slice())?; + writer.write_all(self.0[14].as_slice())?; + writer.write_all(self.0[15].as_slice())?; + writer.write_all(self.0[16].as_slice())?; + writer.write_all(self.0[17].as_slice())?; + writer.write_all(self.0[18].as_slice())?; + writer.write_all(self.0[19].as_slice())?; + writer.write_all(self.0[20].as_slice())?; + writer.write_all(self.0[21].as_slice())?; + writer.write_all(self.0[22].as_slice())?; + writer.write_all(self.0[23].as_slice())?; + writer.write_all(self.0[24].as_slice())?; + writer.write_all(self.0[25].as_slice())?; + writer.write_all(self.0[26].as_slice())?; + writer.write_all(self.0[27].as_slice())?; + writer.write_all(self.0[28].as_slice())?; + writer.write_all(self.0[29].as_slice())?; + writer.write_all(self.0[30].as_slice())?; + writer.write_all(self.0[31].as_slice())?; + Ok(()) + } + fn build(&self) -> Self::Entity { + let mut inner = Vec::with_capacity(self.expected_length()); + self.write(&mut inner) + .unwrap_or_else(|_| panic!("{} build should be ok", Self::NAME)); + Uint256::new_unchecked(inner.into()) + } +} +#[derive(Clone)] +pub struct Bytes(molecule::bytes::Bytes); +impl ::core::fmt::LowerHex for Bytes { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + if f.alternate() { + write!(f, "0x")?; + } + write!(f, "{}", hex_string(self.as_slice())) + } +} +impl ::core::fmt::Debug for Bytes { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{}({:#x})", Self::NAME, self) + } +} +impl ::core::fmt::Display for Bytes { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + let raw_data = hex_string(&self.raw_data()); + write!(f, "{}(0x{})", Self::NAME, raw_data) + } +} +impl ::core::default::Default for Bytes { + fn default() -> Self { + let v = molecule::bytes::Bytes::from_static(&Self::DEFAULT_VALUE); + Bytes::new_unchecked(v) + } +} +impl Bytes { + const DEFAULT_VALUE: [u8; 4] = [0, 0, 0, 0]; + pub const ITEM_SIZE: usize = 1; + pub fn total_size(&self) -> usize { + molecule::NUMBER_SIZE + Self::ITEM_SIZE * self.item_count() + } + pub fn item_count(&self) -> usize { + molecule::unpack_number(self.as_slice()) as usize + } + pub fn len(&self) -> usize { + self.item_count() + } + pub fn is_empty(&self) -> bool { + self.len() == 0 + } + pub fn get(&self, idx: usize) -> Option { + if idx >= self.len() { + None + } else { + Some(self.get_unchecked(idx)) + } + } + pub fn get_unchecked(&self, idx: usize) -> Byte { + let start = molecule::NUMBER_SIZE + Self::ITEM_SIZE * idx; + let end = start + Self::ITEM_SIZE; + Byte::new_unchecked(self.0.slice(start..end)) + } + pub fn raw_data(&self) -> molecule::bytes::Bytes { + self.0.slice(molecule::NUMBER_SIZE..) + } + pub fn as_reader<'r>(&'r self) -> BytesReader<'r> { + BytesReader::new_unchecked(self.as_slice()) + } +} +impl molecule::prelude::Entity for Bytes { + type Builder = BytesBuilder; + const NAME: &'static str = "Bytes"; + fn new_unchecked(data: molecule::bytes::Bytes) -> Self { + Bytes(data) + } + fn as_bytes(&self) -> molecule::bytes::Bytes { + self.0.clone() + } + fn as_slice(&self) -> &[u8] { + &self.0[..] + } + fn from_slice(slice: &[u8]) -> molecule::error::VerificationResult { + BytesReader::from_slice(slice).map(|reader| reader.to_entity()) + } + fn from_compatible_slice(slice: &[u8]) -> molecule::error::VerificationResult { + BytesReader::from_compatible_slice(slice).map(|reader| reader.to_entity()) + } + fn new_builder() -> Self::Builder { + ::core::default::Default::default() + } + fn as_builder(self) -> Self::Builder { + Self::new_builder().extend(self.into_iter()) + } +} +#[derive(Clone, Copy)] +pub struct BytesReader<'r>(&'r [u8]); +impl<'r> ::core::fmt::LowerHex for BytesReader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + if f.alternate() { + write!(f, "0x")?; + } + write!(f, "{}", hex_string(self.as_slice())) + } +} +impl<'r> ::core::fmt::Debug for BytesReader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{}({:#x})", Self::NAME, self) + } +} +impl<'r> ::core::fmt::Display for BytesReader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + let raw_data = hex_string(&self.raw_data()); + write!(f, "{}(0x{})", Self::NAME, raw_data) + } +} +impl<'r> BytesReader<'r> { + pub const ITEM_SIZE: usize = 1; + pub fn total_size(&self) -> usize { + molecule::NUMBER_SIZE + Self::ITEM_SIZE * self.item_count() + } + pub fn item_count(&self) -> usize { + molecule::unpack_number(self.as_slice()) as usize + } + pub fn len(&self) -> usize { + self.item_count() + } + pub fn is_empty(&self) -> bool { + self.len() == 0 + } + pub fn get(&self, idx: usize) -> Option> { + if idx >= self.len() { + None + } else { + Some(self.get_unchecked(idx)) + } + } + pub fn get_unchecked(&self, idx: usize) -> ByteReader<'r> { + let start = molecule::NUMBER_SIZE + Self::ITEM_SIZE * idx; + let end = start + Self::ITEM_SIZE; + ByteReader::new_unchecked(&self.as_slice()[start..end]) + } + pub fn raw_data(&self) -> &'r [u8] { + &self.as_slice()[molecule::NUMBER_SIZE..] + } +} +impl<'r> molecule::prelude::Reader<'r> for BytesReader<'r> { + type Entity = Bytes; + const NAME: &'static str = "BytesReader"; + fn to_entity(&self) -> Self::Entity { + Self::Entity::new_unchecked(self.as_slice().to_owned().into()) + } + fn new_unchecked(slice: &'r [u8]) -> Self { + BytesReader(slice) + } + fn as_slice(&self) -> &'r [u8] { + self.0 + } + fn verify(slice: &[u8], _compatible: bool) -> molecule::error::VerificationResult<()> { + use molecule::verification_error as ve; + let slice_len = slice.len(); + if slice_len < molecule::NUMBER_SIZE { + return ve!(Self, HeaderIsBroken, molecule::NUMBER_SIZE, slice_len); + } + let item_count = molecule::unpack_number(slice) as usize; + if item_count == 0 { + if slice_len != molecule::NUMBER_SIZE { + return ve!(Self, TotalSizeNotMatch, molecule::NUMBER_SIZE, slice_len); + } + return Ok(()); + } + let total_size = molecule::NUMBER_SIZE + Self::ITEM_SIZE * item_count; + if slice_len != total_size { + return ve!(Self, TotalSizeNotMatch, total_size, slice_len); + } + Ok(()) + } +} +#[derive(Debug, Default)] +pub struct BytesBuilder(pub(crate) Vec); +impl BytesBuilder { + pub const ITEM_SIZE: usize = 1; + pub fn set(mut self, v: Vec) -> Self { + self.0 = v; + self + } + pub fn push(mut self, v: Byte) -> Self { + self.0.push(v); + self + } + pub fn extend>(mut self, iter: T) -> Self { + for elem in iter { + self.0.push(elem); + } + self + } + pub fn replace(&mut self, index: usize, v: Byte) -> Option { + self.0 + .get_mut(index) + .map(|item| ::core::mem::replace(item, v)) + } +} +impl molecule::prelude::Builder for BytesBuilder { + type Entity = Bytes; + const NAME: &'static str = "BytesBuilder"; + fn expected_length(&self) -> usize { + molecule::NUMBER_SIZE + Self::ITEM_SIZE * self.0.len() + } + fn write(&self, writer: &mut W) -> molecule::io::Result<()> { + writer.write_all(&molecule::pack_number(self.0.len() as molecule::Number))?; + for inner in &self.0[..] { + writer.write_all(inner.as_slice())?; + } + Ok(()) + } + fn build(&self) -> Self::Entity { + let mut inner = Vec::with_capacity(self.expected_length()); + self.write(&mut inner) + .unwrap_or_else(|_| panic!("{} build should be ok", Self::NAME)); + Bytes::new_unchecked(inner.into()) + } +} +pub struct BytesIterator(Bytes, usize, usize); +impl ::core::iter::Iterator for BytesIterator { + type Item = Byte; + fn next(&mut self) -> Option { + if self.1 >= self.2 { + None + } else { + let ret = self.0.get_unchecked(self.1); + self.1 += 1; + Some(ret) + } + } +} +impl ::core::iter::ExactSizeIterator for BytesIterator { + fn len(&self) -> usize { + self.2 - self.1 + } +} +impl ::core::iter::IntoIterator for Bytes { + type Item = Byte; + type IntoIter = BytesIterator; + fn into_iter(self) -> Self::IntoIter { + let len = self.len(); + BytesIterator(self, 0, len) + } +} +#[derive(Clone)] +pub struct BytesOpt(molecule::bytes::Bytes); +impl ::core::fmt::LowerHex for BytesOpt { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + if f.alternate() { + write!(f, "0x")?; + } + write!(f, "{}", hex_string(self.as_slice())) + } +} +impl ::core::fmt::Debug for BytesOpt { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{}({:#x})", Self::NAME, self) + } +} +impl ::core::fmt::Display for BytesOpt { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + if let Some(v) = self.to_opt() { + write!(f, "{}(Some({}))", Self::NAME, v) + } else { + write!(f, "{}(None)", Self::NAME) + } + } +} +impl ::core::default::Default for BytesOpt { + fn default() -> Self { + let v = molecule::bytes::Bytes::from_static(&Self::DEFAULT_VALUE); + BytesOpt::new_unchecked(v) + } +} +impl BytesOpt { + const DEFAULT_VALUE: [u8; 0] = []; + pub fn is_none(&self) -> bool { + self.0.is_empty() + } + pub fn is_some(&self) -> bool { + !self.0.is_empty() + } + pub fn to_opt(&self) -> Option { + if self.is_none() { + None + } else { + Some(Bytes::new_unchecked(self.0.clone())) + } + } + pub fn as_reader<'r>(&'r self) -> BytesOptReader<'r> { + BytesOptReader::new_unchecked(self.as_slice()) + } +} +impl molecule::prelude::Entity for BytesOpt { + type Builder = BytesOptBuilder; + const NAME: &'static str = "BytesOpt"; + fn new_unchecked(data: molecule::bytes::Bytes) -> Self { + BytesOpt(data) + } + fn as_bytes(&self) -> molecule::bytes::Bytes { + self.0.clone() + } + fn as_slice(&self) -> &[u8] { + &self.0[..] + } + fn from_slice(slice: &[u8]) -> molecule::error::VerificationResult { + BytesOptReader::from_slice(slice).map(|reader| reader.to_entity()) + } + fn from_compatible_slice(slice: &[u8]) -> molecule::error::VerificationResult { + BytesOptReader::from_compatible_slice(slice).map(|reader| reader.to_entity()) + } + fn new_builder() -> Self::Builder { + ::core::default::Default::default() + } + fn as_builder(self) -> Self::Builder { + Self::new_builder().set(self.to_opt()) + } +} +#[derive(Clone, Copy)] +pub struct BytesOptReader<'r>(&'r [u8]); +impl<'r> ::core::fmt::LowerHex for BytesOptReader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + if f.alternate() { + write!(f, "0x")?; + } + write!(f, "{}", hex_string(self.as_slice())) + } +} +impl<'r> ::core::fmt::Debug for BytesOptReader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{}({:#x})", Self::NAME, self) + } +} +impl<'r> ::core::fmt::Display for BytesOptReader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + if let Some(v) = self.to_opt() { + write!(f, "{}(Some({}))", Self::NAME, v) + } else { + write!(f, "{}(None)", Self::NAME) + } + } +} +impl<'r> BytesOptReader<'r> { + pub fn is_none(&self) -> bool { + self.0.is_empty() + } + pub fn is_some(&self) -> bool { + !self.0.is_empty() + } + pub fn to_opt(&self) -> Option> { + if self.is_none() { + None + } else { + Some(BytesReader::new_unchecked(self.as_slice())) + } + } +} +impl<'r> molecule::prelude::Reader<'r> for BytesOptReader<'r> { + type Entity = BytesOpt; + const NAME: &'static str = "BytesOptReader"; + fn to_entity(&self) -> Self::Entity { + Self::Entity::new_unchecked(self.as_slice().to_owned().into()) + } + fn new_unchecked(slice: &'r [u8]) -> Self { + BytesOptReader(slice) + } + fn as_slice(&self) -> &'r [u8] { + self.0 + } + fn verify(slice: &[u8], compatible: bool) -> molecule::error::VerificationResult<()> { + if !slice.is_empty() { + BytesReader::verify(&slice[..], compatible)?; + } + Ok(()) + } +} +#[derive(Debug, Default)] +pub struct BytesOptBuilder(pub(crate) Option); +impl BytesOptBuilder { + pub fn set(mut self, v: Option) -> Self { + self.0 = v; + self + } +} +impl molecule::prelude::Builder for BytesOptBuilder { + type Entity = BytesOpt; + const NAME: &'static str = "BytesOptBuilder"; + fn expected_length(&self) -> usize { + self.0 + .as_ref() + .map(|ref inner| inner.as_slice().len()) + .unwrap_or(0) + } + fn write(&self, writer: &mut W) -> molecule::io::Result<()> { + self.0 + .as_ref() + .map(|ref inner| writer.write_all(inner.as_slice())) + .unwrap_or(Ok(())) + } + fn build(&self) -> Self::Entity { + let mut inner = Vec::with_capacity(self.expected_length()); + self.write(&mut inner) + .unwrap_or_else(|_| panic!("{} build should be ok", Self::NAME)); + BytesOpt::new_unchecked(inner.into()) + } +} +#[derive(Clone)] +pub struct BytesVec(molecule::bytes::Bytes); +impl ::core::fmt::LowerHex for BytesVec { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + if f.alternate() { + write!(f, "0x")?; + } + write!(f, "{}", hex_string(self.as_slice())) + } +} +impl ::core::fmt::Debug for BytesVec { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{}({:#x})", Self::NAME, self) + } +} +impl ::core::fmt::Display for BytesVec { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{} [", Self::NAME)?; + for i in 0..self.len() { + if i == 0 { + write!(f, "{}", self.get_unchecked(i))?; + } else { + write!(f, ", {}", self.get_unchecked(i))?; + } + } + write!(f, "]") + } +} +impl ::core::default::Default for BytesVec { + fn default() -> Self { + let v = molecule::bytes::Bytes::from_static(&Self::DEFAULT_VALUE); + BytesVec::new_unchecked(v) + } +} +impl BytesVec { + const DEFAULT_VALUE: [u8; 4] = [4, 0, 0, 0]; + pub fn total_size(&self) -> usize { + molecule::unpack_number(self.as_slice()) as usize + } + pub fn item_count(&self) -> usize { + if self.total_size() == molecule::NUMBER_SIZE { + 0 + } else { + (molecule::unpack_number(&self.as_slice()[molecule::NUMBER_SIZE..]) as usize / 4) - 1 + } + } + pub fn len(&self) -> usize { + self.item_count() + } + pub fn is_empty(&self) -> bool { + self.len() == 0 + } + pub fn get(&self, idx: usize) -> Option { + if idx >= self.len() { + None + } else { + Some(self.get_unchecked(idx)) + } + } + pub fn get_unchecked(&self, idx: usize) -> Bytes { + let slice = self.as_slice(); + let start_idx = molecule::NUMBER_SIZE * (1 + idx); + let start = molecule::unpack_number(&slice[start_idx..]) as usize; + if idx == self.len() - 1 { + Bytes::new_unchecked(self.0.slice(start..)) + } else { + let end_idx = start_idx + molecule::NUMBER_SIZE; + let end = molecule::unpack_number(&slice[end_idx..]) as usize; + Bytes::new_unchecked(self.0.slice(start..end)) + } + } + pub fn as_reader<'r>(&'r self) -> BytesVecReader<'r> { + BytesVecReader::new_unchecked(self.as_slice()) + } +} +impl molecule::prelude::Entity for BytesVec { + type Builder = BytesVecBuilder; + const NAME: &'static str = "BytesVec"; + fn new_unchecked(data: molecule::bytes::Bytes) -> Self { + BytesVec(data) + } + fn as_bytes(&self) -> molecule::bytes::Bytes { + self.0.clone() + } + fn as_slice(&self) -> &[u8] { + &self.0[..] + } + fn from_slice(slice: &[u8]) -> molecule::error::VerificationResult { + BytesVecReader::from_slice(slice).map(|reader| reader.to_entity()) + } + fn from_compatible_slice(slice: &[u8]) -> molecule::error::VerificationResult { + BytesVecReader::from_compatible_slice(slice).map(|reader| reader.to_entity()) + } + fn new_builder() -> Self::Builder { + ::core::default::Default::default() + } + fn as_builder(self) -> Self::Builder { + Self::new_builder().extend(self.into_iter()) + } +} +#[derive(Clone, Copy)] +pub struct BytesVecReader<'r>(&'r [u8]); +impl<'r> ::core::fmt::LowerHex for BytesVecReader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + if f.alternate() { + write!(f, "0x")?; + } + write!(f, "{}", hex_string(self.as_slice())) + } +} +impl<'r> ::core::fmt::Debug for BytesVecReader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{}({:#x})", Self::NAME, self) + } +} +impl<'r> ::core::fmt::Display for BytesVecReader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{} [", Self::NAME)?; + for i in 0..self.len() { + if i == 0 { + write!(f, "{}", self.get_unchecked(i))?; + } else { + write!(f, ", {}", self.get_unchecked(i))?; + } + } + write!(f, "]") + } +} +impl<'r> BytesVecReader<'r> { + pub fn total_size(&self) -> usize { + molecule::unpack_number(self.as_slice()) as usize + } + pub fn item_count(&self) -> usize { + if self.total_size() == molecule::NUMBER_SIZE { + 0 + } else { + (molecule::unpack_number(&self.as_slice()[molecule::NUMBER_SIZE..]) as usize / 4) - 1 + } + } + pub fn len(&self) -> usize { + self.item_count() + } + pub fn is_empty(&self) -> bool { + self.len() == 0 + } + pub fn get(&self, idx: usize) -> Option> { + if idx >= self.len() { + None + } else { + Some(self.get_unchecked(idx)) + } + } + pub fn get_unchecked(&self, idx: usize) -> BytesReader<'r> { + let slice = self.as_slice(); + let start_idx = molecule::NUMBER_SIZE * (1 + idx); + let start = molecule::unpack_number(&slice[start_idx..]) as usize; + if idx == self.len() - 1 { + BytesReader::new_unchecked(&self.as_slice()[start..]) + } else { + let end_idx = start_idx + molecule::NUMBER_SIZE; + let end = molecule::unpack_number(&slice[end_idx..]) as usize; + BytesReader::new_unchecked(&self.as_slice()[start..end]) + } + } +} +impl<'r> molecule::prelude::Reader<'r> for BytesVecReader<'r> { + type Entity = BytesVec; + const NAME: &'static str = "BytesVecReader"; + fn to_entity(&self) -> Self::Entity { + Self::Entity::new_unchecked(self.as_slice().to_owned().into()) + } + fn new_unchecked(slice: &'r [u8]) -> Self { + BytesVecReader(slice) + } + fn as_slice(&self) -> &'r [u8] { + self.0 + } + fn verify(slice: &[u8], compatible: bool) -> molecule::error::VerificationResult<()> { + use molecule::verification_error as ve; + let slice_len = slice.len(); + if slice_len < molecule::NUMBER_SIZE { + return ve!(Self, HeaderIsBroken, molecule::NUMBER_SIZE, slice_len); + } + let total_size = molecule::unpack_number(slice) as usize; + if slice_len != total_size { + return ve!(Self, TotalSizeNotMatch, total_size, slice_len); + } + if slice_len == molecule::NUMBER_SIZE { + return Ok(()); + } + if slice_len < molecule::NUMBER_SIZE * 2 { + return ve!( + Self, + TotalSizeNotMatch, + molecule::NUMBER_SIZE * 2, + slice_len + ); + } + let offset_first = molecule::unpack_number(&slice[molecule::NUMBER_SIZE..]) as usize; + if offset_first % molecule::NUMBER_SIZE != 0 || offset_first < molecule::NUMBER_SIZE * 2 { + return ve!(Self, OffsetsNotMatch); + } + if slice_len < offset_first { + return ve!(Self, HeaderIsBroken, offset_first, slice_len); + } + let mut offsets: Vec = slice[molecule::NUMBER_SIZE..offset_first] + .chunks_exact(molecule::NUMBER_SIZE) + .map(|x| molecule::unpack_number(x) as usize) + .collect(); + offsets.push(total_size); + if offsets.windows(2).any(|i| i[0] > i[1]) { + return ve!(Self, OffsetsNotMatch); + } + for pair in offsets.windows(2) { + let start = pair[0]; + let end = pair[1]; + BytesReader::verify(&slice[start..end], compatible)?; + } + Ok(()) + } +} +#[derive(Debug, Default)] +pub struct BytesVecBuilder(pub(crate) Vec); +impl BytesVecBuilder { + pub fn set(mut self, v: Vec) -> Self { + self.0 = v; + self + } + pub fn push(mut self, v: Bytes) -> Self { + self.0.push(v); + self + } + pub fn extend>(mut self, iter: T) -> Self { + for elem in iter { + self.0.push(elem); + } + self + } + pub fn replace(&mut self, index: usize, v: Bytes) -> Option { + self.0 + .get_mut(index) + .map(|item| ::core::mem::replace(item, v)) + } +} +impl molecule::prelude::Builder for BytesVecBuilder { + type Entity = BytesVec; + const NAME: &'static str = "BytesVecBuilder"; + fn expected_length(&self) -> usize { + molecule::NUMBER_SIZE * (self.0.len() + 1) + + self + .0 + .iter() + .map(|inner| inner.as_slice().len()) + .sum::() + } + fn write(&self, writer: &mut W) -> molecule::io::Result<()> { + let item_count = self.0.len(); + if item_count == 0 { + writer.write_all(&molecule::pack_number( + molecule::NUMBER_SIZE as molecule::Number, + ))?; + } else { + let (total_size, offsets) = self.0.iter().fold( + ( + molecule::NUMBER_SIZE * (item_count + 1), + Vec::with_capacity(item_count), + ), + |(start, mut offsets), inner| { + offsets.push(start); + (start + inner.as_slice().len(), offsets) + }, + ); + writer.write_all(&molecule::pack_number(total_size as molecule::Number))?; + for offset in offsets.into_iter() { + writer.write_all(&molecule::pack_number(offset as molecule::Number))?; + } + for inner in self.0.iter() { + writer.write_all(inner.as_slice())?; + } + } + Ok(()) + } + fn build(&self) -> Self::Entity { + let mut inner = Vec::with_capacity(self.expected_length()); + self.write(&mut inner) + .unwrap_or_else(|_| panic!("{} build should be ok", Self::NAME)); + BytesVec::new_unchecked(inner.into()) + } +} +pub struct BytesVecIterator(BytesVec, usize, usize); +impl ::core::iter::Iterator for BytesVecIterator { + type Item = Bytes; + fn next(&mut self) -> Option { + if self.1 >= self.2 { + None + } else { + let ret = self.0.get_unchecked(self.1); + self.1 += 1; + Some(ret) + } + } +} +impl ::core::iter::ExactSizeIterator for BytesVecIterator { + fn len(&self) -> usize { + self.2 - self.1 + } +} +impl ::core::iter::IntoIterator for BytesVec { + type Item = Bytes; + type IntoIter = BytesVecIterator; + fn into_iter(self) -> Self::IntoIter { + let len = self.len(); + BytesVecIterator(self, 0, len) + } +} +impl<'r> BytesVecReader<'r> { + pub fn iter<'t>(&'t self) -> BytesVecReaderIterator<'t, 'r> { + BytesVecReaderIterator(&self, 0, self.len()) + } +} +pub struct BytesVecReaderIterator<'t, 'r>(&'t BytesVecReader<'r>, usize, usize); +impl<'t: 'r, 'r> ::core::iter::Iterator for BytesVecReaderIterator<'t, 'r> { + type Item = BytesReader<'t>; + fn next(&mut self) -> Option { + if self.1 >= self.2 { + None + } else { + let ret = self.0.get_unchecked(self.1); + self.1 += 1; + Some(ret) + } + } +} +impl<'t: 'r, 'r> ::core::iter::ExactSizeIterator for BytesVecReaderIterator<'t, 'r> { + fn len(&self) -> usize { + self.2 - self.1 + } +} +#[derive(Clone)] +pub struct Byte32Vec(molecule::bytes::Bytes); +impl ::core::fmt::LowerHex for Byte32Vec { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + if f.alternate() { + write!(f, "0x")?; + } + write!(f, "{}", hex_string(self.as_slice())) + } +} +impl ::core::fmt::Debug for Byte32Vec { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{}({:#x})", Self::NAME, self) + } +} +impl ::core::fmt::Display for Byte32Vec { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{} [", Self::NAME)?; + for i in 0..self.len() { + if i == 0 { + write!(f, "{}", self.get_unchecked(i))?; + } else { + write!(f, ", {}", self.get_unchecked(i))?; + } + } + write!(f, "]") + } +} +impl ::core::default::Default for Byte32Vec { + fn default() -> Self { + let v = molecule::bytes::Bytes::from_static(&Self::DEFAULT_VALUE); + Byte32Vec::new_unchecked(v) + } +} +impl Byte32Vec { + const DEFAULT_VALUE: [u8; 4] = [0, 0, 0, 0]; + pub const ITEM_SIZE: usize = 32; + pub fn total_size(&self) -> usize { + molecule::NUMBER_SIZE + Self::ITEM_SIZE * self.item_count() + } + pub fn item_count(&self) -> usize { + molecule::unpack_number(self.as_slice()) as usize + } + pub fn len(&self) -> usize { + self.item_count() + } + pub fn is_empty(&self) -> bool { + self.len() == 0 + } + pub fn get(&self, idx: usize) -> Option { + if idx >= self.len() { + None + } else { + Some(self.get_unchecked(idx)) + } + } + pub fn get_unchecked(&self, idx: usize) -> Byte32 { + let start = molecule::NUMBER_SIZE + Self::ITEM_SIZE * idx; + let end = start + Self::ITEM_SIZE; + Byte32::new_unchecked(self.0.slice(start..end)) + } + pub fn as_reader<'r>(&'r self) -> Byte32VecReader<'r> { + Byte32VecReader::new_unchecked(self.as_slice()) + } +} +impl molecule::prelude::Entity for Byte32Vec { + type Builder = Byte32VecBuilder; + const NAME: &'static str = "Byte32Vec"; + fn new_unchecked(data: molecule::bytes::Bytes) -> Self { + Byte32Vec(data) + } + fn as_bytes(&self) -> molecule::bytes::Bytes { + self.0.clone() + } + fn as_slice(&self) -> &[u8] { + &self.0[..] + } + fn from_slice(slice: &[u8]) -> molecule::error::VerificationResult { + Byte32VecReader::from_slice(slice).map(|reader| reader.to_entity()) + } + fn from_compatible_slice(slice: &[u8]) -> molecule::error::VerificationResult { + Byte32VecReader::from_compatible_slice(slice).map(|reader| reader.to_entity()) + } + fn new_builder() -> Self::Builder { + ::core::default::Default::default() + } + fn as_builder(self) -> Self::Builder { + Self::new_builder().extend(self.into_iter()) + } +} +#[derive(Clone, Copy)] +pub struct Byte32VecReader<'r>(&'r [u8]); +impl<'r> ::core::fmt::LowerHex for Byte32VecReader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + if f.alternate() { + write!(f, "0x")?; + } + write!(f, "{}", hex_string(self.as_slice())) + } +} +impl<'r> ::core::fmt::Debug for Byte32VecReader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{}({:#x})", Self::NAME, self) + } +} +impl<'r> ::core::fmt::Display for Byte32VecReader<'r> { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{} [", Self::NAME)?; + for i in 0..self.len() { + if i == 0 { + write!(f, "{}", self.get_unchecked(i))?; + } else { + write!(f, ", {}", self.get_unchecked(i))?; + } + } + write!(f, "]") + } +} +impl<'r> Byte32VecReader<'r> { + pub const ITEM_SIZE: usize = 32; + pub fn total_size(&self) -> usize { + molecule::NUMBER_SIZE + Self::ITEM_SIZE * self.item_count() + } + pub fn item_count(&self) -> usize { + molecule::unpack_number(self.as_slice()) as usize + } + pub fn len(&self) -> usize { + self.item_count() + } + pub fn is_empty(&self) -> bool { + self.len() == 0 + } + pub fn get(&self, idx: usize) -> Option> { + if idx >= self.len() { + None + } else { + Some(self.get_unchecked(idx)) + } + } + pub fn get_unchecked(&self, idx: usize) -> Byte32Reader<'r> { + let start = molecule::NUMBER_SIZE + Self::ITEM_SIZE * idx; + let end = start + Self::ITEM_SIZE; + Byte32Reader::new_unchecked(&self.as_slice()[start..end]) + } +} +impl<'r> molecule::prelude::Reader<'r> for Byte32VecReader<'r> { + type Entity = Byte32Vec; + const NAME: &'static str = "Byte32VecReader"; + fn to_entity(&self) -> Self::Entity { + Self::Entity::new_unchecked(self.as_slice().to_owned().into()) + } + fn new_unchecked(slice: &'r [u8]) -> Self { + Byte32VecReader(slice) + } + fn as_slice(&self) -> &'r [u8] { + self.0 + } + fn verify(slice: &[u8], _compatible: bool) -> molecule::error::VerificationResult<()> { + use molecule::verification_error as ve; + let slice_len = slice.len(); + if slice_len < molecule::NUMBER_SIZE { + return ve!(Self, HeaderIsBroken, molecule::NUMBER_SIZE, slice_len); + } + let item_count = molecule::unpack_number(slice) as usize; + if item_count == 0 { + if slice_len != molecule::NUMBER_SIZE { + return ve!(Self, TotalSizeNotMatch, molecule::NUMBER_SIZE, slice_len); + } + return Ok(()); + } + let total_size = molecule::NUMBER_SIZE + Self::ITEM_SIZE * item_count; + if slice_len != total_size { + return ve!(Self, TotalSizeNotMatch, total_size, slice_len); + } + Ok(()) + } +} +#[derive(Debug, Default)] +pub struct Byte32VecBuilder(pub(crate) Vec); +impl Byte32VecBuilder { + pub const ITEM_SIZE: usize = 32; + pub fn set(mut self, v: Vec) -> Self { + self.0 = v; + self + } + pub fn push(mut self, v: Byte32) -> Self { + self.0.push(v); + self + } + pub fn extend>(mut self, iter: T) -> Self { + for elem in iter { + self.0.push(elem); + } + self + } + pub fn replace(&mut self, index: usize, v: Byte32) -> Option { + self.0 + .get_mut(index) + .map(|item| ::core::mem::replace(item, v)) + } +} +impl molecule::prelude::Builder for Byte32VecBuilder { + type Entity = Byte32Vec; + const NAME: &'static str = "Byte32VecBuilder"; + fn expected_length(&self) -> usize { + molecule::NUMBER_SIZE + Self::ITEM_SIZE * self.0.len() + } + fn write(&self, writer: &mut W) -> molecule::io::Result<()> { + writer.write_all(&molecule::pack_number(self.0.len() as molecule::Number))?; + for inner in &self.0[..] { + writer.write_all(inner.as_slice())?; + } + Ok(()) + } + fn build(&self) -> Self::Entity { + let mut inner = Vec::with_capacity(self.expected_length()); + self.write(&mut inner) + .unwrap_or_else(|_| panic!("{} build should be ok", Self::NAME)); + Byte32Vec::new_unchecked(inner.into()) + } +} +pub struct Byte32VecIterator(Byte32Vec, usize, usize); +impl ::core::iter::Iterator for Byte32VecIterator { + type Item = Byte32; + fn next(&mut self) -> Option { + if self.1 >= self.2 { + None + } else { + let ret = self.0.get_unchecked(self.1); + self.1 += 1; + Some(ret) + } + } +} +impl ::core::iter::ExactSizeIterator for Byte32VecIterator { + fn len(&self) -> usize { + self.2 - self.1 + } +} +impl ::core::iter::IntoIterator for Byte32Vec { + type Item = Byte32; + type IntoIter = Byte32VecIterator; + fn into_iter(self) -> Self::IntoIter { + let len = self.len(); + Byte32VecIterator(self, 0, len) + } +} +impl<'r> Byte32VecReader<'r> { + pub fn iter<'t>(&'t self) -> Byte32VecReaderIterator<'t, 'r> { + Byte32VecReaderIterator(&self, 0, self.len()) + } +} +pub struct Byte32VecReaderIterator<'t, 'r>(&'t Byte32VecReader<'r>, usize, usize); +impl<'t: 'r, 'r> ::core::iter::Iterator for Byte32VecReaderIterator<'t, 'r> { + type Item = Byte32Reader<'t>; + fn next(&mut self) -> Option { + if self.1 >= self.2 { + None + } else { + let ret = self.0.get_unchecked(self.1); + self.1 += 1; + Some(ret) + } + } +} +impl<'t: 'r, 'r> ::core::iter::ExactSizeIterator for Byte32VecReaderIterator<'t, 'r> { + fn len(&self) -> usize { + self.2 - self.1 + } +} +#[derive(Clone)] +pub struct ScriptOpt(molecule::bytes::Bytes); +impl ::core::fmt::LowerHex for ScriptOpt { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + use molecule::hex_string; + if f.alternate() { + write!(f, "0x")?; + } + write!(f, "{}", hex_string(self.as_slice())) + } +} +impl ::core::fmt::Debug for ScriptOpt { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(f, "{}({:#x})", Self::NAME, self) + } +} +impl ::core::fmt::Display for ScriptOpt { + fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + if let Some(v) = self.to_opt() { + write!(f, "{}(Some({}))", Self::NAME, v) + } else { + write!(f, "{}(None)", Self::NAME) + } + } +} +impl ::core::default::Default for ScriptOpt { + fn default() -> Self { + let v = molecule::bytes::Bytes::from_static(&Self::DEFAULT_VALUE); + ScriptOpt::new_unchecked(v) + } +} +impl ScriptOpt { + const DEFAULT_VALUE: [u8; 0] = []; + pub fn is_none(&self) -> bool { + self.0.is_empty() + } + pub fn is_some(&self) -> bool { + !self.0.is_empty() + } + pub fn to_opt(&self) -> Option