From 2c206e0105ed62a7a35173b5f71851571c570b24 Mon Sep 17 00:00:00 2001
From: quake <quake.wang@gmail.com>
Date: Wed, 21 Jun 2023 09:59:28 +0900
Subject: [PATCH 1/3] chore: upgrade to ckb v0.111

---
 Cargo.lock                     | 197 +++++++++++++++++++--------------
 Cargo.toml                     |   6 +-
 crates/testtool/Cargo.toml     |  20 ++--
 crates/testtool/src/context.rs |  42 +++++--
 src/wallet/wallet.rs           |   2 +-
 5 files changed, 161 insertions(+), 106 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0963c23..0b2327a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -205,7 +205,7 @@ dependencies = [
  "atty",
  "chrono",
  "ckb-sdk",
- "ckb-testtool 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ckb-testtool",
  "clap",
  "ctrlc",
  "env_logger",
@@ -231,9 +231,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-chain-spec"
-version = "0.108.0"
+version = "0.111.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78df45446aaa86b06a77b8b145cffa79950e7ede293cebcd114a62e74c29dbf"
+checksum = "914d19f00dc311454ff0c7a093022e0d24d1975d3d63cf83b83c2fefbc29aa7a"
 dependencies = [
  "ckb-constant",
  "ckb-crypto",
@@ -253,24 +253,24 @@ dependencies = [
 
 [[package]]
 name = "ckb-channel"
-version = "0.108.0"
+version = "0.111.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "920f26cc48cadcaf6f7bcc3960fde9f9f355633b6361da8ef31e1e1c00fc8858"
+checksum = "2bc442217b1c1018e363bfae180154b3f12b0d05848393e63d5b21000dd4aa57"
 dependencies = [
  "crossbeam-channel",
 ]
 
 [[package]]
 name = "ckb-constant"
-version = "0.108.0"
+version = "0.111.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302566408e5b296663ac5e8245bf71824ca2c7c2ef19a57fcc15939dd66527e9"
+checksum = "6c7021efc10b6ba265914d420b40cdf0244b8552d4993591bf3642e7fbdf328d"
 
 [[package]]
 name = "ckb-crypto"
-version = "0.108.0"
+version = "0.111.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aac31177b0a8bf3acd563c042775e40494e437b2bbbae96ac2473eec3a4da95d"
+checksum = "7f6d15ac1ad1d2e4ce0a1736dfbea12a9a105c4759c1a3bfc59f5f3e41e16451"
 dependencies = [
  "ckb-fixed-hash",
  "faster-hex",
@@ -282,9 +282,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-dao"
-version = "0.108.0"
+version = "0.111.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b70944b9013ead64287b87ac19608a3ca5ab19a9f29b7a76f637ad7831510e88"
+checksum = "3c28e41410b9a30d3fddce1d02416802a2fb032ee33b0dab857c2f3f63d1e7b4"
 dependencies = [
  "byteorder",
  "ckb-chain-spec",
@@ -295,9 +295,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-dao-utils"
-version = "0.108.0"
+version = "0.111.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1929c9627923fe1d22151361d74f5a5aa0dda77016d020307a54486eae11cb3c"
+checksum = "377c5ab17385d8d5ec50df92de45c7f085168d6890a11a09847e009c4bce872d"
 dependencies = [
  "byteorder",
  "ckb-error",
@@ -306,9 +306,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-error"
-version = "0.108.0"
+version = "0.111.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "446a519d8a847d97f1c8ece739dc1748751a9a2179249c96c45cced0825a7aa5"
+checksum = "df4a3674e91621afeffe58ef28c064a6a2b669f002858c1fa203b80bec70fcba"
 dependencies = [
  "anyhow",
  "ckb-occupied-capacity",
@@ -318,9 +318,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-fixed-hash"
-version = "0.108.0"
+version = "0.111.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00cbbc455b23748b32e06d16628a03e30d56ffa057f17093fdf5b42d4fb6c879"
+checksum = "eb903061e35719d4d65417f742eb5d789c0e4351df3355ed155309e739f0c14e"
 dependencies = [
  "ckb-fixed-hash-core",
  "ckb-fixed-hash-macros",
@@ -328,9 +328,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-fixed-hash-core"
-version = "0.108.0"
+version = "0.111.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4e644a4e026625b4be5a04cdf6c02043080e79feaf77d9cdbb2f0e6553f751"
+checksum = "72a75aa0482ad3561fa8bd57adede6ae26befcedbc407fa287b6371799152545"
 dependencies = [
  "faster-hex",
  "serde",
@@ -339,9 +339,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-fixed-hash-macros"
-version = "0.108.0"
+version = "0.111.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cfc980ef88c217825172eb46df269f47890f5e78a38214416f13b3bd17a4b4"
+checksum = "f9089e5638b6b51e7935abe6a7c8f7e840d1824fe4f9f7e22e29339d73bc9a04"
 dependencies = [
  "ckb-fixed-hash-core",
  "proc-macro2",
@@ -351,9 +351,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-hash"
-version = "0.108.0"
+version = "0.111.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d9b683e89ae4ffdd5aaf4172eab00b6bbe7ea24e2abf77d3eb850ba36e8983"
+checksum = "dbcec03eafd9d000536e9394b1a926e0d4a0c085f6c16b18e6c8d8f066be1967"
 dependencies = [
  "blake2b-ref",
  "blake2b-rs",
@@ -361,9 +361,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-jsonrpc-types"
-version = "0.108.0"
+version = "0.111.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac087657eaf964e729f40b3c929d3dac74a2cd8bb38d5e588756e2495711f810"
+checksum = "cc552372cbc6f7e662c855abcc605a13288702df4d35cb07f99e34ea77a62e97"
 dependencies = [
  "ckb-types",
  "faster-hex",
@@ -373,9 +373,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-logger"
-version = "0.108.0"
+version = "0.111.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "911c4695ddf82f78da8f514b359092bbe231f58c2669c93b1cfc9a2030b125bb"
+checksum = "f250efe7a60f5e07fad6ef9f65f67ebf54e4ec3759d442bca0b315af04eb131e"
 dependencies = [
  "log",
 ]
@@ -389,11 +389,23 @@ dependencies = [
  "cfg-if 1.0.0",
 ]
 
+[[package]]
+name = "ckb-mock-tx-types"
+version = "0.111.0"
+source = "git+https://github.com/cryptape/ckb-mock-tx-types?branch=exec/bump-0.111.0#0c9ba51eccff289ed83615378c0d62d5fb7a1fd9"
+dependencies = [
+ "ckb-jsonrpc-types",
+ "ckb-traits",
+ "ckb-types",
+ "serde",
+ "serde_derive",
+]
+
 [[package]]
 name = "ckb-occupied-capacity"
-version = "0.108.0"
+version = "0.111.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d2a1dd0d4ba5dafba1e30d437c1148b20f42edb76b6794323e05bda626754eb"
+checksum = "2e9a7454c709f62a3c02b283ac83cd99da166cec40e92a62f97448bcc14b0fbc"
 dependencies = [
  "ckb-occupied-capacity-core",
  "ckb-occupied-capacity-macros",
@@ -401,18 +413,18 @@ dependencies = [
 
 [[package]]
 name = "ckb-occupied-capacity-core"
-version = "0.108.0"
+version = "0.111.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ebba3d564098a84c83f4740e1dce48a5e2da759becdb47e3c7965f0808e6e92"
+checksum = "38b3ba5a640d03b280496ac846da691ae9b02dd4e9f87ca28e5dde0752747e6b"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "ckb-occupied-capacity-macros"
-version = "0.108.0"
+version = "0.111.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6321bba85cdf9724029d8c906851dd4a90906869b42f9100b16645a1261d4c"
+checksum = "ec0277ace1a5f15cc2f423954abb34205e3ef5d647642469ea19d6e9b1ddbe0e"
 dependencies = [
  "ckb-occupied-capacity-core",
  "quote",
@@ -421,9 +433,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-pow"
-version = "0.108.0"
+version = "0.111.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9167b427f42874e68e20e6946d5211709979ff1d86c0061a71c2f6a6aa17659"
+checksum = "2b70f5befc83607d0dbae93a09c6bc3d1717d7d79db0b4581996394ae4c57a0a"
 dependencies = [
  "byteorder",
  "ckb-hash",
@@ -435,9 +447,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-rational"
-version = "0.108.0"
+version = "0.111.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2519249f8d47fa758d3fb3cf3049327c69ce0f2acd79d61427482c8661d3dbd"
+checksum = "f4339d4d36412cda4ae4b73c61a90bc2eee56fd07f961b68f3132441d66c5ae1"
 dependencies = [
  "numext-fixed-uint",
  "serde",
@@ -445,9 +457,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-resource"
-version = "0.108.0"
+version = "0.111.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3abddc968d7f1e70584ab04180c347380a44acbe0b60e26cc96208ec8885279"
+checksum = "e0ea4fa023ba08d6a8e8a1ad8128add5ceb5a6845f94e7e378e0f40408c4ccb8"
 dependencies = [
  "ckb-system-scripts",
  "ckb-types",
@@ -460,9 +472,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-script"
-version = "0.108.0"
+version = "0.111.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12b4754a2f0ccea5ea1934822bd18a3a66c46344d8c3872cb20ffdcf0851fab9"
+checksum = "de268eb8f453eac53790e89916d612ea02110a5f21c2458555d1d4c6e2fc720c"
 dependencies = [
  "byteorder",
  "ckb-chain-spec",
@@ -478,23 +490,26 @@ dependencies = [
 
 [[package]]
 name = "ckb-sdk"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b201220ac5762353f9313fbbc3c4cee2a6a924c16c17df51517644991575cc1"
+version = "2.6.0"
+source = "git+https://github.com/eval-exec/ckb-sdk-rust?branch=exec/data2#f5d0bd598ba4d92e101a4163b65ea6beaac4b2ce"
 dependencies = [
  "anyhow",
  "bech32",
  "bitflags",
  "bytes",
+ "ckb-chain-spec",
  "ckb-crypto",
  "ckb-dao-utils",
  "ckb-hash",
  "ckb-jsonrpc-types",
+ "ckb-mock-tx-types",
  "ckb-resource",
  "ckb-script",
  "ckb-traits",
  "ckb-types",
  "dashmap",
+ "derive-getters",
+ "dyn-clone",
  "enum-repr-derive",
  "futures",
  "jsonrpc-core",
@@ -529,9 +544,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-systemtime"
-version = "0.108.0"
+version = "0.111.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243197680f69d6bb6cb1caf16199ce4a8162a258c757d5af8f727af0d8aabe9e"
+checksum = "f5191e258aff4cbf90357dd1525ffa683115b5430ac44b4d8f247aafcb0ade7b"
 
 [[package]]
 name = "ckb-testtool"
@@ -552,45 +567,25 @@ dependencies = [
  "rand 0.8.5",
 ]
 
-[[package]]
-name = "ckb-testtool"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5ed676eb4411676d2e507067a714905fea8842ba2e0c0ac5ede68fe350b5547"
-dependencies = [
- "ckb-always-success-script",
- "ckb-chain-spec",
- "ckb-crypto",
- "ckb-error",
- "ckb-hash",
- "ckb-jsonrpc-types",
- "ckb-resource",
- "ckb-script",
- "ckb-traits",
- "ckb-types",
- "ckb-verification",
- "lazy_static",
- "rand 0.8.5",
-]
-
 [[package]]
 name = "ckb-traits"
-version = "0.108.0"
+version = "0.111.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e9d5827f20a396dfb785398db484fe50de93d76c02e1e32287832604a9dda91"
+checksum = "2a826676c9fc70cda86e0e3d3941414a25e5abf44bfdf02accfdaa7b323148b7"
 dependencies = [
  "ckb-types",
 ]
 
 [[package]]
 name = "ckb-types"
-version = "0.108.0"
+version = "0.111.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c22b3b1ca8f88a8f48e2f73321c0605281c9c6f1e1c4d651c6138265c22291e"
+checksum = "ec1d0ef58f1c8b30ab20e0ec1f2ee448158d61250fb42da83bbc29b914581f6e"
 dependencies = [
  "bit-vec",
  "bytes",
  "ckb-channel",
+ "ckb-constant",
  "ckb-error",
  "ckb-fixed-hash",
  "ckb-hash",
@@ -598,17 +593,19 @@ dependencies = [
  "ckb-occupied-capacity",
  "ckb-rational",
  "derive_more",
+ "golomb-coded-set",
  "merkle-cbt",
  "molecule",
  "numext-fixed-uint",
  "once_cell",
+ "paste",
 ]
 
 [[package]]
 name = "ckb-util"
-version = "0.108.0"
+version = "0.111.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03d165c6958601dfbfa4cd00c9263ecfb013b4ccb6d9e1d3187bfa62801abc7d"
+checksum = "3bb839705b0f1174ad0b1d25b3fbc97e7e3d64665c29edfa1a2bb26b8071ab09"
 dependencies = [
  "linked-hash-map",
  "once_cell",
@@ -618,9 +615,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-verification"
-version = "0.108.0"
+version = "0.111.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbc1745cf02f6d628ac04cf58145b853a359ad4d74fdb418207e99773185ad11"
+checksum = "8708f6961d2adf7190d5dfc795345eae4be22e1c8560e3650102217b7478aa64"
 dependencies = [
  "ckb-chain-spec",
  "ckb-dao",
@@ -638,9 +635,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-verification-traits"
-version = "0.108.0"
+version = "0.111.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88de577410c2e72ccd18e00cb63fc0000d41be50604a895946a1566a02272730"
+checksum = "b037b67f3bc541d41e1ea059e12b5d390a8da97a1afd6156ab3b504b09efec51"
 dependencies = [
  "bitflags",
  "ckb-error",
@@ -648,9 +645,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-vm"
-version = "0.22.2"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1223acc8054ce96f91c5d99d4942898d0bdadd618c3b14f1acd3e67212991d8e"
+checksum = "d77a1ce8d1ed8b18041d194ffe0d647c3a707af9347f49b5f543317c73943634"
 dependencies = [
  "byteorder",
  "bytes",
@@ -666,9 +663,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-vm-definitions"
-version = "0.22.2"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4af800ae2b6c54b70efa398dab015a09a52eeac2dd1ac3ad32c9bbe224974225"
+checksum = "328c7a6b5664483d5c02fae7b0ada0c407660e7064b2f1505ee6f5d07a4dbf2b"
 
 [[package]]
 name = "clap"
@@ -836,6 +833,17 @@ dependencies = [
  "parking_lot_core",
 ]
 
+[[package]]
+name = "derive-getters"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0122f262bf9c9a367829da84f808d9fb128c10ef283bbe7b0922a77cf07b2747"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.99",
+]
+
 [[package]]
 name = "derive_more"
 version = "0.99.17"
@@ -865,6 +873,12 @@ dependencies = [
  "crypto-common",
 ]
 
+[[package]]
+name = "dyn-clone"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30"
+
 [[package]]
 name = "eaglesong"
 version = "0.1.0"
@@ -1149,6 +1163,15 @@ dependencies = [
  "scroll",
 ]
 
+[[package]]
+name = "golomb-coded-set"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c7076c0cd6257d84b785b0f22c36443dd47a5e86a1256d7ef82c8cb88ea9a7e"
+dependencies = [
+ "siphasher",
+]
+
 [[package]]
 name = "h2"
 version = "0.3.13"
@@ -1559,9 +1582,9 @@ dependencies = [
 
 [[package]]
 name = "molecule"
-version = "0.7.3"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edc8276c02a006bddad7d1c28c1a88f30421e1b5f0ba0ca96ceb8077c7d20c01"
+checksum = "d4fd9767ab5e5f2ea40f71ff4c8bdb633c50509052e093c2fdd0e390a749dfa3"
 dependencies = [
  "bytes",
  "cfg-if 1.0.0",
@@ -1754,6 +1777,12 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "paste"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
+
 [[package]]
 name = "path_macro"
 version = "1.0.0"
@@ -2464,7 +2493,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "ckb-system-scripts",
- "ckb-testtool 0.9.1",
+ "ckb-testtool",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index d170bde..7d00e7e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,8 @@ anyhow = "1.0"
 tera = "1.2"
 lazy_static = "1.4"
 serde = { version = "1.0", features = [ "derive" ] }
-ckb-testtool = "0.9.1"
+# TODO upgrade to crate version when it's released
+ckb-testtool = { path = "crates/testtool" }
 secp256k1 = "0.24"
 serde_json = "1.0"
 rpassword = "4.0"
@@ -38,7 +39,8 @@ chrono = { version = "0.4.24", default-features = false, features = ["std"] }
 # 0.2.3 breaks color output: https://github.com/matklad/xshell/issues/63
 xshell = "=0.2.2"
 path_macro = "1.0.0"
-ckb-sdk = "2.5.0"
+# TODO upgrade to crate version when it's released
+ckb-sdk = { git = "https://github.com/eval-exec/ckb-sdk-rust", branch = "exec/data2" }
 
 [build-dependencies]
 includedir_codegen = "0.6"
diff --git a/crates/testtool/Cargo.toml b/crates/testtool/Cargo.toml
index d07af9a..87b227e 100644
--- a/crates/testtool/Cargo.toml
+++ b/crates/testtool/Cargo.toml
@@ -13,13 +13,13 @@ repository = "https://github.com/nervosnetwork/capsule"
 ckb-always-success-script = "0.0.1"
 rand = "0.8"
 lazy_static = "1.4"
-ckb-chain-spec = "0.108.0"
-ckb-types = "0.108.0"
-ckb-error = "0.108.0"
-ckb-script = "0.108.0"
-ckb-hash = "0.108.0"
-ckb-jsonrpc-types = "0.108.0"
-ckb-crypto = "0.108.0"
-ckb-resource = "0.108.0"
-ckb-verification = "0.108.0"
-ckb-traits = "0.108.0"
+ckb-chain-spec = "0.111.0-rc3"
+ckb-types = "0.111.0-rc3"
+ckb-error = "0.111.0-rc3"
+ckb-script = "0.111.0-rc3"
+ckb-hash = "0.111.0-rc3"
+ckb-jsonrpc-types = "0.111.0-rc3"
+ckb-crypto = "0.111.0-rc3"
+ckb-resource = "0.111.0-rc3"
+ckb-verification = "0.111.0-rc3"
+ckb-traits = "0.111.0-rc3"
diff --git a/crates/testtool/src/context.rs b/crates/testtool/src/context.rs
index d490e38..f026b97 100644
--- a/crates/testtool/src/context.rs
+++ b/crates/testtool/src/context.rs
@@ -1,14 +1,15 @@
 use crate::tx_verifier::OutputsDataVerifier;
-use ckb_chain_spec::consensus::TYPE_ID_CODE_HASH;
+use ckb_chain_spec::consensus::{ConsensusBuilder, TYPE_ID_CODE_HASH};
 use ckb_error::Error as CKBError;
-use ckb_script::TransactionScriptsVerifier;
-use ckb_traits::{CellDataProvider, HeaderProvider};
+use ckb_script::{TransactionScriptsVerifier, TxVerifyEnv};
+use ckb_traits::{CellDataProvider, ExtensionProvider, HeaderProvider};
 use ckb_types::{
     bytes::Bytes,
     core::{
         cell::{CellMeta, CellMetaBuilder, ResolvedTransaction},
-        Capacity, Cycle, DepType, EpochExt, HeaderView, ScriptHashType, TransactionInfo,
-        TransactionView,
+        hardfork::{HardForks, CKB2021, CKB2023},
+        Capacity, Cycle, DepType, EpochExt, HeaderBuilder, HeaderView, ScriptHashType,
+        TransactionInfo, TransactionView,
     },
     packed::{Byte32, CellDep, CellOutput, OutPoint, Script},
     prelude::*,
@@ -48,12 +49,13 @@ pub struct Message {
 }
 
 /// Verification Context
-#[derive(Default)]
+#[derive(Clone, Default)]
 pub struct Context {
     pub cells: HashMap<OutPoint, (CellOutput, Bytes)>,
     pub transaction_infos: HashMap<OutPoint, TransactionInfo>,
     pub headers: HashMap<Byte32, HeaderView>,
     pub epoches: HashMap<Byte32, EpochExt>,
+    pub block_extensions: HashMap<Byte32, Bytes>,
     pub cells_by_data_hash: HashMap<Byte32, OutPoint>,
     pub cells_by_type_hash: HashMap<Byte32, OutPoint>,
     capture_debug: bool,
@@ -183,7 +185,7 @@ impl Context {
     ) -> Option<Script> {
         let (cell, contract_data) = self.cells.get(out_point)?;
         let code_hash = match hash_type {
-            ScriptHashType::Data | ScriptHashType::Data1 => {
+            ScriptHashType::Data | ScriptHashType::Data1 | ScriptHashType::Data2 => {
                 CellOutput::calc_data_hash(contract_data)
             }
             ScriptHashType::Type => cell
@@ -210,7 +212,7 @@ impl Context {
         let out_point = match ScriptHashType::try_from(u8::from(script.hash_type()))
             .expect("invalid script hash type")
         {
-            ScriptHashType::Data | ScriptHashType::Data1 => self
+            ScriptHashType::Data | ScriptHashType::Data1 | ScriptHashType::Data2 => self
                 .get_cell_by_data_hash(&script.code_hash())
                 .expect("find contract out point by data_hash"),
             ScriptHashType::Type => self
@@ -333,7 +335,20 @@ impl Context {
     pub fn verify_tx(&self, tx: &TransactionView, max_cycles: u64) -> Result<Cycle, CKBError> {
         self.verify_tx_consensus(tx)?;
         let resolved_tx = self.build_resolved_tx(tx);
-        let mut verifier = TransactionScriptsVerifier::new(&resolved_tx, self);
+        let consensus = ConsensusBuilder::default()
+            .hardfork_switch(HardForks {
+                ckb2021: CKB2021::new_dev_default(),
+                ckb2023: CKB2023::new_dev_default(),
+            })
+            .build();
+        let tip = HeaderBuilder::default().number(0.pack()).build();
+        let tx_verify_env = TxVerifyEnv::new_submit(&tip);
+        let mut verifier = TransactionScriptsVerifier::new(
+            Arc::new(resolved_tx),
+            self.clone(),
+            Arc::new(consensus),
+            Arc::new(tx_verify_env),
+        );
         if self.capture_debug {
             let captured_messages = self.captured_messages.clone();
             verifier.set_debug_printer(move |id, message| {
@@ -380,3 +395,12 @@ impl HeaderProvider for Context {
         self.headers.get(block_hash).cloned()
     }
 }
+
+impl ExtensionProvider for Context {
+    fn get_block_extension(
+        &self,
+        hash: &ckb_types::packed::Byte32,
+    ) -> Option<ckb_types::packed::Bytes> {
+        self.block_extensions.get(hash).map(|b| b.pack())
+    }
+}
diff --git a/src/wallet/wallet.rs b/src/wallet/wallet.rs
index fecd85c..072145b 100644
--- a/src/wallet/wallet.rs
+++ b/src/wallet/wallet.rs
@@ -243,7 +243,7 @@ impl Wallet {
     }
 
     pub fn lock_script(&self) -> packed::Script {
-        self.address().payload().into()
+        (&self.address).into()
     }
 
     pub fn address(&self) -> &Address {

From 4019570618e61332f4a5c983525ded8f2b23b67e Mon Sep 17 00:00:00 2001
From: quake <quake.wang@gmail.com>
Date: Fri, 3 Nov 2023 13:14:33 +0900
Subject: [PATCH 2/3] chore: upgrade crate version and rust toolchain

---
 Cargo.lock                 | 137 +++++++++++++++++++++----------------
 crates/testtool/Cargo.toml |  22 +++---
 rust-toolchain             |   2 +-
 3 files changed, 90 insertions(+), 71 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0b2327a..e5d9586 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -86,9 +86,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "blake2b-ref"
-version = "0.2.1"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95916998c798756098a4eb1b3f2cd510659705a9817bf203d61abd30fbec3e7b"
+checksum = "294d17c72e0ba59fad763caa112368d0672083779cdebbb97164f4bb4c1e339a"
 
 [[package]]
 name = "blake2b-rs"
@@ -231,9 +231,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-chain-spec"
-version = "0.111.0-rc3"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "914d19f00dc311454ff0c7a093022e0d24d1975d3d63cf83b83c2fefbc29aa7a"
+checksum = "dbd58081d4ac4f08d068b52c5a07f0b379d93aad0dfa8344c6890429a9b73c2b"
 dependencies = [
  "ckb-constant",
  "ckb-crypto",
@@ -253,24 +253,24 @@ dependencies = [
 
 [[package]]
 name = "ckb-channel"
-version = "0.111.0-rc3"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bc442217b1c1018e363bfae180154b3f12b0d05848393e63d5b21000dd4aa57"
+checksum = "701e6829c3dcbae46dd2442de63d080046480a6c2bb4951dbf419ad092459402"
 dependencies = [
  "crossbeam-channel",
 ]
 
 [[package]]
 name = "ckb-constant"
-version = "0.111.0-rc3"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c7021efc10b6ba265914d420b40cdf0244b8552d4993591bf3642e7fbdf328d"
+checksum = "9d5c980d4724770f72a37bceffa26ea64dd914891e45e856e2a3792fdb4a5a18"
 
 [[package]]
 name = "ckb-crypto"
-version = "0.111.0-rc3"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6d15ac1ad1d2e4ce0a1736dfbea12a9a105c4759c1a3bfc59f5f3e41e16451"
+checksum = "df80db694e42b64a5774ae551daff3c8310cd99bb528643dbe0dd409abb298e7"
 dependencies = [
  "ckb-fixed-hash",
  "faster-hex",
@@ -282,9 +282,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-dao"
-version = "0.111.0-rc3"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c28e41410b9a30d3fddce1d02416802a2fb032ee33b0dab857c2f3f63d1e7b4"
+checksum = "76cb0dd4d284d6908595fa809668555ad36bc89538ea9440d11208090481c240"
 dependencies = [
  "byteorder",
  "ckb-chain-spec",
@@ -295,9 +295,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-dao-utils"
-version = "0.111.0-rc3"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "377c5ab17385d8d5ec50df92de45c7f085168d6890a11a09847e009c4bce872d"
+checksum = "5e158ce5a4e9d1fcd08d9dee87332474572c629c6273cca0aea80ba24892a403"
 dependencies = [
  "byteorder",
  "ckb-error",
@@ -306,9 +306,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-error"
-version = "0.111.0-rc3"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df4a3674e91621afeffe58ef28c064a6a2b669f002858c1fa203b80bec70fcba"
+checksum = "34cfd733cabcb4262ee679c02733864b13c8fa879e3aabc078fe0ec727cd95d6"
 dependencies = [
  "anyhow",
  "ckb-occupied-capacity",
@@ -318,9 +318,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-fixed-hash"
-version = "0.111.0-rc3"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb903061e35719d4d65417f742eb5d789c0e4351df3355ed155309e739f0c14e"
+checksum = "3b1dfab045fffa31cae9680d73e1f09833ca1abfb807dc4b9544739c94c23fd0"
 dependencies = [
  "ckb-fixed-hash-core",
  "ckb-fixed-hash-macros",
@@ -328,9 +328,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-fixed-hash-core"
-version = "0.111.0-rc3"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72a75aa0482ad3561fa8bd57adede6ae26befcedbc407fa287b6371799152545"
+checksum = "bdd1727a6ecd4d0bcab604cb1ef707fe92e939fa6e9a438f9f25bf05208cb080"
 dependencies = [
  "faster-hex",
  "serde",
@@ -339,9 +339,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-fixed-hash-macros"
-version = "0.111.0-rc3"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9089e5638b6b51e7935abe6a7c8f7e840d1824fe4f9f7e22e29339d73bc9a04"
+checksum = "7b5da34c32585c35715fcde4e3a1dd3b0346d7af43506c5e51c613f01483e4f9"
 dependencies = [
  "ckb-fixed-hash-core",
  "proc-macro2",
@@ -349,11 +349,26 @@ dependencies = [
  "syn 1.0.99",
 ]
 
+[[package]]
+name = "ckb-gen-types"
+version = "0.111.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3bc54ca99b09e1eb5fc6c49bb1156644ce57fce9c6f52b5c13110b9a3143f7e"
+dependencies = [
+ "cfg-if 1.0.0",
+ "ckb-error",
+ "ckb-fixed-hash",
+ "ckb-hash",
+ "ckb-occupied-capacity",
+ "molecule",
+ "numext-fixed-uint",
+]
+
 [[package]]
 name = "ckb-hash"
-version = "0.111.0-rc3"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbcec03eafd9d000536e9394b1a926e0d4a0c085f6c16b18e6c8d8f066be1967"
+checksum = "8c88e5e2d6454be488fa5cf8b49175879353c6af969ff210dd6416f315b53120"
 dependencies = [
  "blake2b-ref",
  "blake2b-rs",
@@ -361,9 +376,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-jsonrpc-types"
-version = "0.111.0-rc3"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc552372cbc6f7e662c855abcc605a13288702df4d35cb07f99e34ea77a62e97"
+checksum = "d789a71538da07871c11aecbd28d6c632bb426bdfeed5fc2fa1b455e31152468"
 dependencies = [
  "ckb-types",
  "faster-hex",
@@ -373,9 +388,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-logger"
-version = "0.111.0-rc3"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f250efe7a60f5e07fad6ef9f65f67ebf54e4ec3759d442bca0b315af04eb131e"
+checksum = "939fa09ca3534248d3d452552546f016fc7e11346644fbc5b55d2ad38d3e80e7"
 dependencies = [
  "log",
 ]
@@ -403,9 +418,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-occupied-capacity"
-version = "0.111.0-rc3"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e9a7454c709f62a3c02b283ac83cd99da166cec40e92a62f97448bcc14b0fbc"
+checksum = "358ad364465a5a359575642c12952ba8735a148382789d65ddd5231cd21899fc"
 dependencies = [
  "ckb-occupied-capacity-core",
  "ckb-occupied-capacity-macros",
@@ -413,18 +428,18 @@ dependencies = [
 
 [[package]]
 name = "ckb-occupied-capacity-core"
-version = "0.111.0-rc3"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b3ba5a640d03b280496ac846da691ae9b02dd4e9f87ca28e5dde0752747e6b"
+checksum = "de2dc06db98f8a995cb7145bc56dbd17bb0c8ab2e59a07aaa40f2c956c2451dd"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "ckb-occupied-capacity-macros"
-version = "0.111.0-rc3"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0277ace1a5f15cc2f423954abb34205e3ef5d647642469ea19d6e9b1ddbe0e"
+checksum = "b1709e0f101026c4ef29b1593692e480b03cdb4e0dace1e348494c6554d50d35"
 dependencies = [
  "ckb-occupied-capacity-core",
  "quote",
@@ -433,9 +448,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-pow"
-version = "0.111.0-rc3"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b70f5befc83607d0dbae93a09c6bc3d1717d7d79db0b4581996394ae4c57a0a"
+checksum = "481e76388993d7e6e0dd797e8532c60398901787e28d0638ca114254257b8813"
 dependencies = [
  "byteorder",
  "ckb-hash",
@@ -447,9 +462,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-rational"
-version = "0.111.0-rc3"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4339d4d36412cda4ae4b73c61a90bc2eee56fd07f961b68f3132441d66c5ae1"
+checksum = "bd3959391a4fb05d6a2578aa8db75732ada1ce381fb34d6eeaf09d395702e63c"
 dependencies = [
  "numext-fixed-uint",
  "serde",
@@ -457,9 +472,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-resource"
-version = "0.111.0-rc3"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0ea4fa023ba08d6a8e8a1ad8128add5ceb5a6845f94e7e378e0f40408c4ccb8"
+checksum = "03222b0613cf3f55cb181471d7a84879b6fba5e920e2e1c7ba2c2315614bd387"
 dependencies = [
  "ckb-system-scripts",
  "ckb-types",
@@ -472,9 +487,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-script"
-version = "0.111.0-rc3"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de268eb8f453eac53790e89916d612ea02110a5f21c2458555d1d4c6e2fc720c"
+checksum = "8c9075ad901eae97925f491b6be675d7b19bf7b10eaa94a88f6e8070c0cd00ba"
 dependencies = [
  "byteorder",
  "ckb-chain-spec",
@@ -544,13 +559,13 @@ dependencies = [
 
 [[package]]
 name = "ckb-systemtime"
-version = "0.111.0-rc3"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5191e258aff4cbf90357dd1525ffa683115b5430ac44b4d8f247aafcb0ade7b"
+checksum = "d5c03dd01263a66eaf171fb1bbadd12d80a0b54abe19aa55a2c53c5ae3300cda"
 
 [[package]]
 name = "ckb-testtool"
-version = "0.9.1"
+version = "0.10.0"
 dependencies = [
  "ckb-always-success-script",
  "ckb-chain-spec",
@@ -569,18 +584,18 @@ dependencies = [
 
 [[package]]
 name = "ckb-traits"
-version = "0.111.0-rc3"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a826676c9fc70cda86e0e3d3941414a25e5abf44bfdf02accfdaa7b323148b7"
+checksum = "ca049aba2cb2d1208c6044accb497b17290ad56de629f6a4b95eded67a43fd40"
 dependencies = [
  "ckb-types",
 ]
 
 [[package]]
 name = "ckb-types"
-version = "0.111.0-rc3"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec1d0ef58f1c8b30ab20e0ec1f2ee448158d61250fb42da83bbc29b914581f6e"
+checksum = "b6ec737e4957418bbd0f4091e8565a89bbd8f6fc37a20360820e44d1f1e44e58"
 dependencies = [
  "bit-vec",
  "bytes",
@@ -588,6 +603,7 @@ dependencies = [
  "ckb-constant",
  "ckb-error",
  "ckb-fixed-hash",
+ "ckb-gen-types",
  "ckb-hash",
  "ckb-merkle-mountain-range",
  "ckb-occupied-capacity",
@@ -603,9 +619,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-util"
-version = "0.111.0-rc3"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bb839705b0f1174ad0b1d25b3fbc97e7e3d64665c29edfa1a2bb26b8071ab09"
+checksum = "011b907b18aa706fc224a1309f14eadd9cc14c42cf2258ca3010d1324bc20f10"
 dependencies = [
  "linked-hash-map",
  "once_cell",
@@ -615,9 +631,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-verification"
-version = "0.111.0-rc3"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8708f6961d2adf7190d5dfc795345eae4be22e1c8560e3650102217b7478aa64"
+checksum = "fe3338bb8cf49c5a21de636eeb448deeba1e379491d34b67f2201fc77a08e215"
 dependencies = [
  "ckb-chain-spec",
  "ckb-dao",
@@ -635,9 +651,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-verification-traits"
-version = "0.111.0-rc3"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b037b67f3bc541d41e1ea059e12b5d390a8da97a1afd6156ab3b504b09efec51"
+checksum = "ba1bbfdeff1f930f26c60103b59442494dba83493254bb255f1ba318be2f27fe"
 dependencies = [
  "bitflags",
  "ckb-error",
@@ -645,9 +661,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-vm"
-version = "0.24.0"
+version = "0.24.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d77a1ce8d1ed8b18041d194ffe0d647c3a707af9347f49b5f543317c73943634"
+checksum = "0cc004a826b9bc9319ffae0b8415690e1b5f1482266d55fbd43843aa40ddcd63"
 dependencies = [
  "byteorder",
  "bytes",
@@ -663,9 +679,12 @@ dependencies = [
 
 [[package]]
 name = "ckb-vm-definitions"
-version = "0.24.0"
+version = "0.24.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "328c7a6b5664483d5c02fae7b0ada0c407660e7064b2f1505ee6f5d07a4dbf2b"
+checksum = "c4ced3ff9d79b53d93c106720f6c1f855694290e33581850e05c859500eee83f"
+dependencies = [
+ "paste",
+]
 
 [[package]]
 name = "clap"
diff --git a/crates/testtool/Cargo.toml b/crates/testtool/Cargo.toml
index 87b227e..e3512d1 100644
--- a/crates/testtool/Cargo.toml
+++ b/crates/testtool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ckb-testtool"
-version = "0.9.1"
+version = "0.10.0"
 authors = ["Nervos Network"]
 edition = "2021"
 license = "MIT"
@@ -13,13 +13,13 @@ repository = "https://github.com/nervosnetwork/capsule"
 ckb-always-success-script = "0.0.1"
 rand = "0.8"
 lazy_static = "1.4"
-ckb-chain-spec = "0.111.0-rc3"
-ckb-types = "0.111.0-rc3"
-ckb-error = "0.111.0-rc3"
-ckb-script = "0.111.0-rc3"
-ckb-hash = "0.111.0-rc3"
-ckb-jsonrpc-types = "0.111.0-rc3"
-ckb-crypto = "0.111.0-rc3"
-ckb-resource = "0.111.0-rc3"
-ckb-verification = "0.111.0-rc3"
-ckb-traits = "0.111.0-rc3"
+ckb-chain-spec = "0.111.0"
+ckb-types = "0.111.0"
+ckb-error = "0.111.0"
+ckb-script = "0.111.0"
+ckb-hash = "0.111.0"
+ckb-jsonrpc-types = "0.111.0"
+ckb-crypto = "0.111.0"
+ckb-resource = "0.111.0"
+ckb-verification = "0.111.0"
+ckb-traits = "0.111.0"
diff --git a/rust-toolchain b/rust-toolchain
index 5deab58..68bc7ff 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-1.68.2
+1.71.1

From b6589c1508d68177b47b58c48a07d651c53174a0 Mon Sep 17 00:00:00 2001
From: quake <quake.wang@gmail.com>
Date: Fri, 3 Nov 2023 13:28:11 +0900
Subject: [PATCH 3/3] chore: use published crate

---
 Cargo.lock                               | 34 +++++++++++++++++++-----
 Cargo.toml                               |  6 ++---
 templates/rust/tests/Cargo-manifest.toml |  2 +-
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e5d9586..5afb4b4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -205,7 +205,7 @@ dependencies = [
  "atty",
  "chrono",
  "ckb-sdk",
- "ckb-testtool",
+ "ckb-testtool 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap",
  "ctrlc",
  "env_logger",
@@ -407,13 +407,13 @@ dependencies = [
 [[package]]
 name = "ckb-mock-tx-types"
 version = "0.111.0"
-source = "git+https://github.com/cryptape/ckb-mock-tx-types?branch=exec/bump-0.111.0#0c9ba51eccff289ed83615378c0d62d5fb7a1fd9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcd5b156c36f03ad6053e174e26a874088c8e9098c3a2e80ec93dc9831ecfac3"
 dependencies = [
  "ckb-jsonrpc-types",
  "ckb-traits",
  "ckb-types",
  "serde",
- "serde_derive",
 ]
 
 [[package]]
@@ -505,8 +505,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-sdk"
-version = "2.6.0"
-source = "git+https://github.com/eval-exec/ckb-sdk-rust?branch=exec/data2#f5d0bd598ba4d92e101a4163b65ea6beaac4b2ce"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "718c12dee9e39d9e438a6cc6da0168ac83ca8dc17ace32ce08a2568d4b574398"
 dependencies = [
  "anyhow",
  "bech32",
@@ -582,6 +583,27 @@ dependencies = [
  "rand 0.8.5",
 ]
 
+[[package]]
+name = "ckb-testtool"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61f7426eb44c6cfc703a68fb99c74b675a378fdca12df5af94683b27a60d377e"
+dependencies = [
+ "ckb-always-success-script",
+ "ckb-chain-spec",
+ "ckb-crypto",
+ "ckb-error",
+ "ckb-hash",
+ "ckb-jsonrpc-types",
+ "ckb-resource",
+ "ckb-script",
+ "ckb-traits",
+ "ckb-types",
+ "ckb-verification",
+ "lazy_static",
+ "rand 0.8.5",
+]
+
 [[package]]
 name = "ckb-traits"
 version = "0.111.0"
@@ -2512,7 +2534,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "ckb-system-scripts",
- "ckb-testtool",
+ "ckb-testtool 0.10.0",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 7d00e7e..f5869d5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,8 +17,7 @@ anyhow = "1.0"
 tera = "1.2"
 lazy_static = "1.4"
 serde = { version = "1.0", features = [ "derive" ] }
-# TODO upgrade to crate version when it's released
-ckb-testtool = { path = "crates/testtool" }
+ckb-testtool = "0.10"
 secp256k1 = "0.24"
 serde_json = "1.0"
 rpassword = "4.0"
@@ -39,8 +38,7 @@ chrono = { version = "0.4.24", default-features = false, features = ["std"] }
 # 0.2.3 breaks color output: https://github.com/matklad/xshell/issues/63
 xshell = "=0.2.2"
 path_macro = "1.0.0"
-# TODO upgrade to crate version when it's released
-ckb-sdk = { git = "https://github.com/eval-exec/ckb-sdk-rust", branch = "exec/data2" }
+ckb-sdk = "3.0"
 
 [build-dependencies]
 includedir_codegen = "0.6"
diff --git a/templates/rust/tests/Cargo-manifest.toml b/templates/rust/tests/Cargo-manifest.toml
index 72939fe..454447c 100644
--- a/templates/rust/tests/Cargo-manifest.toml
+++ b/templates/rust/tests/Cargo-manifest.toml
@@ -6,4 +6,4 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ckb-testtool = "0.9"
+ckb-testtool = "0.10"