diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ab798fc..121d9b49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +# v1.1.0 +* Update ckb deps from `v0.103.0` to `v0.104.0` +* **BREAKING**: remove `ckb-index` crate, and effect following subcommands: + - remove `index` subcommand + - remove `wallet top-capacity` subcommand + - remove `wallet get-capacity --lock-hash` support + - remove `wallet get-live-cells --lock-hash` support + - remove `wallet get-live-cells --type-hash` support + - remove `wallet get-live-cells --code-hash` support +* Use [`ckb-indexer`][ckb-indexer-repo] as index backend +* Update `ckb-sdk` to `v2.0.0` +* Guide user to select ckb/ckb-indexer url for the first time +* Add `--local-only` flag to not check alerts and get network type when startup + # v1.0.0 * Update ckb from `v0.101.3` to `v0.103.0` * Remove `ckb-sdk` from `ckb-cli` and created as an [standalone repository](https://github.com/nervosnetwork/ckb-sdk-rust) @@ -21,3 +35,4 @@ [sudt-wiki]: https://github.com/nervosnetwork/ckb-cli/wiki/UDT-(sudt)-Operations-Tutorial +[ckb-indexer-repo]: https://github.com/nervosnetwork/ckb-indexer diff --git a/Cargo.lock b/Cargo.lock index c8e60e01..f459da5b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -80,9 +80,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.60" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c794e162a5eff65c72ef524dfe393eb923c354e350bb78b9c7383df13f3bc142" +checksum = "1485d4d2cc45e7b201ee3767015c96faa5904387c9d87c6efdd0fb511f12d305" [[package]] name = "arrayref" @@ -268,9 +268,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.10.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" +checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" [[package]] name = "byte-tools" @@ -329,9 +329,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f725f340c3854e3cb3ab736dc21f0cca183303acea3b3ffec30f141503ac8eb" +checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" dependencies = [ "iana-time-zone", "js-sys", @@ -389,7 +389,7 @@ dependencies = [ [[package]] name = "ckb-cli" -version = "1.0.0" +version = "1.1.0" dependencies = [ "ansi_term", "atty", @@ -405,7 +405,7 @@ dependencies = [ "ckb-jsonrpc-types", "ckb-mock-tx-types", "ckb-script", - "ckb-sdk 2.0.0", + "ckb-sdk", "ckb-signer", "ckb-types", "ckb-util", @@ -422,7 +422,7 @@ dependencies = [ "eaglesong", "env_logger", "faster-hex", - "futures 0.3.21", + "futures 0.3.23", "ipnetwork", "jsonrpc-core", "jsonrpc-core-client", @@ -451,7 +451,7 @@ dependencies = [ [[package]] name = "ckb-cli-plugin-protocol" -version = "1.0.0" +version = "1.1.0" dependencies = [ "ckb-jsonrpc-types", "ckb-types", @@ -668,36 +668,6 @@ dependencies = [ "serde", ] -[[package]] -name = "ckb-sdk" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e73cd1e12195e22b169321c650ea06ec430583894224ab4661de5f082d7026f" -dependencies = [ - "bech32", - "bytes 1.2.1", - "ckb-crypto", - "ckb-dao-utils", - "ckb-hash", - "ckb-jsonrpc-types", - "ckb-resource", - "ckb-traits", - "ckb-types", - "futures 0.3.21", - "jsonrpc-core", - "log", - "lru", - "parking_lot 0.12.1", - "reqwest", - "secp256k1", - "serde", - "serde_derive", - "serde_json", - "thiserror", - "tokio", - "tokio-util 0.6.10", -] - [[package]] name = "ckb-sdk" version = "2.0.0" @@ -715,7 +685,7 @@ dependencies = [ "ckb-traits", "ckb-types", "enum-repr-derive", - "futures 0.3.21", + "futures 0.3.23", "jsonrpc-core", "lazy_static", "log", @@ -735,14 +705,14 @@ dependencies = [ [[package]] name = "ckb-signer" -version = "0.1.0" +version = "0.2.0" dependencies = [ "aes-ctr", "bitcoin", "chrono", "ckb-crypto", "ckb-hash", - "ckb-sdk 1.1.0", + "ckb-sdk", "ckb-types", "faster-hex", "parking_lot 0.11.2", @@ -857,9 +827,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.2.15" +version = "3.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba52acd3b0a5c33aeada5cdaa3267cdc7c594a98731d4268cdc1532f4264cb4" +checksum = "13547f7012c01ab4a0e8f8967730ada8f9fdf419e8b6c792788f39cf4e46eefa" dependencies = [ "heck", "proc-macro-error", @@ -1114,9 +1084,9 @@ checksum = "8d978bd5d343e8ab9b5c0fc8d93ff9c602fdc96616ffff9c05ac7a155419b824" [[package]] name = "either" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" [[package]] name = "encode_unicode" @@ -1250,9 +1220,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" +checksum = "ab30e97ab6aacfe635fad58f22c2bb06c8b685f7421eb1e064a729e2a5f481fa" dependencies = [ "futures-channel", "futures-core", @@ -1265,9 +1235,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +checksum = "2bfc52cbddcfd745bf1740338492bb0bd83d76c67b445f91c5fb29fae29ecaa1" dependencies = [ "futures-core", "futures-sink", @@ -1275,15 +1245,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" +checksum = "d2acedae88d38235936c3922476b10fced7b2b68136f5e3c03c2d5be348a1115" [[package]] name = "futures-executor" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" +checksum = "1d11aa21b5b587a64682c0094c2bdd4df0076c5324961a40cc3abd7f37930528" dependencies = [ "futures-core", "futures-task", @@ -1293,15 +1263,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" +checksum = "93a66fc6d035a26a3ae255a6d2bca35eda63ae4c5512bef54449113f7a1228e5" [[package]] name = "futures-macro" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" +checksum = "0db9cce532b0eae2ccf2766ab246f114b56b9cf6d445e00c2549fbc100ca045d" dependencies = [ "proc-macro2", "quote", @@ -1310,21 +1280,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" +checksum = "ca0bae1fe9752cf7fd9b0064c674ae63f97b37bc714d745cbde0afb7ec4e6765" [[package]] name = "futures-task" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" +checksum = "842fc63b931f4056a24d59de13fb1272134ce261816e063e634ad0c15cdc5306" [[package]] name = "futures-util" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +checksum = "f0828a5471e340229c11c77ca80017937ce3c58cb788a17e5f1c2d5c485a9577" dependencies = [ "futures 0.1.31", "futures-channel", @@ -1417,9 +1387,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" +checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be" dependencies = [ "bytes 1.2.1", "fnv", @@ -1559,12 +1529,12 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.41" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1779539f58004e5dba1c1f093d44325ebeb244bfc04b791acdc0aaeca9c04570" +checksum = "ad2bfd338099682614d3ee3fe0cd72e0b6a41ca6a87f6a74a3bd593c91650501" dependencies = [ "android_system_properties", - "core-foundation", + "core-foundation-sys", "js-sys", "wasm-bindgen", "winapi 0.3.9", @@ -1687,7 +1657,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2b99d4207e2a04fb4581746903c2bb7eb376f88de9c699d0f3e10feeac0cd3a" dependencies = [ "derive_more", - "futures 0.3.21", + "futures 0.3.23", "jsonrpc-core", "jsonrpc-pubsub", "log", @@ -1702,7 +1672,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" dependencies = [ - "futures 0.3.21", + "futures 0.3.23", "futures-executor", "futures-util", "log", @@ -1717,7 +1687,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b51da17abecbdab3e3d4f26b01c5ec075e88d3abe3ab3b05dc9aa69392764ec0" dependencies = [ - "futures 0.3.21", + "futures 0.3.23", "jsonrpc-client-transports", ] @@ -1739,7 +1709,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1dea6e07251d9ce6a552abfb5d7ad6bc290a4596c8dcc3d795fae2bbdc1f3ff" dependencies = [ - "futures 0.3.21", + "futures 0.3.23", "hyper", "jsonrpc-core", "jsonrpc-server-utils", @@ -1755,7 +1725,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240f87695e6c6f62fb37f05c02c04953cf68d6408b8c1c89de85c7a0125b1011" dependencies = [ - "futures 0.3.21", + "futures 0.3.23", "jsonrpc-core", "lazy_static", "log", @@ -1771,7 +1741,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4" dependencies = [ "bytes 1.2.1", - "futures 0.3.21", + "futures 0.3.23", "globset", "jsonrpc-core", "lazy_static", @@ -1806,9 +1776,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.129" +version = "0.2.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64de3cc433455c14174d42e554d4027ee631c4d046d43e3ecc6efc4636cdc7a7" +checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" [[package]] name = "linked-hash-map" @@ -1818,9 +1788,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "lock_api" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +checksum = "9f80bf5aacaf25cbfc8210d1cfb718f2bf3b11c4c54e5afe36c236853a8ec390" dependencies = [ "autocfg 1.1.0", "scopeguard", @@ -2058,9 +2028,9 @@ checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" [[package]] name = "once_cell" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" +checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e" [[package]] name = "opaque-debug" @@ -2808,9 +2778,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.6.1" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" +checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" dependencies = [ "bitflags", "core-foundation", @@ -2837,18 +2807,18 @@ checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711" [[package]] name = "serde" -version = "1.0.143" +version = "1.0.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553" +checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.143" +version = "1.0.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3d8e8de557aee63c26b85b947f5e59b690d0454c753f3adeb5cd7835ab88391" +checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" dependencies = [ "proc-macro2", "quote", @@ -2857,9 +2827,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.83" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7" +checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" dependencies = [ "itoa", "ryu", @@ -2966,9 +2936,9 @@ checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" [[package]] name = "socket2" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" +checksum = "10c98bba371b9b22a71a9414e420f92ddeb2369239af08200816169d5e2dd7aa" dependencies = [ "libc", "winapi 0.3.9", diff --git a/Cargo.toml b/Cargo.toml index 6ac8f47f..3ac43497 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-cli" -version = "1.0.0" +version = "1.1.0" license = "MIT" authors = ["Linfeng Qian ", "Nervos Core Dev "] edition = "2021" @@ -17,9 +17,9 @@ ckb-error = "=0.104.0" ckb-script = "=0.104.0" ckb-chain-spec = "=0.104.0" ckb-mock-tx-types = "0.4.0" -ckb-sdk = "~2.0.0" -ckb-signer = { path = "ckb-signer", version = "0.1.0" } -plugin-protocol = { path = "plugin-protocol", package = "ckb-cli-plugin-protocol", version = "=1.0.0" } +ckb-sdk = "2.0.0" +ckb-signer = { path = "ckb-signer", version = "0.2.0" } +plugin-protocol = { path = "plugin-protocol", package = "ckb-cli-plugin-protocol", version = "=1.1.0" } jsonrpc-core-client = "18" jsonrpc-core = "18" jsonrpc-derive = "18" diff --git a/ckb-signer/Cargo.toml b/ckb-signer/Cargo.toml index 1324192e..865ee395 100644 --- a/ckb-signer/Cargo.toml +++ b/ckb-signer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-signer" -version = "0.1.0" +version = "0.2.0" edition = "2021" license = "MIT" description = "Signer SDK for Nervos CKB" @@ -26,4 +26,4 @@ parking_lot = "0.11" ckb-types = "=0.104.0" ckb-hash = "=0.104.0" ckb-crypto = { version = "=0.104.0", features = ["secp"] } -ckb-sdk = "~1.1.0" +ckb-sdk = "2.0.0" diff --git a/plugin-protocol/Cargo.toml b/plugin-protocol/Cargo.toml index a54f4b09..9ead2c73 100644 --- a/plugin-protocol/Cargo.toml +++ b/plugin-protocol/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-cli-plugin-protocol" -version = "1.0.0" +version = "1.1.0" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -14,4 +14,4 @@ ckb-jsonrpc-types = "=0.104.0" serde = { version = "1.0", features = ["derive"] } serde_derive = "1.0" serde_json = "1.0" -faster-hex = "0.6" \ No newline at end of file +faster-hex = "0.6" diff --git a/test/Cargo.toml b/test/Cargo.toml index 10539e64..7ed8e04a 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -14,7 +14,7 @@ log = "0.4" env_logger = "0.6" toml = "0.5.0" serde_yaml = "0.8.9" -ckb-sdk = "~1.1.0" +ckb-sdk = "2.0.0" serde_json = "1.0" ckb-types = "=0.104.0" ckb-jsonrpc-types = "=0.104.0"