diff --git a/.github/workflows/riscv64.yml b/.github/workflows/riscv64.yml new file mode 100644 index 0000000..bed522b --- /dev/null +++ b/.github/workflows/riscv64.yml @@ -0,0 +1,48 @@ +name: RISC-V 64 Test + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +env: + CARGO_TERM_COLOR: always + +jobs: + qemu-riscv64: + runs-on: ubuntu-24.04 + permissions: + contents: read + steps: + - uses: actions/checkout@v3 + + - name: Install Rust + uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: 1.92.0 + override: true + + - name: Cache Rust dependencies + uses: actions/cache@v3 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + target + key: ${{ runner.os }}-riscv64-cargo-${{ hashFiles('**/Cargo.lock') }} + + - name: Setup RISC-V environment + run: | + sudo apt-get update -y + sudo apt install -y gcc-riscv64-linux-gnu \ + qemu-user-static + rustup target add riscv64gc-unknown-linux-gnu + + - name: Run + run: | + export CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_LINKER=riscv64-linux-gnu-gcc + export CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_RUSTFLAGS="-C link-args=-L -C link-args=/usr/lib/gcc-cross/riscv64-linux-gnu/13" + export CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_RUNNER="setarch linux64 --addr-no-randomize qemu-riscv64-static -L /usr/riscv64-linux-gnu" + cargo run --release --target riscv64gc-unknown-linux-gnu diff --git a/Cargo.lock b/Cargo.lock index a828575..6a92336 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,48 +1,24 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] -name = "addr2line" -version = "0.22.0" +name = "adler2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" [[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "backtrace" -version = "0.3.73" +name = "arrayvec" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "base64" @@ -56,11 +32,27 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +[[package]] +name = "bitcoin-io" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dee39a0ee5b4095224a0cfc6bf4cc1baf0f9624b96b367e53b66d974e51d953" + +[[package]] +name = "bitcoin_hashes" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26ec84b80c482df901772e931a9a681e26a1b9ee2302edeff23cb30328745c8b" +dependencies = [ + "bitcoin-io", + "hex-conservative", +] + [[package]] name = "bitflags" -version = "2.6.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" [[package]] name = "blake2b-ref" @@ -95,18 +87,18 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.1" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" +checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" dependencies = [ "serde", ] [[package]] name = "cacache" -version = "12.0.0" +version = "13.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "142316461ed3a3dfcba10417317472da5bfd0461e4d276bf7c07b330766d9490" +checksum = "5c5063741c7b2e260bbede781cf4679632dd90e2718e99f7715e46824b65670b" dependencies = [ "digest", "either", @@ -131,94 +123,87 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.5" +version = "1.2.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052" +checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2" +dependencies = [ + "find-msvc-tools", + "shlex", +] [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "ckb-chain-spec" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ "cacache", - "ckb-constant 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-crypto 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-dao-utils 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-error 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-jsonrpc-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-logger 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-pow 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-rational 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-resource 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-traits 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", + "ckb-constant 1.0.0", + "ckb-crypto 1.0.0", + "ckb-dao-utils 1.0.1", + "ckb-error 1.0.1", + "ckb-hash 1.0.0", + "ckb-jsonrpc-types 1.0.1", + "ckb-logger 1.0.0", + "ckb-pow 1.0.1", + "ckb-rational 1.0.1", + "ckb-resource 1.0.1", + "ckb-traits 1.0.1", + "ckb-types 1.0.1", "serde", "toml", ] [[package]] name = "ckb-chain-spec" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ "cacache", - "ckb-constant 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-crypto 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-dao-utils 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-error 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-jsonrpc-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-logger 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-pow 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-rational 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-resource 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-traits 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", + "ckb-constant 1.0.1", + "ckb-crypto 1.0.1", + "ckb-dao-utils 1.0.2", + "ckb-error 1.0.2", + "ckb-hash 1.0.1", + "ckb-jsonrpc-types 1.0.2", + "ckb-logger 1.0.1", + "ckb-pow 1.0.2", + "ckb-rational 1.0.2", + "ckb-resource 1.0.2", + "ckb-traits 1.0.2", + "ckb-types 1.0.2", "serde", "toml", ] [[package]] -name = "ckb-channel" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +name = "ckb-constant" +version = "1.0.0" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ - "crossbeam-channel", + "phf 0.12.1", ] [[package]] -name = "ckb-channel" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +name = "ckb-constant" +version = "1.0.1" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ - "crossbeam-channel", + "phf 0.12.1", ] -[[package]] -name = "ckb-constant" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" - -[[package]] -name = "ckb-constant" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" - [[package]] name = "ckb-crypto" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.0" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ - "ckb-fixed-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", + "ckb-fixed-hash 1.0.1", "faster-hex", - "lazy_static", "rand 0.8.5", "secp256k1", "thiserror", @@ -226,12 +211,11 @@ dependencies = [ [[package]] name = "ckb-crypto" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.1" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ - "ckb-fixed-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", + "ckb-fixed-hash 1.0.2", "faster-hex", - "lazy_static", "rand 0.8.5", "secp256k1", "thiserror", @@ -239,68 +223,68 @@ dependencies = [ [[package]] name = "ckb-dao-utils" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ "byteorder", - "ckb-error 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", + "ckb-error 1.0.1", + "ckb-types 1.0.1", ] [[package]] name = "ckb-dao-utils" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ "byteorder", - "ckb-error 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", + "ckb-error 1.0.2", + "ckb-types 1.0.2", ] [[package]] name = "ckb-error" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ "anyhow", - "ckb-occupied-capacity 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "derive_more", + "ckb-occupied-capacity 1.0.1", + "derive_more 1.0.0", "thiserror", ] [[package]] name = "ckb-error" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ "anyhow", - "ckb-occupied-capacity 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "derive_more", + "ckb-occupied-capacity 1.0.2", + "derive_more 1.0.0", "thiserror", ] [[package]] name = "ckb-fixed-hash" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ - "ckb-fixed-hash-core 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-fixed-hash-macros 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", + "ckb-fixed-hash-core 1.0.1", + "ckb-fixed-hash-macros 1.0.0", ] [[package]] name = "ckb-fixed-hash" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ - "ckb-fixed-hash-core 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-fixed-hash-macros 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", + "ckb-fixed-hash-core 1.0.2", + "ckb-fixed-hash-macros 1.0.1", ] [[package]] name = "ckb-fixed-hash-core" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ "ckb_schemars", "faster-hex", @@ -310,8 +294,8 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-core" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ "ckb_schemars", "faster-hex", @@ -321,58 +305,62 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-macros" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.0" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ - "ckb-fixed-hash-core 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", + "ckb-fixed-hash-core 1.0.1", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.117", ] [[package]] name = "ckb-fixed-hash-macros" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.1" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ - "ckb-fixed-hash-core 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", + "ckb-fixed-hash-core 1.0.2", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.117", ] [[package]] name = "ckb-gen-types" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ "cfg-if", - "ckb-error 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-fixed-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-occupied-capacity 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "molecule", + "ckb-error 1.0.1", + "ckb-fixed-hash 1.0.1", + "ckb-hash 1.0.0", + "ckb-occupied-capacity 1.0.1", + "molecule 0.8.0", "numext-fixed-uint", + "seq-macro", + "strum", ] [[package]] name = "ckb-gen-types" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ "cfg-if", - "ckb-error 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-fixed-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-occupied-capacity 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "molecule", + "ckb-error 1.0.2", + "ckb-fixed-hash 1.0.2", + "ckb-hash 1.0.1", + "ckb-occupied-capacity 1.0.2", + "molecule 0.9.2", "numext-fixed-uint", + "seq-macro", + "strum", ] [[package]] name = "ckb-hash" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.0" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ "blake2b-ref", "blake2b-rs", @@ -380,8 +368,8 @@ dependencies = [ [[package]] name = "ckb-hash" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.1" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ "blake2b-ref", "blake2b-rs", @@ -389,40 +377,42 @@ dependencies = [ [[package]] name = "ckb-jsonrpc-types" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", + "ckb-types 1.0.1", "ckb_schemars", "faster-hex", + "seq-macro", "serde", "serde_json", ] [[package]] name = "ckb-jsonrpc-types" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", + "ckb-types 1.0.2", "ckb_schemars", "faster-hex", + "seq-macro", "serde", "serde_json", ] [[package]] name = "ckb-logger" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.0" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ "log", ] [[package]] name = "ckb-logger" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.1" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ "log", ] @@ -438,66 +428,66 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ - "ckb-occupied-capacity-core 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-occupied-capacity-macros 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", + "ckb-occupied-capacity-core 1.0.0", + "ckb-occupied-capacity-macros 1.0.1", ] [[package]] name = "ckb-occupied-capacity" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ - "ckb-occupied-capacity-core 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-occupied-capacity-macros 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", + "ckb-occupied-capacity-core 1.0.1", + "ckb-occupied-capacity-macros 1.0.2", ] [[package]] name = "ckb-occupied-capacity-core" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.0" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ "serde", ] [[package]] name = "ckb-occupied-capacity-core" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.1" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ "serde", ] [[package]] name = "ckb-occupied-capacity-macros" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ - "ckb-occupied-capacity-core 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", + "ckb-occupied-capacity-core 1.0.0", "quote", - "syn 1.0.109", + "syn 2.0.117", ] [[package]] name = "ckb-occupied-capacity-macros" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ - "ckb-occupied-capacity-core 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", + "ckb-occupied-capacity-core 1.0.1", "quote", - "syn 1.0.109", + "syn 2.0.117", ] [[package]] name = "ckb-pow" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ "byteorder", - "ckb-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", + "ckb-hash 1.0.0", + "ckb-types 1.0.1", "eaglesong", "log", "serde", @@ -505,12 +495,12 @@ dependencies = [ [[package]] name = "ckb-pow" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ "byteorder", - "ckb-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", + "ckb-hash 1.0.1", + "ckb-types 1.0.2", "eaglesong", "log", "serde", @@ -518,8 +508,8 @@ dependencies = [ [[package]] name = "ckb-rational" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ "numext-fixed-uint", "serde", @@ -527,8 +517,8 @@ dependencies = [ [[package]] name = "ckb-rational" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ "numext-fixed-uint", "serde", @@ -536,44 +526,44 @@ dependencies = [ [[package]] name = "ckb-resource" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ "ckb-system-scripts", - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", + "ckb-types 1.0.1", "includedir", "includedir_codegen", - "phf", + "phf 0.8.0", "serde", "walkdir", ] [[package]] name = "ckb-resource" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ "ckb-system-scripts", - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", + "ckb-types 1.0.2", "includedir", "includedir_codegen", - "phf", + "phf 0.8.0", "serde", "walkdir", ] [[package]] name = "ckb-script" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ "byteorder", - "ckb-chain-spec 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-error 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-traits 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-vm", + "ckb-chain-spec 1.0.1", + "ckb-error 1.0.1", + "ckb-hash 1.0.0", + "ckb-traits 1.0.1", + "ckb-types 1.0.1", + "ckb-vm 0.24.14", "faster-hex", "serde", "tokio", @@ -581,18 +571,19 @@ dependencies = [ [[package]] name = "ckb-script" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ "byteorder", - "ckb-chain-spec 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-error 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-traits 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-vm", + "ckb-chain-spec 1.0.2", + "ckb-error 1.0.2", + "ckb-hash 1.0.1", + "ckb-traits 1.0.2", + "ckb-types 1.0.2", + "ckb-vm 0.24.0", "faster-hex", "serde", + "tokio", ] [[package]] @@ -605,86 +596,98 @@ dependencies = [ "faster-hex", "includedir", "includedir_codegen", - "phf", + "phf 0.8.0", ] [[package]] name = "ckb-traits" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", + "ckb-types 1.0.1", ] [[package]] name = "ckb-traits" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", + "ckb-types 1.0.2", ] [[package]] name = "ckb-types" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ "bit-vec", "bytes", - "ckb-channel 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-constant 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-error 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-fixed-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-gen-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", + "ckb-constant 1.0.0", + "ckb-error 1.0.1", + "ckb-fixed-hash 1.0.1", + "ckb-gen-types 1.0.1", + "ckb-hash 1.0.0", "ckb-merkle-mountain-range", - "ckb-occupied-capacity 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-rational 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "derive_more", + "ckb-occupied-capacity 1.0.1", + "ckb-rational 1.0.1", + "derive_more 1.0.0", "golomb-coded-set", "merkle-cbt", - "molecule", + "molecule 0.8.0", "numext-fixed-uint", - "once_cell", "paste", ] [[package]] name = "ckb-types" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ "bit-vec", "bytes", - "ckb-channel 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-constant 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-error 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-fixed-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-gen-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", + "ckb-constant 1.0.1", + "ckb-error 1.0.2", + "ckb-fixed-hash 1.0.2", + "ckb-gen-types 1.0.2", + "ckb-hash 1.0.1", "ckb-merkle-mountain-range", - "ckb-occupied-capacity 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-rational 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "derive_more", + "ckb-occupied-capacity 1.0.2", + "ckb-rational 1.0.2", + "derive_more 1.0.0", "golomb-coded-set", "merkle-cbt", - "molecule", + "molecule 0.9.2", "numext-fixed-uint", - "once_cell", "paste", ] [[package]] name = "ckb-vm" -version = "0.24.12" +version = "0.24.0" +source = "git+https://github.com/mohanson-fork/ckb-vm?branch=asm_rv64im#ba23062fb6aff4b5ed7cf053913d1c487e020517" +dependencies = [ + "byteorder", + "bytes", + "cc", + "ckb-vm-definitions 0.24.0", + "derive_more 1.0.0", + "goblin 0.2.3", + "goblin 0.4.0", + "scroll", + "serde", +] + +[[package]] +name = "ckb-vm" +version = "0.24.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddff96029d3298cb630e95f29d4b9a93384e938a0b75758684aa8794b53bdd1a" +checksum = "ad137e2f1c9a363ce19a883a2113b1dfcc00a936945e34b62e3726c49e7171fb" dependencies = [ "byteorder", "bytes", "cc", - "ckb-vm-definitions", - "derive_more", + "ckb-vm-definitions 0.24.14", + "derive_more 0.99.20", "goblin 0.2.3", "goblin 0.4.0", "rand 0.7.3", @@ -694,18 +697,26 @@ dependencies = [ [[package]] name = "ckb-vm-definitions" -version = "0.24.12" +version = "0.24.0" +source = "git+https://github.com/mohanson-fork/ckb-vm?branch=asm_rv64im#ba23062fb6aff4b5ed7cf053913d1c487e020517" +dependencies = [ + "pastey", +] + +[[package]] +name = "ckb-vm-definitions" +version = "0.24.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c280bf1d589d23ab0358f58601c2187fc6be86a131644583ef72ea96a0a13ddd" +checksum = "0b436017fd6676bea413d54e07a5a9cc1d7c4b5c02e4ab07d3527225a5de6677" dependencies = [ "paste", ] [[package]] name = "ckb_schemars" -version = "0.8.19" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21f99fca82a4eb8708e406e99246987b087ecc1e1babeece1a0b1d5238b1750" +checksum = "c37520aaae28169f4b29cd754f414d01ef32b8209c85d4473bc89d760250b990" dependencies = [ "ckb_schemars_derive", "dyn-clone", @@ -715,9 +726,9 @@ dependencies = [ [[package]] name = "ckb_schemars_derive" -version = "0.8.19" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40c813b4fadbdd9f33b1cf02a1ddfa9537d955c8d2fbe150d1fc1684dbf78e73" +checksum = "1506d63311ded0645342c052b1eb21ba272177b32f55d8eb7e11255aed3e74c6" dependencies = [ "proc-macro2", "quote", @@ -732,43 +743,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] -name = "cpufeatures" -version = "0.2.12" +name = "convert_case" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" dependencies = [ - "libc", + "unicode-segmentation", ] [[package]] -name = "crc32fast" -version = "1.4.2" +name = "cpufeatures" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" dependencies = [ - "cfg-if", + "libc", ] [[package]] -name = "crossbeam-channel" -version = "0.5.13" +name = "crc32fast" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" dependencies = [ - "crossbeam-utils", + "cfg-if", ] -[[package]] -name = "crossbeam-utils" -version = "0.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - [[package]] name = "crypto-common" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" dependencies = [ "generic-array", "typenum", @@ -782,15 +787,37 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" [[package]] name = "derive_more" -version = "0.99.18" +version = "0.99.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f" dependencies = [ - "convert_case", + "convert_case 0.4.0", "proc-macro2", "quote", "rustc_version", - "syn 2.0.71", + "syn 2.0.117", +] + +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "convert_case 0.6.0", + "proc-macro2", + "quote", + "syn 2.0.117", + "unicode-xid", ] [[package]] @@ -805,9 +832,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.17" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" +checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" [[package]] name = "eaglesong" @@ -817,15 +844,21 @@ checksum = "8d978bd5d343e8ab9b5c0fc8d93ff9c602fdc96616ffff9c05ac7a155419b824" [[package]] name = "either" -version = "1.13.0" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + +[[package]] +name = "equivalent" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", "windows-sys", @@ -839,25 +872,37 @@ checksum = "51e2ce894d53b295cf97b05685aa077950ff3e8541af83217fc720a6437169f8" [[package]] name = "fastrand" -version = "2.1.0" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" + +[[package]] +name = "find-msvc-tools" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" [[package]] name = "flate2" -version = "1.0.30" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" dependencies = [ "crc32fast", "miniz_oxide", ] +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + [[package]] name = "futures" -version = "0.3.30" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d" dependencies = [ "futures-channel", "futures-core", @@ -870,9 +915,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" dependencies = [ "futures-core", "futures-sink", @@ -880,15 +925,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d" dependencies = [ "futures-core", "futures-task", @@ -897,38 +942,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718" [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.117", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" dependencies = [ "futures-channel", "futures-core", @@ -938,7 +983,6 @@ dependencies = [ "futures-task", "memchr", "pin-project-lite", - "pin-utils", "slab", ] @@ -965,20 +1009,27 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi 0.11.1+wasi-snapshot-preview1", ] [[package]] -name = "gimli" -version = "0.29.0" +name = "getrandom" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasip2", + "wasip3", +] [[package]] name = "goblin" @@ -1008,9 +1059,24 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "812f314a99fb5b7f0f9d0a8388539578f83f3aca6a65f588b8dbeefb731e2f98" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] +[[package]] +name = "hashbrown" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" +dependencies = [ + "foldhash", +] + +[[package]] +name = "hashbrown" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" + [[package]] name = "heapsize" version = "0.4.2" @@ -1021,10 +1087,10 @@ dependencies = [ ] [[package]] -name = "hermit-abi" -version = "0.3.9" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hex" @@ -1032,6 +1098,21 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hex-conservative" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda06d18ac606267c40c04e41b9947729bf8b9efe74bd4e82b61a5f26a510b9f" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "id-arena" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" + [[package]] name = "includedir" version = "0.6.0" @@ -1039,7 +1120,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afd126bd778c00c43a9dc76d1609a0894bf4222088088b2217ccc0ce9e816db7" dependencies = [ "flate2", - "phf", + "phf 0.8.0", ] [[package]] @@ -1053,41 +1134,53 @@ dependencies = [ "walkdir", ] +[[package]] +name = "indexmap" +version = "2.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" +dependencies = [ + "equivalent", + "hashbrown 0.16.1", + "serde", + "serde_core", +] + [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" [[package]] -name = "lazy_static" -version = "1.5.0" +name = "leb128fmt" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.182" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112" [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "log" -version = "0.4.22" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "memchr" -version = "2.7.4" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" [[package]] name = "memmap2" @@ -1127,16 +1220,17 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.117", ] [[package]] name = "miniz_oxide" -version = "0.7.4" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ - "adler", + "adler2", + "simd-adler32", ] [[package]] @@ -1151,13 +1245,14 @@ dependencies = [ ] [[package]] -name = "num_cpus" -version = "1.16.0" +name = "molecule" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +checksum = "314eebe1fb025f681c1d6a62fdacbe831027177c1046503a8d73d8027fe19e16" dependencies = [ - "hermit-abi", - "libc", + "bytes", + "cfg-if", + "faster-hex", ] [[package]] @@ -1206,20 +1301,11 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "object" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" -dependencies = [ - "memchr", -] - [[package]] name = "once_cell" -version = "1.19.0" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "paste" @@ -1227,13 +1313,30 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +[[package]] +name = "pastey" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b867cad97c0791bbd3aaa6472142568c6c9e8f71937e98379f584cfb0cf35bec" + [[package]] name = "phf" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" dependencies = [ - "phf_shared", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "913273894cec178f401a31ec4b656318d95473527be05c0752cc41cdc32be8b7" +dependencies = [ + "phf_macros", + "phf_shared 0.12.1", + "serde", ] [[package]] @@ -1242,8 +1345,8 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" dependencies = [ - "phf_generator", - "phf_shared", + "phf_generator 0.8.0", + "phf_shared 0.8.0", ] [[package]] @@ -1252,30 +1355,56 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" dependencies = [ - "phf_shared", + "phf_shared 0.8.0", "rand 0.7.3", ] +[[package]] +name = "phf_generator" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cbb1126afed61dd6368748dae63b1ee7dc480191c6262a3b4ff1e29d86a6c5b" +dependencies = [ + "fastrand", + "phf_shared 0.12.1", +] + +[[package]] +name = "phf_macros" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d713258393a82f091ead52047ca779d37e5766226d009de21696c4e667044368" +dependencies = [ + "phf_generator 0.12.1", + "phf_shared 0.12.1", + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "phf_shared" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] -name = "pin-project-lite" -version = "0.2.14" +name = "phf_shared" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "06005508882fb681fd97892ecff4b7fd0fee13ef1aa569f8695dae7ab9099981" +dependencies = [ + "siphasher 1.0.2", +] [[package]] -name = "pin-utils" -version = "0.1.0" +name = "pin-project-lite" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" [[package]] name = "plain" @@ -1285,28 +1414,47 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "prettyplease" +version = "0.2.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" +dependencies = [ + "proc-macro2", + "syn 2.0.117", +] [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" + [[package]] name = "rand" version = "0.7.3" @@ -1367,7 +1515,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.15", + "getrandom 0.2.17", ] [[package]] @@ -1390,35 +1538,30 @@ dependencies = [ [[package]] name = "reflink-copy" -version = "0.1.19" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc31414597d1cd7fdd2422798b7652a6329dda0fe0219e6335a13d5bcaa9aeb6" +checksum = "23bbed272e39c47a095a5242218a67412a220006842558b03fe2935e8f3d7b92" dependencies = [ "cfg-if", + "libc", "rustix", "windows", ] -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustix" -version = "0.38.34" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ "bitflags", "errno", @@ -1427,12 +1570,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - [[package]] name = "same-file" version = "1.0.6" @@ -1446,16 +1583,16 @@ dependencies = [ name = "schedfuzz" version = "0.1.0" dependencies = [ - "ckb-chain-spec 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-chain-spec 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-error 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-error 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-script 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-script 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-traits 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-traits 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", + "ckb-chain-spec 1.0.1", + "ckb-chain-spec 1.0.2", + "ckb-error 1.0.1", + "ckb-error 1.0.2", + "ckb-script 1.0.1", + "ckb-script 1.0.2", + "ckb-traits 1.0.1", + "ckb-traits 1.0.2", + "ckb-types 1.0.1", + "ckb-types 1.0.2", ] [[package]] @@ -1480,46 +1617,64 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3" +checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252" dependencies = [ + "bitcoin_hashes", + "rand 0.8.5", "secp256k1-sys", ] [[package]] name = "secp256k1-sys" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1433bd67156263443f14d603720b082dd3121779323fce20cba2aa07b874bc1b" +checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9" dependencies = [ "cc", ] [[package]] name = "semver" -version = "1.0.23" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" + +[[package]] +name = "seq-macro" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc" [[package]] name = "serde" -version = "1.0.204" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.117", ] [[package]] @@ -1535,13 +1690,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ "itoa", - "ryu", + "memchr", "serde", + "serde_core", + "zmij", ] [[package]] @@ -1568,29 +1725,44 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.8" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", "cpufeatures", "digest", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "simd-adler32" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" + [[package]] name = "siphasher" version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +[[package]] +name = "siphasher" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e" + [[package]] name = "slab" -version = "0.4.9" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] +checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "ssri" @@ -1609,6 +1781,27 @@ dependencies = [ "xxhash-rust", ] +[[package]] +name = "strum" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "syn" version = "1.0.109" @@ -1622,9 +1815,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.71" +version = "2.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" +checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" dependencies = [ "proc-macro2", "quote", @@ -1633,65 +1826,64 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "82a72c767771b47409d2345987fda8628641887d5466101319899796367354a0" dependencies = [ - "cfg-if", "fastrand", + "getrandom 0.4.2", + "once_cell", "rustix", "windows-sys", ] [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.117", ] [[package]] name = "tokio" -version = "1.38.1" +version = "1.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" +checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d" dependencies = [ - "backtrace", "bytes", - "num_cpus", "pin-project-lite", "tokio-macros", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "5c55a2eff8b69ce66c84f85e1da1c233edc36ceb85a2058d11b0d6a3c7e7569c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.117", ] [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70" dependencies = [ "futures-core", "pin-project-lite", @@ -1709,27 +1901,39 @@ dependencies = [ [[package]] name = "typenum" -version = "1.17.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" + +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + +[[package]] +name = "unicode-xid" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" @@ -1749,9 +1953,61 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.11.1+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" + +[[package]] +name = "wasip2" +version = "1.0.2+wasi-0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" +dependencies = [ + "wit-bindgen", +] + +[[package]] +name = "wasip3" +version = "0.4.0+wasi-0.3.0-rc-2026-01-06" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" +dependencies = [ + "wit-bindgen", +] + +[[package]] +name = "wasm-encoder" +version = "0.244.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" +dependencies = [ + "leb128fmt", + "wasmparser", +] + +[[package]] +name = "wasm-metadata" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" +dependencies = [ + "anyhow", + "indexmap", + "wasm-encoder", + "wasmparser", +] + +[[package]] +name = "wasmparser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" +dependencies = [ + "bitflags", + "hashbrown 0.15.5", + "indexmap", + "semver", +] [[package]] name = "winapi" @@ -1771,9 +2027,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ "windows-sys", ] @@ -1786,143 +2042,239 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.58.0" +version = "0.62.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580" +dependencies = [ + "windows-collections", + "windows-core", + "windows-future", + "windows-numerics", +] + +[[package]] +name = "windows-collections" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" +checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610" dependencies = [ "windows-core", - "windows-targets", ] [[package]] name = "windows-core" -version = "0.58.0" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ "windows-implement", "windows-interface", + "windows-link", "windows-result", "windows-strings", - "windows-targets", +] + +[[package]] +name = "windows-future" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb" +dependencies = [ + "windows-core", + "windows-link", + "windows-threading", ] [[package]] name = "windows-implement" -version = "0.58.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.117", ] [[package]] name = "windows-interface" -version = "0.58.0" +version = "0.59.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.117", +] + +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + +[[package]] +name = "windows-numerics" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26" +dependencies = [ + "windows-core", + "windows-link", ] [[package]] name = "windows-result" -version = "0.2.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ - "windows-targets", + "windows-link", ] [[package]] name = "windows-strings" -version = "0.1.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ - "windows-result", - "windows-targets", + "windows-link", ] [[package]] name = "windows-sys" -version = "0.52.0" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-targets", + "windows-link", ] [[package]] -name = "windows-targets" -version = "0.52.6" +name = "windows-threading" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows-link", ] [[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" +name = "wit-bindgen" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" +dependencies = [ + "wit-bindgen-rust-macro", +] [[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" +name = "wit-bindgen-core" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" +dependencies = [ + "anyhow", + "heck", + "wit-parser", +] [[package]] -name = "windows_i686_gnu" -version = "0.52.6" +name = "wit-bindgen-rust" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" +dependencies = [ + "anyhow", + "heck", + "indexmap", + "prettyplease", + "syn 2.0.117", + "wasm-metadata", + "wit-bindgen-core", + "wit-component", +] [[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" +name = "wit-bindgen-rust-macro" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" +dependencies = [ + "anyhow", + "prettyplease", + "proc-macro2", + "quote", + "syn 2.0.117", + "wit-bindgen-core", + "wit-bindgen-rust", +] + +[[package]] +name = "wit-component" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" +dependencies = [ + "anyhow", + "bitflags", + "indexmap", + "log", + "serde", + "serde_derive", + "serde_json", + "wasm-encoder", + "wasm-metadata", + "wasmparser", + "wit-parser", +] [[package]] -name = "windows_i686_msvc" -version = "0.52.6" +name = "wit-parser" +version = "0.244.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" +dependencies = [ + "anyhow", + "id-arena", + "indexmap", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser", +] [[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" +name = "xxhash-rust" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3" [[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" +name = "zerocopy" +version = "0.8.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +checksum = "a789c6e490b576db9f7e6b6d661bcc9799f7c0ac8352f56ea20193b2681532e5" +dependencies = [ + "zerocopy-derive", +] [[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" +name = "zerocopy-derive" +version = "0.8.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +checksum = "f65c489a7071a749c849713807783f70672b28094011623e200cb86dcb835953" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] [[package]] -name = "xxhash-rust" -version = "0.8.11" +name = "zmij" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63658493314859b4dfdf3fb8c1defd61587839def09582db50b8a4e93afca6bb" +checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" diff --git a/Cargo.toml b/Cargo.toml index 8fe1246..83f2b5d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,14 +4,14 @@ version = "0.1.0" edition = "2021" [dependencies] -ckb-chain-spec-patch = { package = "ckb-chain-spec", git = "https://github.com/libraries/ckb", branch = "old_patch" } -ckb-error-patch = { package = "ckb-error", git = "https://github.com/libraries/ckb", branch = "old_patch" } -ckb-script-patch = { package = "ckb-script", git = "https://github.com/libraries/ckb", branch = "old_patch", default-features = false } -ckb-traits-patch = { package = "ckb-traits", git = "https://github.com/libraries/ckb", branch = "old_patch" } -ckb-types-patch = { package = "ckb-types", git = "https://github.com/libraries/ckb", branch = "old_patch" } +ckb-chain-spec-patch = { package = "ckb-chain-spec", git = "https://github.com/nervosnetwork/ckb", tag = "v0.204.0" } +ckb-error-patch = { package = "ckb-error", git = "https://github.com/nervosnetwork/ckb", tag = "v0.204.0" } +ckb-script-patch = { package = "ckb-script", git = "https://github.com/nervosnetwork/ckb", tag = "v0.204.0", default-features = false } +ckb-traits-patch = { package = "ckb-traits", git = "https://github.com/nervosnetwork/ckb", tag = "v0.204.0" } +ckb-types-patch = { package = "ckb-types", git = "https://github.com/nervosnetwork/ckb", tag = "v0.204.0" } -ckb-chain-spec-sched = { package = "ckb-chain-spec", git = "https://github.com/libraries/ckb", branch = "new_spawn" } -ckb-error-sched = { package = "ckb-error", git = "https://github.com/libraries/ckb", branch = "new_spawn" } -ckb-script-sched = { package = "ckb-script", git = "https://github.com/libraries/ckb", branch = "new_spawn", default-features = false } -ckb-traits-sched = { package = "ckb-traits", git = "https://github.com/libraries/ckb", branch = "new_spawn" } -ckb-types-sched = { package = "ckb-types", git = "https://github.com/libraries/ckb", branch = "new_spawn" } +ckb-chain-spec-sched = { package = "ckb-chain-spec", git = "https://github.com/gpBlockchain/ckb", branch = "copilot/update-ckb-vm-to-asm-rv64im" } +ckb-error-sched = { package = "ckb-error", git = "https://github.com/gpBlockchain/ckb", branch = "copilot/update-ckb-vm-to-asm-rv64im" } +ckb-script-sched = { package = "ckb-script", git = "https://github.com/gpBlockchain/ckb", branch = "copilot/update-ckb-vm-to-asm-rv64im", default-features = false } +ckb-traits-sched = { package = "ckb-traits", git = "https://github.com/gpBlockchain/ckb", branch = "copilot/update-ckb-vm-to-asm-rv64im" } +ckb-types-sched = { package = "ckb-types", git = "https://github.com/gpBlockchain/ckb", branch = "copilot/update-ckb-vm-to-asm-rv64im" } diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock index cd63082..25430a5 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -29,6 +29,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + [[package]] name = "autocfg" version = "1.3.0" @@ -62,6 +68,22 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +[[package]] +name = "bitcoin-io" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dee39a0ee5b4095224a0cfc6bf4cc1baf0f9624b96b367e53b66d974e51d953" + +[[package]] +name = "bitcoin_hashes" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26ec84b80c482df901772e931a9a681e26a1b9ee2302edeff23cb30328745c8b" +dependencies = [ + "bitcoin-io", + "hex-conservative", +] + [[package]] name = "bitflags" version = "2.6.0" @@ -101,18 +123,18 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.1" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" +checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" dependencies = [ "serde", ] [[package]] name = "cacache" -version = "12.0.0" +version = "13.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "142316461ed3a3dfcba10417317472da5bfd0461e4d276bf7c07b330766d9490" +checksum = "5c5063741c7b2e260bbede781cf4679632dd90e2718e99f7715e46824b65670b" dependencies = [ "digest", "either", @@ -153,82 +175,71 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "ckb-chain-spec" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ "cacache", - "ckb-constant 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-crypto 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-dao-utils 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-error 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-jsonrpc-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-logger 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-pow 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-rational 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-resource 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-traits 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", + "ckb-constant 1.0.0", + "ckb-crypto 1.0.0", + "ckb-dao-utils 1.0.1", + "ckb-error 1.0.1", + "ckb-hash 1.0.0", + "ckb-jsonrpc-types 1.0.1", + "ckb-logger 1.0.0", + "ckb-pow 1.0.1", + "ckb-rational 1.0.1", + "ckb-resource 1.0.1", + "ckb-traits 1.0.1", + "ckb-types 1.0.1", "serde", "toml", ] [[package]] name = "ckb-chain-spec" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ "cacache", - "ckb-constant 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-crypto 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-dao-utils 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-error 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-jsonrpc-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-logger 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-pow 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-rational 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-resource 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-traits 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", + "ckb-constant 1.0.1", + "ckb-crypto 1.0.1", + "ckb-dao-utils 1.0.2", + "ckb-error 1.0.2", + "ckb-hash 1.0.1", + "ckb-jsonrpc-types 1.0.2", + "ckb-logger 1.0.1", + "ckb-pow 1.0.2", + "ckb-rational 1.0.2", + "ckb-resource 1.0.2", + "ckb-traits 1.0.2", + "ckb-types 1.0.2", "serde", "toml", ] [[package]] -name = "ckb-channel" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +name = "ckb-constant" +version = "1.0.0" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ - "crossbeam-channel", + "phf 0.12.1", ] [[package]] -name = "ckb-channel" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +name = "ckb-constant" +version = "1.0.1" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ - "crossbeam-channel", + "phf 0.12.1", ] -[[package]] -name = "ckb-constant" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" - -[[package]] -name = "ckb-constant" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" - [[package]] name = "ckb-crypto" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.0" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ - "ckb-fixed-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", + "ckb-fixed-hash 1.0.1", "faster-hex", - "lazy_static", "rand 0.8.5", "secp256k1", "thiserror", @@ -236,12 +247,11 @@ dependencies = [ [[package]] name = "ckb-crypto" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.1" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ - "ckb-fixed-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", + "ckb-fixed-hash 1.0.2", "faster-hex", - "lazy_static", "rand 0.8.5", "secp256k1", "thiserror", @@ -249,68 +259,68 @@ dependencies = [ [[package]] name = "ckb-dao-utils" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ "byteorder", - "ckb-error 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", + "ckb-error 1.0.1", + "ckb-types 1.0.1", ] [[package]] name = "ckb-dao-utils" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ "byteorder", - "ckb-error 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", + "ckb-error 1.0.2", + "ckb-types 1.0.2", ] [[package]] name = "ckb-error" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ "anyhow", - "ckb-occupied-capacity 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "derive_more", + "ckb-occupied-capacity 1.0.1", + "derive_more 1.0.0", "thiserror", ] [[package]] name = "ckb-error" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ "anyhow", - "ckb-occupied-capacity 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "derive_more", + "ckb-occupied-capacity 1.0.2", + "derive_more 1.0.0", "thiserror", ] [[package]] name = "ckb-fixed-hash" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ - "ckb-fixed-hash-core 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-fixed-hash-macros 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", + "ckb-fixed-hash-core 1.0.1", + "ckb-fixed-hash-macros 1.0.0", ] [[package]] name = "ckb-fixed-hash" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ - "ckb-fixed-hash-core 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-fixed-hash-macros 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", + "ckb-fixed-hash-core 1.0.2", + "ckb-fixed-hash-macros 1.0.1", ] [[package]] name = "ckb-fixed-hash-core" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ "ckb_schemars", "faster-hex", @@ -320,8 +330,8 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-core" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ "ckb_schemars", "faster-hex", @@ -331,58 +341,62 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-macros" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.0" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ - "ckb-fixed-hash-core 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", + "ckb-fixed-hash-core 1.0.1", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.71", ] [[package]] name = "ckb-fixed-hash-macros" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.1" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ - "ckb-fixed-hash-core 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", + "ckb-fixed-hash-core 1.0.2", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.71", ] [[package]] name = "ckb-gen-types" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ "cfg-if", - "ckb-error 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-fixed-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-occupied-capacity 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "molecule", + "ckb-error 1.0.1", + "ckb-fixed-hash 1.0.1", + "ckb-hash 1.0.0", + "ckb-occupied-capacity 1.0.1", + "molecule 0.8.0", "numext-fixed-uint", + "seq-macro", + "strum", ] [[package]] name = "ckb-gen-types" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ "cfg-if", - "ckb-error 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-fixed-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-occupied-capacity 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "molecule", + "ckb-error 1.0.2", + "ckb-fixed-hash 1.0.2", + "ckb-hash 1.0.1", + "ckb-occupied-capacity 1.0.2", + "molecule 0.9.2", "numext-fixed-uint", + "seq-macro", + "strum", ] [[package]] name = "ckb-hash" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.0" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ "blake2b-ref", "blake2b-rs", @@ -390,8 +404,8 @@ dependencies = [ [[package]] name = "ckb-hash" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.1" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ "blake2b-ref", "blake2b-rs", @@ -399,40 +413,42 @@ dependencies = [ [[package]] name = "ckb-jsonrpc-types" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", + "ckb-types 1.0.1", "ckb_schemars", "faster-hex", + "seq-macro", "serde", "serde_json", ] [[package]] name = "ckb-jsonrpc-types" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", + "ckb-types 1.0.2", "ckb_schemars", "faster-hex", + "seq-macro", "serde", "serde_json", ] [[package]] name = "ckb-logger" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.0" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ "log", ] [[package]] name = "ckb-logger" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.1" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ "log", ] @@ -448,66 +464,66 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ - "ckb-occupied-capacity-core 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-occupied-capacity-macros 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", + "ckb-occupied-capacity-core 1.0.0", + "ckb-occupied-capacity-macros 1.0.1", ] [[package]] name = "ckb-occupied-capacity" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ - "ckb-occupied-capacity-core 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-occupied-capacity-macros 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", + "ckb-occupied-capacity-core 1.0.1", + "ckb-occupied-capacity-macros 1.0.2", ] [[package]] name = "ckb-occupied-capacity-core" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.0" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ "serde", ] [[package]] name = "ckb-occupied-capacity-core" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.1" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ "serde", ] [[package]] name = "ckb-occupied-capacity-macros" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ - "ckb-occupied-capacity-core 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", + "ckb-occupied-capacity-core 1.0.0", "quote", - "syn 1.0.109", + "syn 2.0.71", ] [[package]] name = "ckb-occupied-capacity-macros" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ - "ckb-occupied-capacity-core 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", + "ckb-occupied-capacity-core 1.0.1", "quote", - "syn 1.0.109", + "syn 2.0.71", ] [[package]] name = "ckb-pow" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ "byteorder", - "ckb-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", + "ckb-hash 1.0.0", + "ckb-types 1.0.1", "eaglesong", "log", "serde", @@ -515,12 +531,12 @@ dependencies = [ [[package]] name = "ckb-pow" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ "byteorder", - "ckb-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", + "ckb-hash 1.0.1", + "ckb-types 1.0.2", "eaglesong", "log", "serde", @@ -528,8 +544,8 @@ dependencies = [ [[package]] name = "ckb-rational" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ "numext-fixed-uint", "serde", @@ -537,8 +553,8 @@ dependencies = [ [[package]] name = "ckb-rational" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ "numext-fixed-uint", "serde", @@ -546,44 +562,44 @@ dependencies = [ [[package]] name = "ckb-resource" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ "ckb-system-scripts", - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", + "ckb-types 1.0.1", "includedir", "includedir_codegen", - "phf", + "phf 0.8.0", "serde", "walkdir", ] [[package]] name = "ckb-resource" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ "ckb-system-scripts", - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", + "ckb-types 1.0.2", "includedir", "includedir_codegen", - "phf", + "phf 0.8.0", "serde", "walkdir", ] [[package]] name = "ckb-script" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ "byteorder", - "ckb-chain-spec 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-error 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-traits 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-vm", + "ckb-chain-spec 1.0.1", + "ckb-error 1.0.1", + "ckb-hash 1.0.0", + "ckb-traits 1.0.1", + "ckb-types 1.0.1", + "ckb-vm 0.24.14", "faster-hex", "serde", "tokio", @@ -591,18 +607,19 @@ dependencies = [ [[package]] name = "ckb-script" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ "byteorder", - "ckb-chain-spec 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-error 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-traits 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-vm", + "ckb-chain-spec 1.0.2", + "ckb-error 1.0.2", + "ckb-hash 1.0.1", + "ckb-traits 1.0.2", + "ckb-types 1.0.2", + "ckb-vm 0.24.0", "faster-hex", "serde", + "tokio", ] [[package]] @@ -615,86 +632,98 @@ dependencies = [ "faster-hex", "includedir", "includedir_codegen", - "phf", + "phf 0.8.0", ] [[package]] name = "ckb-traits" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", + "ckb-types 1.0.1", ] [[package]] name = "ckb-traits" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", + "ckb-types 1.0.2", ] [[package]] name = "ckb-types" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=new_spawn#38279e118d3fda3c52f1d47d2062f80e19a2d523" +version = "1.0.1" +source = "git+https://github.com/nervosnetwork/ckb?tag=v0.204.0#555140e60606dc7e5e30563cfc52f235691a6b44" dependencies = [ "bit-vec", "bytes", - "ckb-channel 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-constant 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-error 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-fixed-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-gen-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", + "ckb-constant 1.0.0", + "ckb-error 1.0.1", + "ckb-fixed-hash 1.0.1", + "ckb-gen-types 1.0.1", + "ckb-hash 1.0.0", "ckb-merkle-mountain-range", - "ckb-occupied-capacity 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-rational 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "derive_more", + "ckb-occupied-capacity 1.0.1", + "ckb-rational 1.0.1", + "derive_more 1.0.0", "golomb-coded-set", "merkle-cbt", - "molecule", + "molecule 0.8.0", "numext-fixed-uint", - "once_cell", "paste", ] [[package]] name = "ckb-types" -version = "0.117.0-pre" -source = "git+https://github.com/libraries/ckb?branch=old_patch#04d2cd9ee4959cb84ff2e47df3876c7310e484d8" +version = "1.0.2" +source = "git+https://github.com/gpBlockchain/ckb?branch=copilot%2Fupdate-ckb-vm-to-asm-rv64im#a4f9af82127cc385fbe3676d0ecf7f1d1321a266" dependencies = [ "bit-vec", "bytes", - "ckb-channel 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-constant 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-error 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-fixed-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-gen-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-hash 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", + "ckb-constant 1.0.1", + "ckb-error 1.0.2", + "ckb-fixed-hash 1.0.2", + "ckb-gen-types 1.0.2", + "ckb-hash 1.0.1", "ckb-merkle-mountain-range", - "ckb-occupied-capacity 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-rational 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "derive_more", + "ckb-occupied-capacity 1.0.2", + "ckb-rational 1.0.2", + "derive_more 1.0.0", "golomb-coded-set", "merkle-cbt", - "molecule", + "molecule 0.9.2", "numext-fixed-uint", - "once_cell", "paste", ] [[package]] name = "ckb-vm" -version = "0.24.12" +version = "0.24.0" +source = "git+https://github.com/mohanson-fork/ckb-vm?branch=asm_rv64im#df0e3e85f14fb4cb8b9b01b2aeddc4fa9f7f886c" +dependencies = [ + "byteorder", + "bytes", + "cc", + "ckb-vm-definitions 0.24.0", + "derive_more 1.0.0", + "goblin 0.2.3", + "goblin 0.4.0", + "scroll", + "serde", +] + +[[package]] +name = "ckb-vm" +version = "0.24.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddff96029d3298cb630e95f29d4b9a93384e938a0b75758684aa8794b53bdd1a" +checksum = "ad137e2f1c9a363ce19a883a2113b1dfcc00a936945e34b62e3726c49e7171fb" dependencies = [ "byteorder", "bytes", "cc", - "ckb-vm-definitions", - "derive_more", + "ckb-vm-definitions 0.24.14", + "derive_more 0.99.18", "goblin 0.2.3", "goblin 0.4.0", "rand 0.7.3", @@ -704,18 +733,26 @@ dependencies = [ [[package]] name = "ckb-vm-definitions" -version = "0.24.12" +version = "0.24.0" +source = "git+https://github.com/mohanson-fork/ckb-vm?branch=asm_rv64im#df0e3e85f14fb4cb8b9b01b2aeddc4fa9f7f886c" +dependencies = [ + "pastey", +] + +[[package]] +name = "ckb-vm-definitions" +version = "0.24.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c280bf1d589d23ab0358f58601c2187fc6be86a131644583ef72ea96a0a13ddd" +checksum = "0b436017fd6676bea413d54e07a5a9cc1d7c4b5c02e4ab07d3527225a5de6677" dependencies = [ "paste", ] [[package]] name = "ckb_schemars" -version = "0.8.19" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21f99fca82a4eb8708e406e99246987b087ecc1e1babeece1a0b1d5238b1750" +checksum = "c37520aaae28169f4b29cd754f414d01ef32b8209c85d4473bc89d760250b990" dependencies = [ "ckb_schemars_derive", "dyn-clone", @@ -725,9 +762,9 @@ dependencies = [ [[package]] name = "ckb_schemars_derive" -version = "0.8.19" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40c813b4fadbdd9f33b1cf02a1ddfa9537d955c8d2fbe150d1fc1684dbf78e73" +checksum = "1506d63311ded0645342c052b1eb21ba272177b32f55d8eb7e11255aed3e74c6" dependencies = [ "proc-macro2", "quote", @@ -741,6 +778,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "cpufeatures" version = "0.2.12" @@ -759,21 +805,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crossbeam-channel" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - [[package]] name = "crypto-common" version = "0.1.6" @@ -796,13 +827,35 @@ version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ - "convert_case", + "convert_case 0.4.0", "proc-macro2", "quote", "rustc_version", "syn 2.0.71", ] +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "convert_case 0.6.0", + "proc-macro2", + "quote", + "syn 2.0.71", + "unicode-xid", +] + [[package]] name = "digest" version = "0.10.7" @@ -1018,7 +1071,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "812f314a99fb5b7f0f9d0a8388539578f83f3aca6a65f588b8dbeefb731e2f98" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -1030,6 +1083,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.3.9" @@ -1042,6 +1101,15 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hex-conservative" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda06d18ac606267c40c04e41b9947729bf8b9efe74bd4e82b61a5f26a510b9f" +dependencies = [ + "arrayvec", +] + [[package]] name = "includedir" version = "0.6.0" @@ -1049,7 +1117,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afd126bd778c00c43a9dc76d1609a0894bf4222088088b2217ccc0ce9e816db7" dependencies = [ "flate2", - "phf", + "phf 0.8.0", ] [[package]] @@ -1078,12 +1146,6 @@ dependencies = [ "libc", ] -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - [[package]] name = "libc" version = "0.2.155" @@ -1180,6 +1242,17 @@ dependencies = [ "faster-hex", ] +[[package]] +name = "molecule" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "314eebe1fb025f681c1d6a62fdacbe831027177c1046503a8d73d8027fe19e16" +dependencies = [ + "bytes", + "cfg-if", + "faster-hex", +] + [[package]] name = "num_cpus" version = "1.16.0" @@ -1257,13 +1330,30 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +[[package]] +name = "pastey" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b867cad97c0791bbd3aaa6472142568c6c9e8f71937e98379f584cfb0cf35bec" + [[package]] name = "phf" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" dependencies = [ - "phf_shared", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "913273894cec178f401a31ec4b656318d95473527be05c0752cc41cdc32be8b7" +dependencies = [ + "phf_macros", + "phf_shared 0.12.1", + "serde", ] [[package]] @@ -1272,8 +1362,8 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" dependencies = [ - "phf_generator", - "phf_shared", + "phf_generator 0.8.0", + "phf_shared 0.8.0", ] [[package]] @@ -1282,17 +1372,49 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" dependencies = [ - "phf_shared", + "phf_shared 0.8.0", "rand 0.7.3", ] +[[package]] +name = "phf_generator" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cbb1126afed61dd6368748dae63b1ee7dc480191c6262a3b4ff1e29d86a6c5b" +dependencies = [ + "fastrand", + "phf_shared 0.12.1", +] + +[[package]] +name = "phf_macros" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d713258393a82f091ead52047ca779d37e5766226d009de21696c4e667044368" +dependencies = [ + "phf_generator 0.12.1", + "phf_shared 0.12.1", + "proc-macro2", + "quote", + "syn 2.0.71", +] + [[package]] name = "phf_shared" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" dependencies = [ - "siphasher", + "siphasher 0.3.11", +] + +[[package]] +name = "phf_shared" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06005508882fb681fd97892ecff4b7fd0fee13ef1aa569f8695dae7ab9099981" +dependencies = [ + "siphasher 1.0.2", ] [[package]] @@ -1476,16 +1598,16 @@ dependencies = [ name = "schedfuzz" version = "0.1.0" dependencies = [ - "ckb-chain-spec 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-chain-spec 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-error 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-error 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-script 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-script 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-traits 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-traits 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=new_spawn)", - "ckb-types 0.117.0-pre (git+https://github.com/libraries/ckb?branch=old_patch)", + "ckb-chain-spec 1.0.1", + "ckb-chain-spec 1.0.2", + "ckb-error 1.0.1", + "ckb-error 1.0.2", + "ckb-script 1.0.1", + "ckb-script 1.0.2", + "ckb-traits 1.0.1", + "ckb-traits 1.0.2", + "ckb-types 1.0.1", + "ckb-types 1.0.2", ] [[package]] @@ -1518,10 +1640,12 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3" +checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252" dependencies = [ + "bitcoin_hashes", + "rand 0.8.5", "secp256k1-sys", ] @@ -1540,6 +1664,12 @@ version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +[[package]] +name = "seq-macro" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc" + [[package]] name = "serde" version = "1.0.204" @@ -1621,6 +1751,12 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +[[package]] +name = "siphasher" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e" + [[package]] name = "slab" version = "0.4.9" @@ -1647,6 +1783,27 @@ dependencies = [ "xxhash-rust", ] +[[package]] +name = "strum" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.71", +] + [[package]] name = "syn" version = "1.0.109" @@ -1757,12 +1914,24 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + [[package]] name = "unicode-width" version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + [[package]] name = "version_check" version = "0.9.4" diff --git a/fuzz/fuzz_targets/fuzz_tx_consistency.rs b/fuzz/fuzz_targets/fuzz_tx_consistency.rs index 6573e2e..6f78eb1 100644 --- a/fuzz/fuzz_targets/fuzz_tx_consistency.rs +++ b/fuzz/fuzz_targets/fuzz_tx_consistency.rs @@ -1,15 +1,24 @@ #![no_main] +use std::sync::atomic::{AtomicUsize, Ordering}; use libfuzzer_sys::fuzz_target; use schedfuzz::{patch, sched}; +static INCONSISTENCY_COUNT: AtomicUsize = AtomicUsize::new(0); + fuzz_target!(|data: &[u8]| { // Fuzzed code goes here - let r_patch = patch::run(data, 0).map_err(|e| format!("{:?}", e)); - let r_sched = sched::run(data, 0).map_err(|e| format!("{:?}", e)); - assert_eq!(r_patch, r_sched); + let r_patch = patch::run(data, 0).map_err(|e| schedfuzz::normalize_error(format!("{:?}", e))); + let r_sched = sched::run(data, 0).map_err(|e| schedfuzz::normalize_error(format!("{:?}", e))); + if r_patch != r_sched { + let count = INCONSISTENCY_COUNT.fetch_add(1, Ordering::Relaxed) + 1; + eprintln!("inconsistency #{count} (version 0): left={r_patch:?}, right={r_sched:?}"); + } - let r_patch = patch::run(data, 2).map_err(|e| format!("{:?}", e)); - let r_sched = sched::run(data, 2).map_err(|e| format!("{:?}", e)); - assert_eq!(r_patch, r_sched); + let r_patch = patch::run(data, 2).map_err(|e| schedfuzz::normalize_error(format!("{:?}", e))); + let r_sched = sched::run(data, 2).map_err(|e| schedfuzz::normalize_error(format!("{:?}", e))); + if r_patch != r_sched { + let count = INCONSISTENCY_COUNT.fetch_add(1, Ordering::Relaxed) + 1; + eprintln!("inconsistency #{count} (version 2): left={r_patch:?}, right={r_sched:?}"); + } }); diff --git a/fuzz/fuzz_targets/fuzz_tx_consistency_only_valid_data1.rs b/fuzz/fuzz_targets/fuzz_tx_consistency_only_valid_data1.rs index 5a21545..e1b2e6f 100644 --- a/fuzz/fuzz_targets/fuzz_tx_consistency_only_valid_data1.rs +++ b/fuzz/fuzz_targets/fuzz_tx_consistency_only_valid_data1.rs @@ -5,8 +5,8 @@ use schedfuzz::{patch, sched}; fuzz_target!(|data: &[u8]| -> Corpus { // Fuzzed code goes here - let r_patch = patch::run(data, 2).map_err(|e| format!("{:?}", e)); - let r_sched = sched::run(data, 2).map_err(|e| format!("{:?}", e)); + let r_patch = patch::run(data, 2).map_err(|e| schedfuzz::normalize_error(format!("{:?}", e))); + let r_sched = sched::run(data, 2).map_err(|e| schedfuzz::normalize_error(format!("{:?}", e))); assert_eq!(r_patch, r_sched); match r_patch { Ok(_) => { diff --git a/src/lib.rs b/src/lib.rs index 087f2f6..95024b6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -46,12 +46,12 @@ pub mod patch { fn mock_transaction_info() -> TransactionInfo { TransactionInfoBuilder::default() - .block_number(1u64.pack()) - .block_epoch(0u64.pack()) + .block_number(1u64) + .block_epoch(0u64) .key( TransactionKeyBuilder::default() .block_hash(Byte32::zero()) - .index(1u32.pack()) + .index(1u32) .build(), ) .build() @@ -65,7 +65,7 @@ pub mod patch { let data: Bytes = (Vec::from(data)).into(); let script = Script::new_builder() - .hash_type(ScriptHashType::try_from(version).unwrap().into()) + .hash_type(ScriptHashType::try_from(version).unwrap()) .code_hash(CellOutput::calc_data_hash(&data)) .build(); let dep_cell = CellMetaBuilder::from_cell_output( @@ -104,7 +104,7 @@ pub mod patch { .hardfork_switch(hardfork_switch) .build(); let tx_verify_env = - TxVerifyEnv::new_submit(&HeaderView::new_advanced_builder().epoch(0.pack()).build()); + TxVerifyEnv::new_submit(&HeaderView::new_advanced_builder().epoch(0u64).build()); let verifier = TransactionScriptsVerifier::new( rtx.into(), provider, @@ -115,6 +115,30 @@ pub mod patch { } } +pub fn normalize_error(err: String) -> String { + let mut result = err; + let patterns = ["MemWriteOnExecutablePage", "MemOutOfBound","ElfSegmentAddrOrSizeError","ElfSegmentUnreadable","ElfSegmentWritableAndExecutable","MemWriteOnFreezedPage"]; + for pattern in patterns { + loop { + // Find "Pattern(...)" and replace with just "Pattern" + let Some(start) = result.find(pattern) else { break }; + let after = start + pattern.len(); + let Some(rest) = result.get(after..) else { break }; + if !rest.starts_with('(') { break; } + let Some(close) = rest.find(')') else { break }; + // Only strip args that are alphanumeric/comma/space (e.g. "4194364, Memory" or "18") + let inside = &rest[1..close]; + if !inside.chars().all(|c| c.is_ascii_alphanumeric() || c == ',' || c == ' ') { break; } + result = format!( + "{}{}", + &result[..after], + &result[after + close + 1..] + ); + } + } + result +} + pub mod sched { use ckb_chain_spec_sched::consensus::ConsensusBuilder; use ckb_error_sched::Error; @@ -163,12 +187,12 @@ pub mod sched { fn mock_transaction_info() -> TransactionInfo { TransactionInfoBuilder::default() - .block_number(1u64.pack()) - .block_epoch(0u64.pack()) + .block_number(1u64) + .block_epoch(0u64) .key( TransactionKeyBuilder::default() .block_hash(Byte32::zero()) - .index(1u32.pack()) + .index(1u32) .build(), ) .build() @@ -182,7 +206,7 @@ pub mod sched { let data: Bytes = (Vec::from(data)).into(); let script = Script::new_builder() - .hash_type(ScriptHashType::try_from(version).unwrap().into()) + .hash_type(ScriptHashType::try_from(version).unwrap()) .code_hash(CellOutput::calc_data_hash(&data)) .build(); let dep_cell = CellMetaBuilder::from_cell_output( @@ -221,7 +245,7 @@ pub mod sched { .hardfork_switch(hardfork_switch) .build(); let tx_verify_env = - TxVerifyEnv::new_submit(&HeaderView::new_advanced_builder().epoch(0.pack()).build()); + TxVerifyEnv::new_submit(&HeaderView::new_advanced_builder().epoch(0u64).build()); let verifier = TransactionScriptsVerifier::new( rtx.into(), provider, diff --git a/src/main.rs b/src/main.rs index a74f15c..ce89a33 100644 --- a/src/main.rs +++ b/src/main.rs @@ -12,13 +12,22 @@ fn main() -> Result<(), Box> { let mut failed_corpus_v1 = 0; let mut success_corpus_v1 = 0; + let mut patch_vm_total_ns: u128 = 0; + let mut sched_vm_total_ns: u128 = 0; + for directory in std::fs::read_dir(dir)? { let path = directory?.path(); // println!("{}", path.display()); let data = std::fs::read(path.clone())?; - let r_patch = schedfuzz::patch::run(&data, 0).map_err(|e| format!("{:?}", e)); - let r_sched = schedfuzz::sched::run(&data, 0).map_err(|e| format!("{:?}", e)); + let patch_start = std::time::Instant::now(); + let r_patch = schedfuzz::patch::run(&data, 0).map_err(|e| schedfuzz::normalize_error(format!("{:?}", e))); + patch_vm_total_ns += patch_start.elapsed().as_nanos(); + + let sched_start = std::time::Instant::now(); + let r_sched = schedfuzz::sched::run(&data, 0).map_err(|e| schedfuzz::normalize_error(format!("{:?}", e))); + sched_vm_total_ns += sched_start.elapsed().as_nanos(); + assert_eq!(r_patch, r_sched, "file path : {}", path.display()); match r_patch { Ok(_) => { @@ -29,8 +38,14 @@ fn main() -> Result<(), Box> { } } - let r_patch = schedfuzz::patch::run(&data, 2).map_err(|e| format!("{:?}", e)); - let r_sched = schedfuzz::sched::run(&data, 2).map_err(|e| format!("{:?}", e)); + let patch_start = std::time::Instant::now(); + let r_patch = schedfuzz::patch::run(&data, 2).map_err(|e| schedfuzz::normalize_error(format!("{:?}", e))); + patch_vm_total_ns += patch_start.elapsed().as_nanos(); + + let sched_start = std::time::Instant::now(); + let r_sched = schedfuzz::sched::run(&data, 2).map_err(|e| schedfuzz::normalize_error(format!("{:?}", e))); + sched_vm_total_ns += sched_start.elapsed().as_nanos(); + assert_eq!(r_patch, r_sched, "file path : {}", path.display()); match r_patch { Ok(_) => { @@ -43,6 +58,7 @@ fn main() -> Result<(), Box> { } println!("version data succ:{},failed:{}", success_corpus_v0, failed_corpus_v0); println!("version data1 succ:{},failed:{}", success_corpus_v1, failed_corpus_v1); + println!("patch_vm_total={}ms sched_vm_total={}ms", patch_vm_total_ns / 1_000_000, sched_vm_total_ns / 1_000_000); }; Ok(())