Merge pull request #536 from nervosnetwork/v2

Merge v2.16.0 into develop

Author: RetricSu

examples/ccc-molecule/package-lock.json

@@ -16,6 +16,6 @@
     "tsx": "^4.19.2"
   },
   "dependencies": {
-    "@ckb-ccc/shell": "^1.1.3"
+    "@ckb-ccc/shell": "^1.1.6"
   }
 }

examples/ccc-molecule/package.json

@@ -10,7 +10,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@ckb-ccc/core": "^0.0.14-alpha.0",
+    "@ckb-ccc/core": "^1.5.3",
     "@spore-sdk/core": "0.2.0-beta.3",
     "@types/react": "^18.0.25",
     "@types/react-dom": "^18.0.9",

examples/create-dob/package.json

@@ -29,18 +29,19 @@
     chalk "^2.4.2"
     js-tokens "^4.0.0"
 
-"@ckb-ccc/core@^0.0.14-alpha.0":
-  version "0.0.14-alpha.0"
-  resolved "https://registry.yarnpkg.com/@ckb-ccc/core/-/core-0.0.14-alpha.0.tgz#b9ec6e143472c90be54c0e39e2fc323070ec1739"
-  integrity sha512-kKMah5xWzLt48YE9Asc1KfDfN5lX7c7IE09X/7/ozVqWRNEyY1u6UmSQXyOV5LwP2fgvJmkkRD54H2RRAtNVoA==
+"@ckb-ccc/core@^1.5.3":
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/@ckb-ccc/core/-/core-1.5.3.tgz#90f2cf099b4dc723c48fa42c3aa3fe7fb9758267"
+  integrity sha512-/W7SYbygBateN6odqkMhQlkoQFs+45pJ7hYZYEaEpRdF6DjU7sIOvVSkw3qXiUOK37b2qAWJj3I8CJQbesKpng==
   dependencies:
-    "@joyid/ckb" "^1.0.1"
+    "@joyid/ckb" "^1.1.1"
     "@noble/ciphers" "^0.5.3"
     "@noble/curves" "^1.4.2"
     "@noble/hashes" "^1.4.0"
     abort-controller "^3.0.0"
     bech32 "^2.0.0"
     bitcoinjs-message "^2.2.0"
+    bs58check "^4.0.0"
     buffer "^6.0.3"
     cross-fetch "^4.0.0"
     ethers "^6.13.1"
@@ -205,13 +206,13 @@
   resolved "https://registry.yarnpkg.com/@exact-realty/multipart-parser/-/multipart-parser-1.0.12.tgz#8dc730154ef1c28836840ffdf889d41c1b109470"
   integrity sha512-HTIbhEQg+llTPpVsoUJzAkv8ClZwMJAGv03FY/6kL7nTcQuJ6vOiylQt5J761MrXrxLYshQy9bQMBLSuD2hDtQ==
 
-"@joyid/ckb@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@joyid/ckb/-/ckb-1.0.1.tgz#837acecbfd5b120a8702d363384d888d7b25c7b3"
-  integrity sha512-pKAJouigChqcwKgtLw4RNOwi+nBh3NVjpU+qZd+uu3wmoTpivnSRLbJH8/SlkgQcWn2aJ+mDJchR8GpQYh5H6Q==
+"@joyid/ckb@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@joyid/ckb/-/ckb-1.1.1.tgz#4b8087f9268c97115e6190fd7ae31c34b2e19eeb"
+  integrity sha512-UIDH41PKN6EnLp1j9/6P4Pb+IaBuJKwLRw7Azo6q4E7uLgYu1E1vjBCYwsyYY1xqr8iwwZ1eyrbNgnTIH2B4vQ==
   dependencies:
     "@joyid/common" "0.2.0"
-    "@nervosnetwork/ckb-sdk-utils" "^0.109.2"
+    "@nervosnetwork/ckb-sdk-utils" "^0.109.5"
     cross-fetch "4.0.0"
     uncrypto "^0.1.3"
 
@@ -304,21 +305,21 @@
   resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.2.tgz#0f164b726869f71da3c594171df5ebc1c4b0a407"
   integrity sha512-O+6Gs8UeDbyFpbSh2CPEz/UOrrdWPTBYNblZK5CxxLisYt4kGX3Sc+czffFonyjiGSq3jWLwJS/CCJc7tBr4sQ==
 
