From a49396d4f73e050f315dcca963bd6e1dc03cf5a7 Mon Sep 17 00:00:00 2001 From: mohanson Date: Wed, 18 Mar 2026 10:41:25 +0800 Subject: [PATCH] Bump version to v1.1.0 --- .github/workflows/develop.yml | 2 +- Cargo.toml | 6 +- build.rs | 49 ++- contracts/Cargo.lock | 199 +++++++++---- .../exec-callee/exec-callee-dbg/Cargo.lock | 278 ++++++++++++------ contracts/rust-toolchain | 1 - contracts/rust-toolchain.toml | 2 + rust-toolchain | 1 - rust-toolchain.toml | 2 + 9 files changed, 380 insertions(+), 160 deletions(-) delete mode 100644 contracts/rust-toolchain create mode 100644 contracts/rust-toolchain.toml delete mode 100644 rust-toolchain create mode 100644 rust-toolchain.toml diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 871373f..46e48c2 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -14,7 +14,7 @@ jobs: - name: Deps run: | rustup target add riscv64imac-unknown-none-elf - wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && sudo ./llvm.sh 18 && rm llvm.sh + wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && sudo ./llvm.sh 21 && rm llvm.sh - name: Test run: | cargo build --features=stub-syscalls diff --git a/Cargo.toml b/Cargo.toml index 697b4d4..43c5b9a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-std" -version = "1.0.2" +version = "1.1.0" authors = ["Nervos network"] edition = "2024" license = "MIT" @@ -43,8 +43,8 @@ type-id = ["ckb-hash", "ckb-types"] cc = "1.0" [dependencies] -ckb-types = { package = "ckb-gen-types", version = "1.0.0", default-features = false, optional = true } -ckb-hash = { version = "1.0.0", default-features = false, features = [ +ckb-types = { package = "ckb-gen-types", version = "1.1.0", default-features = false, optional = true } +ckb-hash = { version = "1.1.0", default-features = false, features = [ "ckb-contract", ], optional = true } diff --git a/build.rs b/build.rs index 3d65ccc..4a700ea 100644 --- a/build.rs +++ b/build.rs @@ -1,4 +1,6 @@ use std::env; +use std::io; +use std::process::Output; fn main() { println!("cargo:rerun-if-changed=c/dlopen.c"); @@ -26,9 +28,49 @@ fn main() { } } +fn show_clang_version(clang: &str) -> io::Result { + std::process::Command::new(clang).arg("--version").output() +} + +fn find_clang() -> String { + // The 1st, check if the CLANG environment variable is set and valid. + if let Ok(clang) = std::env::var("CLANG") { + match show_clang_version(&clang) { + Ok(ok) => println!("{}", String::from_utf8_lossy(&ok.stdout)), + Err(_) => panic!( + "Clang compiler not found. Error CLANG environment: {}", + clang + ), + } + return clang; + } + + // The 2nd, try clang-22, clang-21, ..., clang-19 in order. + for version in [22, 21, 20, 19, 30, 29, 28, 27, 26, 25, 24, 23] { + let clang = format!("clang-{}", version); + match show_clang_version(&clang) { + Ok(ok) => { + println!("{}", String::from_utf8_lossy(&ok.stdout)); + return clang; + } + Err(_) => continue, + } + } + + // The 3rd, try clang. + match show_clang_version("clang") { + Ok(ok) => { + println!("{}", String::from_utf8_lossy(&ok.stdout)); + return "clang".to_string(); + } + Err(_) => panic!( + "Clang compiler not found. Please set the CLANG environment variable to the path of your clang executable." + ), + } +} + fn setup_compiler_flags(build: &mut cc::Build) { build - .static_flag(true) .flag("-fno-builtin-printf") .flag("-fno-builtin-memcmp") .flag("-nostdinc") @@ -42,10 +84,7 @@ fn setup_compiler_flags(build: &mut cc::Build) { .flag("-Wno-nonnull") .include("c/ckb-c-stdlib/libc"); - let clang = match std::env::var_os("CLANG") { - Some(val) => val, - None => "clang-18".into(), - }; + let clang = find_clang(); if cfg!(feature = "build-with-clang") { build.compiler(clang); diff --git a/contracts/Cargo.lock b/contracts/Cargo.lock index 0517e18..5cc9131 100644 --- a/contracts/Cargo.lock +++ b/contracts/Cargo.lock @@ -67,25 +67,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "ckb-channel" -version = "0.202.0" +name = "ckb-constant" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcdf3f5242842f1735bfa1e38755f679ac071b2b451e0e8b87b9a80bf6147767" +checksum = "82fd6067f54886ef3facf5e7693f00bf127874f7d85a734120224e27d229e16d" dependencies = [ - "crossbeam-channel", + "phf", ] -[[package]] -name = "ckb-constant" -version = "0.202.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8f4de41ddef453148c70bde26afc1cc26d2e22143e08555d7865e9cb0f523b1" - [[package]] name = "ckb-error" -version = "0.202.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c44f328a850d94e1d7a8843b7107fa245a083bcb263f5eb7da2e8892daa766c6" +checksum = "16a71d04538928f0865c62a7858c2dc8d59c4934b56e44682ab715a73eb697bc" dependencies = [ "anyhow", "ckb-occupied-capacity", @@ -95,9 +89,9 @@ dependencies = [ [[package]] name = "ckb-fixed-hash" -version = "0.202.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41ef9f1e9495ffa6cdc9694b7f438b0af360b958b543112c2d96b01ce3ca6f9" +checksum = "7db7b3b0fd13fed9d781d5da62af92b4dd82e75f61341d21b7eabee92c54fbcf" dependencies = [ "ckb-fixed-hash-core", "ckb-fixed-hash-macros", @@ -105,9 +99,9 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-core" -version = "0.202.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5338f04fcdd0b217203c43d05af4b5cc2971ce4f1ecb0df2162e06aa3779def" +checksum = "03096169689ee32ece96e1af1b89a6d672fab91297cf9b983a314ead40ce29c9" dependencies = [ "ckb_schemars", "faster-hex", @@ -117,9 +111,9 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-macros" -version = "0.202.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de2b2aeebd799da3170220c88dffc3f50257e657d276d59ffe38f533de26459" +checksum = "4f3ae265749703c88e887524fd3f9822989808d204e8ae5380596bf7111c26be" dependencies = [ "ckb-fixed-hash-core", "proc-macro2", @@ -129,24 +123,26 @@ dependencies = [ [[package]] name = "ckb-gen-types" -version = "0.202.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "255da9cda52578622b7b8a437eb22942bfdbe90d7896f86a002fa8e4cc1804c8" +checksum = "a5ca98134f68d56893330e64903ca478d41e2305bcb9cc5fe457934d3a081240" dependencies = [ "cfg-if", "ckb-error", "ckb-fixed-hash", "ckb-hash", "ckb-occupied-capacity", - "molecule", + "molecule 0.9.2", "numext-fixed-uint", + "seq-macro", + "strum", ] [[package]] name = "ckb-hash" -version = "0.202.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a74fb43c0f092a5ea388d31e4579cada2cc14e45dd5818b996f348613efe202" +checksum = "6038dc800eb3c8011df213e105a48c51f67e9904767af9356f0d3308b7afd618" dependencies = [ "blake2b-ref", "blake2b-rs", @@ -154,13 +150,14 @@ dependencies = [ [[package]] name = "ckb-jsonrpc-types" -version = "0.202.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e1fb6611ec4626ec5876b7dac828027faac9ab0289c90f630109eae23f1e3da" +checksum = "e40fbcbc617d103c446391dac024f648645f04c13df5bd330e906a54e2de8546" dependencies = [ "ckb-types", "ckb_schemars", "faster-hex", + "seq-macro", "serde", "serde_json", ] @@ -176,9 +173,9 @@ dependencies = [ [[package]] name = "ckb-mock-tx-types" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21143dcf9fd2a02656bcf4b2fb99500916e298207e3448dda3988db775f8972" +checksum = "08f05c40c36a5109007a3721cdf940153a19bafade295407df0bad5113a524e4" dependencies = [ "ckb-jsonrpc-types", "ckb-traits", @@ -188,9 +185,9 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity" -version = "0.202.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7d80645639dd38cf0c91d06cd2e8bd3489557479968e6fb8ed2d35d7fdde5dd" +checksum = "2e3336de39a17aece5b24696bd9d14d9fee1fc7499801e531512b384d29402d1" dependencies = [ "ckb-occupied-capacity-core", "ckb-occupied-capacity-macros", @@ -198,18 +195,18 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity-core" -version = "0.202.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af825d54b795fab2b9e934ab5b5f9fa1090f69b98cc60e3a6d363336b5ee1726" +checksum = "015dff9dce6f1be1bd9b57a8b27e9dba9d610c6d8d9e0c7be5a2440fd67b04c4" dependencies = [ "serde", ] [[package]] name = "ckb-occupied-capacity-macros" -version = "0.202.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca553126a0269427c31b3dbca8d720a4c79267a80c9a0e6c589a86d460a6201b" +checksum = "90465d7a0d508cecfb4f84a9e1e618192907a81cb95cfae267168119f02ddad8" dependencies = [ "ckb-occupied-capacity-core", "quote", @@ -218,9 +215,9 @@ dependencies = [ [[package]] name = "ckb-rational" -version = "0.202.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd60f92eafb05be8fd7ec091841c7e28503a61e061b54e1010b2d0f3a0b13763" +checksum = "818ae265240ce1fbf334dafcbd165bfb2909178929502f8c8703c202bc5096b8" dependencies = [ "numext-fixed-uint", "serde", @@ -228,7 +225,7 @@ dependencies = [ [[package]] name = "ckb-std" -version = "0.17.2" +version = "1.1.0" dependencies = [ "buddy-alloc", "cc", @@ -253,22 +250,21 @@ dependencies = [ [[package]] name = "ckb-traits" -version = "0.202.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80fcf192e9832c5b1213a2f4dcc58812ad77ae9599aec3170652db07d9c2fb0f" +checksum = "02d0ea5b70843d04683740cf9078719d2d87d01004eb4ced11681006f600c976" dependencies = [ "ckb-types", ] [[package]] name = "ckb-types" -version = "0.202.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32bd5b5b4a2d991ee05852641c8272498df27abd0cef0f16979f6af6cb5fd97d" +checksum = "5326563ecb732527a899d3c1f25ef7f5f7fc3f7e83e39456d33f508c93b50f3f" dependencies = [ "bit-vec", "bytes", - "ckb-channel", "ckb-constant", "ckb-error", "ckb-fixed-hash", @@ -280,16 +276,16 @@ dependencies = [ "derive_more", "golomb-coded-set", "merkle-cbt", - "molecule", + "molecule 0.8.0", "numext-fixed-uint", "paste", ] [[package]] name = "ckb-x64-simulator" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da29fa2318575486a071565d19fc0c4244660611d06ee323be42682438fdd4d7" +checksum = "ce937fe5d06ea39d3921d50014c1ed962b71dd874553631ef226ff7f1406ae7e" dependencies = [ "cc", "ckb-mock-tx-types", @@ -327,21 +323,6 @@ dependencies = [ "syn 1.0.109", ] -[[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 = "cty" version = "0.2.2" @@ -402,6 +383,12 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51e2ce894d53b295cf97b05685aa077950ff3e8541af83217fc720a6437169f8" +[[package]] +name = "fastrand" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" + [[package]] name = "gcd" version = "2.3.0" @@ -425,7 +412,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "812f314a99fb5b7f0f9d0a8388539578f83f3aca6a65f588b8dbeefb731e2f98" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -437,6 +424,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "int-enum" version = "1.2.0" @@ -510,6 +503,16 @@ name = "molecule" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6efe1c7efcd0bdf4ca590e104bcb13087d9968956ae4ae98e92fb8c1da0f3730" +dependencies = [ + "bytes", + "cfg-if", +] + +[[package]] +name = "molecule" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "314eebe1fb025f681c1d6a62fdacbe831027177c1046503a8d73d8027fe19e16" dependencies = [ "bytes", "cfg-if", @@ -568,6 +571,49 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +[[package]] +name = "phf" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "913273894cec178f401a31ec4b656318d95473527be05c0752cc41cdc32be8b7" +dependencies = [ + "phf_macros", + "phf_shared", + "serde", +] + +[[package]] +name = "phf_generator" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cbb1126afed61dd6368748dae63b1ee7dc480191c6262a3b4ff1e29d86a6c5b" +dependencies = [ + "fastrand", + "phf_shared", +] + +[[package]] +name = "phf_macros" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d713258393a82f091ead52047ca779d37e5766226d009de21696c4e667044368" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.70", +] + +[[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]] name = "ppv-lite86" version = "0.2.17" @@ -657,6 +703,12 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[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" @@ -705,6 +757,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 = "spawn-callee" version = "0.1.0" @@ -735,6 +793,27 @@ dependencies = [ "lock_api", ] +[[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.70", +] + [[package]] name = "syn" version = "1.0.109" diff --git a/contracts/exec-callee/exec-callee-dbg/Cargo.lock b/contracts/exec-callee/exec-callee-dbg/Cargo.lock index f5fd79e..f5383f3 100644 --- a/contracts/exec-callee/exec-callee-dbg/Cargo.lock +++ b/contracts/exec-callee/exec-callee-dbg/Cargo.lock @@ -61,25 +61,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "ckb-channel" -version = "0.202.0" +name = "ckb-constant" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcdf3f5242842f1735bfa1e38755f679ac071b2b451e0e8b87b9a80bf6147767" +checksum = "82fd6067f54886ef3facf5e7693f00bf127874f7d85a734120224e27d229e16d" dependencies = [ - "crossbeam-channel", + "phf", ] -[[package]] -name = "ckb-constant" -version = "0.202.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8f4de41ddef453148c70bde26afc1cc26d2e22143e08555d7865e9cb0f523b1" - [[package]] name = "ckb-error" -version = "0.202.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c44f328a850d94e1d7a8843b7107fa245a083bcb263f5eb7da2e8892daa766c6" +checksum = "16a71d04538928f0865c62a7858c2dc8d59c4934b56e44682ab715a73eb697bc" dependencies = [ "anyhow", "ckb-occupied-capacity", @@ -89,9 +83,9 @@ dependencies = [ [[package]] name = "ckb-fixed-hash" -version = "0.202.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41ef9f1e9495ffa6cdc9694b7f438b0af360b958b543112c2d96b01ce3ca6f9" +checksum = "7db7b3b0fd13fed9d781d5da62af92b4dd82e75f61341d21b7eabee92c54fbcf" dependencies = [ "ckb-fixed-hash-core", "ckb-fixed-hash-macros", @@ -99,21 +93,21 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-core" -version = "0.202.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5338f04fcdd0b217203c43d05af4b5cc2971ce4f1ecb0df2162e06aa3779def" +checksum = "a30e802c13f15904d399d1f11d415a1185e9cd6ff25b66db5616d755576d74c4" dependencies = [ - "ckb_schemars", "faster-hex", + "schemars", "serde", "thiserror", ] [[package]] name = "ckb-fixed-hash-macros" -version = "0.202.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de2b2aeebd799da3170220c88dffc3f50257e657d276d59ffe38f533de26459" +checksum = "4f3ae265749703c88e887524fd3f9822989808d204e8ae5380596bf7111c26be" dependencies = [ "ckb-fixed-hash-core", "proc-macro2", @@ -123,24 +117,26 @@ dependencies = [ [[package]] name = "ckb-gen-types" -version = "0.202.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "255da9cda52578622b7b8a437eb22942bfdbe90d7896f86a002fa8e4cc1804c8" +checksum = "a5ca98134f68d56893330e64903ca478d41e2305bcb9cc5fe457934d3a081240" dependencies = [ "cfg-if", "ckb-error", "ckb-fixed-hash", "ckb-hash", "ckb-occupied-capacity", - "molecule", + "molecule 0.9.2", "numext-fixed-uint", + "seq-macro", + "strum", ] [[package]] name = "ckb-hash" -version = "0.202.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a74fb43c0f092a5ea388d31e4579cada2cc14e45dd5818b996f348613efe202" +checksum = "6038dc800eb3c8011df213e105a48c51f67e9904767af9356f0d3308b7afd618" dependencies = [ "blake2b-ref", "blake2b-rs", @@ -148,13 +144,14 @@ dependencies = [ [[package]] name = "ckb-jsonrpc-types" -version = "0.202.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e1fb6611ec4626ec5876b7dac828027faac9ab0289c90f630109eae23f1e3da" +checksum = "9f91dd4369411d035e8e1020d373ba110fffb27a3635079b626073c8d830de4c" dependencies = [ "ckb-types", - "ckb_schemars", "faster-hex", + "schemars", + "seq-macro", "serde", "serde_json", ] @@ -170,9 +167,9 @@ dependencies = [ [[package]] name = "ckb-mock-tx-types" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21143dcf9fd2a02656bcf4b2fb99500916e298207e3448dda3988db775f8972" +checksum = "08f05c40c36a5109007a3721cdf940153a19bafade295407df0bad5113a524e4" dependencies = [ "ckb-jsonrpc-types", "ckb-traits", @@ -182,9 +179,9 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity" -version = "0.202.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7d80645639dd38cf0c91d06cd2e8bd3489557479968e6fb8ed2d35d7fdde5dd" +checksum = "2e3336de39a17aece5b24696bd9d14d9fee1fc7499801e531512b384d29402d1" dependencies = [ "ckb-occupied-capacity-core", "ckb-occupied-capacity-macros", @@ -192,18 +189,18 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity-core" -version = "0.202.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af825d54b795fab2b9e934ab5b5f9fa1090f69b98cc60e3a6d363336b5ee1726" +checksum = "015dff9dce6f1be1bd9b57a8b27e9dba9d610c6d8d9e0c7be5a2440fd67b04c4" dependencies = [ "serde", ] [[package]] name = "ckb-occupied-capacity-macros" -version = "0.202.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca553126a0269427c31b3dbca8d720a4c79267a80c9a0e6c589a86d460a6201b" +checksum = "90465d7a0d508cecfb4f84a9e1e618192907a81cb95cfae267168119f02ddad8" dependencies = [ "ckb-occupied-capacity-core", "quote", @@ -212,9 +209,9 @@ dependencies = [ [[package]] name = "ckb-rational" -version = "0.202.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd60f92eafb05be8fd7ec091841c7e28503a61e061b54e1010b2d0f3a0b13763" +checksum = "818ae265240ce1fbf334dafcbd165bfb2909178929502f8c8703c202bc5096b8" dependencies = [ "numext-fixed-uint", "serde", @@ -222,7 +219,7 @@ dependencies = [ [[package]] name = "ckb-std" -version = "0.17.2" +version = "1.1.0" dependencies = [ "buddy-alloc", "cc", @@ -234,22 +231,21 @@ dependencies = [ [[package]] name = "ckb-traits" -version = "0.202.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80fcf192e9832c5b1213a2f4dcc58812ad77ae9599aec3170652db07d9c2fb0f" +checksum = "02d0ea5b70843d04683740cf9078719d2d87d01004eb4ced11681006f600c976" dependencies = [ "ckb-types", ] [[package]] name = "ckb-types" -version = "0.202.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32bd5b5b4a2d991ee05852641c8272498df27abd0cef0f16979f6af6cb5fd97d" +checksum = "5326563ecb732527a899d3c1f25ef7f5f7fc3f7e83e39456d33f508c93b50f3f" dependencies = [ "bit-vec", "bytes", - "ckb-channel", "ckb-constant", "ckb-error", "ckb-fixed-hash", @@ -261,16 +257,16 @@ dependencies = [ "derive_more", "golomb-coded-set", "merkle-cbt", - "molecule", + "molecule 0.8.0", "numext-fixed-uint", "paste", ] [[package]] name = "ckb-x64-simulator" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da29fa2318575486a071565d19fc0c4244660611d06ee323be42682438fdd4d7" +checksum = "ce937fe5d06ea39d3921d50014c1ed962b71dd874553631ef226ff7f1406ae7e" dependencies = [ "cc", "ckb-mock-tx-types", @@ -284,45 +280,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "ckb_schemars" -version = "0.8.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c37520aaae28169f4b29cd754f414d01ef32b8209c85d4473bc89d760250b990" -dependencies = [ - "ckb_schemars_derive", - "dyn-clone", - "serde", - "serde_json", -] - -[[package]] -name = "ckb_schemars_derive" -version = "0.8.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1506d63311ded0645342c052b1eb21ba272177b32f55d8eb7e11255aed3e74c6" -dependencies = [ - "proc-macro2", - "quote", - "serde_derive_internals", - "syn 1.0.109", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" - [[package]] name = "cty" version = "0.2.2" @@ -377,6 +334,12 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51e2ce894d53b295cf97b05685aa077950ff3e8541af83217fc720a6437169f8" +[[package]] +name = "fastrand" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" + [[package]] name = "gcd" version = "2.3.0" @@ -400,7 +363,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "812f314a99fb5b7f0f9d0a8388539578f83f3aca6a65f588b8dbeefb731e2f98" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -412,6 +375,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "int-enum" version = "1.2.0" @@ -472,6 +441,16 @@ name = "molecule" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6efe1c7efcd0bdf4ca590e104bcb13087d9968956ae4ae98e92fb8c1da0f3730" +dependencies = [ + "bytes", + "cfg-if", +] + +[[package]] +name = "molecule" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "314eebe1fb025f681c1d6a62fdacbe831027177c1046503a8d73d8027fe19e16" dependencies = [ "bytes", "cfg-if", @@ -530,6 +509,49 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +[[package]] +name = "phf" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "913273894cec178f401a31ec4b656318d95473527be05c0752cc41cdc32be8b7" +dependencies = [ + "phf_macros", + "phf_shared", + "serde", +] + +[[package]] +name = "phf_generator" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cbb1126afed61dd6368748dae63b1ee7dc480191c6262a3b4ff1e29d86a6c5b" +dependencies = [ + "fastrand", + "phf_shared", +] + +[[package]] +name = "phf_macros" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d713258393a82f091ead52047ca779d37e5766226d009de21696c4e667044368" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[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]] name = "ppv-lite86" version = "0.2.21" @@ -610,12 +632,63 @@ dependencies = [ "rand_core", ] +[[package]] +name = "ref-cast" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] + [[package]] name = "ryu" version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" +[[package]] +name = "schemars" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc" +dependencies = [ + "dyn-clone", + "ref-cast", + "schemars_derive", + "serde", + "serde_json", +] + +[[package]] +name = "schemars_derive" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d115b50f4aaeea07e79c1912f645c7513d81715d0420f8bc77a18c6260b307f" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.100", +] + +[[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.219" @@ -638,13 +711,13 @@ dependencies = [ [[package]] name = "serde_derive_internals" -version = "0.26.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.100", ] [[package]] @@ -671,6 +744,33 @@ 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 = "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.100", +] + [[package]] name = "syn" version = "1.0.109" diff --git a/contracts/rust-toolchain b/contracts/rust-toolchain deleted file mode 100644 index f288d11..0000000 --- a/contracts/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -1.85.0 diff --git a/contracts/rust-toolchain.toml b/contracts/rust-toolchain.toml new file mode 100644 index 0000000..f19782d --- /dev/null +++ b/contracts/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "1.92.0" diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index f288d11..0000000 --- a/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -1.85.0 diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..f19782d --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "1.92.0"