-"@nervosnetwork/ckb-sdk-utils@^0.109.2":
-  version "0.109.3"
-  resolved "https://registry.yarnpkg.com/@nervosnetwork/ckb-sdk-utils/-/ckb-sdk-utils-0.109.3.tgz#19dafa7608d703456043d1f24cce8256ff1bc28d"
-  integrity sha512-sV3WXlZmd765qtFsXpwl0Bl3hOgGev15Og810acO6iC0cVHEVvv/Uiabd8a2xkqyfziRDI0tfWC0DewOJB28rg==
+"@nervosnetwork/ckb-sdk-utils@^0.109.5":
+  version "0.109.5"
+  resolved "https://registry.yarnpkg.com/@nervosnetwork/ckb-sdk-utils/-/ckb-sdk-utils-0.109.5.tgz#5f760cf2a4ec8f76d5ee42ce7408c8859646073b"
+  integrity sha512-Tx642hcJWbN8W3KzCIhIo49yzJ8LMqWopQCSBDKuRmwHesO/bvJqYojCVwfrOyROtFOPhgjyiGm5RXBuxm0KpQ==
   dependencies:
-    "@nervosnetwork/ckb-types" "0.109.3"
+    "@nervosnetwork/ckb-types" "0.109.5"
     bech32 "2.0.0"
-    elliptic "6.5.4"
+    elliptic "6.6.1"
     jsbi "3.1.3"
     tslib "2.3.1"
 
-"@nervosnetwork/[email protected].3":
-  version "0.109.3"
-  resolved "https://registry.yarnpkg.com/@nervosnetwork/ckb-types/-/ckb-types-0.109.3.tgz#730bd21d2b90dc3cfb491639381b93a82ea2ae54"
-  integrity sha512-i9EVTXCT0bTLpAQXAoF5zHGLWYCXNE5AP4Zl0Niwl3ZplaVAZHNU6ygsh2O3EGmCFv5qlkoY2DuLmsjysEaNLA==
+"@nervosnetwork/[email protected].5":
+  version "0.109.5"
+  resolved "https://registry.yarnpkg.com/@nervosnetwork/ckb-types/-/ckb-types-0.109.5.tgz#c302eb3149513dc22fe3905265a397d37088c7cd"
+  integrity sha512-5jQNjFw76YCd+Ppl+0RvBWzxwvWaKfWC5wjVFFdNAieX7xksCHfZFIeow8je7AF8uVypwe56WlLBlblxw9NBBQ==
 
 "@noble/ciphers@^0.5.3":
   version "0.5.3"
@@ -349,6 +350,11 @@
   resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.5.0.tgz#abadc5ca20332db2b1b2aa3e496e9af1213570b0"
   integrity sha512-1j6kQFb7QRru7eKN3ZDvRcP13rugwdxZqCjbiAVZfIJwgj2A65UmT4TgARXGlXgnRkORLTDTrO19ZErt7+QXgA==
 
+"@noble/hashes@^1.2.0":
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.7.1.tgz#5738f6d765710921e7a751e00c20ae091ed8db0f"
+  integrity sha512-B8XBPsn4vT/KJAGqDzbwztd+6Yte3P4V7iafm24bxgDe/mlRuK6xmWPuCNrKt2vDafZ8MfJLlchDG/vYafQEjQ==
+
 "@parcel/[email protected]":
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/@parcel/bundler-default/-/bundler-default-2.11.0.tgz#b682185ed93b1d977f4174779cbe426a4876cfc2"
@@ -1257,6 +1263,11 @@ base-x@^4.0.0:
   resolved "https://registry.yarnpkg.com/base-x/-/base-x-4.0.0.tgz#d0e3b7753450c73f8ad2389b5c018a4af7b2224a"
   integrity sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw==
 
+base-x@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/base-x/-/base-x-5.0.0.tgz#6d835ceae379130e1a4cb846a70ac4746f28ea9b"
+  integrity sha512-sMW3VGSX1QWVFA6l8U62MLKz29rRfpTlYdCqLdpLo1/Yd4zZwSbnUaDfciIAowAqvq7YFnWq9hrhdg1KYgc1lQ==
+
 base64-js@^1.3.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
@@ -1419,6 +1430,13 @@ bs58@^5.0.0:
   dependencies:
     base-x "^4.0.0"
 
+bs58@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/bs58/-/bs58-6.0.0.tgz#a2cda0130558535dd281a2f8697df79caaf425d8"
+  integrity sha512-PD0wEnEYg6ijszw/u8s+iI3H17cTymlrwkKhDhPZq+Sokl3AU4htyBFTjAeNAlCCmg0f53g6ih3jATyCKftTfw==
+  dependencies:
+    base-x "^5.0.0"
+
 bs58check@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/bs58check/-/bs58check-2.1.2.tgz#53b018291228d82a5aa08e7d796fdafda54aebfc"
@@ -1428,6 +1446,14 @@ bs58check@^2.1.2:
     create-hash "^1.1.0"
     safe-buffer "^5.1.2"
 
+bs58check@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/bs58check/-/bs58check-4.0.0.tgz#46cda52a5713b7542dcb78ec2efdf78f5bf1d23c"
+  integrity sha512-FsGDOnFg9aVI9erdriULkd/JjEWONV/lQE5aYziB5PoBsXRind56lh8doIZIc9X4HoxT5x4bLjMWN1/NB8Zp5g==
+  dependencies:
+    "@noble/hashes" "^1.2.0"
+    bs58 "^6.0.0"
+
 buffer-equals@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/buffer-equals/-/buffer-equals-1.0.4.tgz#0353b54fd07fd9564170671ae6f66b9cf10d27f5"
@@ -1721,10 +1747,10 @@ electron-to-chromium@^1.4.668:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.681.tgz#5f23fad8aa7e1f64cbb7dd9d15c7e39a1cd7e6e3"
   integrity sha512-1PpuqJUFWoXZ1E54m8bsLPVYwIVCRzvaL+n5cjigGga4z854abDnFRc+cTa2th4S79kyGqya/1xoR7h+Y5G5lg==
 
-elliptic@6.5.4:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
-  integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
+elliptic@6.6.1:
+  version "6.6.1"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.6.1.tgz#3b8ffb02670bf69e382c7f65bf524c97c5405c06"
+  integrity sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g==
   dependencies:
     bn.js "^4.11.9"
     brorand "^1.1.0"

examples/create-dob/yarn.lock

@@ -6,7 +6,7 @@ TOP := $(cur_dir)
 # RUSTFLAGS that are likely to be tweaked by developers. For example,
 # while we enable debug logs by default here, some might want to strip them
 # for minimal code size / consumed cycles.
-CUSTOM_RUSTFLAGS := --cfg debug_assertions
+CUSTOM_RUSTFLAGS := -C debug_assertions
 # Additional cargo args to append here. For example, one can use
 # make test CARGO_ARGS="-- --nocapture" so as to inspect data emitted to
 # stdout in unit tests

examples/simple-lock/Cargo.lock

@@ -96,7 +96,7 @@ If you want to test them in devnet/testnet blockchain, then `offckb` might be th
 
 ```sh
 cd frontend
-offckb deploy --network devnet
+offckb deploy -t --network devnet
 ```
 
 If successfully deployed, you will see the deploy script info for your smart contract recorded in the `offckb.config.ts` file. You can then directly import and use your smart contract in your frontend Dapp like this:

examples/simple-lock/Makefile

@@ -4,5 +4,5 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-ckb-std = "0.15.1"
+ckb-std = "0.16.4"
 ckb-hash = {version = "0.114.0", default-features = false, features = ["ckb-contract"] }

examples/simple-lock/README.md

@@ -21,6 +21,11 @@ pub enum Error {
     ItemMissing,
     LengthNotEnough,
     Encoding,
+    WaitFailure,
+    InvalidFd,
+    OtherEndClosed,
+    MaxVmsSpawned,
+    MaxFdsCreated,
     // Add customized errors here...
     CheckError,
     UnMatch,
@@ -33,6 +38,11 @@ impl From<SysError> for Error {
             SysError::ItemMissing => Self::ItemMissing,
             SysError::LengthNotEnough(_) => Self::LengthNotEnough,
             SysError::Encoding => Self::Encoding,
+            SysError::WaitFailure => Self::WaitFailure,
+            SysError::InvalidFd => Self::InvalidFd,
+            SysError::OtherEndClosed => Self::OtherEndClosed,
+            SysError::MaxVmsSpawned => Self::MaxVmsSpawned,
+            SysError::MaxFdsCreated => Self::MaxFdsCreated,
             SysError::Unknown(err_code) => panic!("unexpected sys error {}", err_code),
         }
     }