@ckb-ccc/core 0.0.10-alpha.0 → 0.0.10-alpha.5

package/dist.commonjs/signer/ckb/signerCkbPrivateKey.js

@@ -2,56 +2,29 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SignerCkbPrivateKey = void 0;
 const secp256k1_1 = require("@noble/curves/secp256k1");
-const address_1 = require("../../address");
 const bytes_1 = require("../../bytes");
 const ckb_1 = require("../../ckb");
-const client_1 = require("../../client");
 const hasher_1 = require("../../hasher");
 const hex_1 = require("../../hex");
 const num_1 = require("../../num");
-const signer_1 = require("../signer");
-class SignerCkbPrivateKey extends signer_1.Signer {
-    get type() {
-        return signer_1.SignerType.CKB;
-    }
-    get signType() {
-        return signer_1.SignerSignType.CkbSecp256k1;
-    }
+const signerCkbPublicKey_1 = require("./signerCkbPublicKey");
+class SignerCkbPrivateKey extends signerCkbPublicKey_1.SignerCkbPublicKey {
     constructor(client, privateKey) {
-        super(client);
-        this.privateKey = (0, hex_1.hexFrom)(privateKey);
-        if ((0, bytes_1.bytesFrom)(this.privateKey).length !== 32) {
+        const pk = (0, hex_1.hexFrom)(privateKey);
+        if ((0, bytes_1.bytesFrom)(pk).length !== 32) {
             throw new Error("Private key must be 32 bytes!");
         }
-    }
-    async connect() { }
-    async isConnected() {
-        return true;
-    }
-    async getInternalAddress() {
-        return this.getRecommendedAddress();
-    }
-    async getAddressObjs() {
-        const publicKey = this.getPublicKey();
-        return [
-            await address_1.Address.fromKnownScript(this.client, client_1.KnownScript.Secp256k1Blake160, (0, bytes_1.bytesFrom)((0, hasher_1.hashCkb)(publicKey)).slice(0, 20)),
-        ];
+        super(client, secp256k1_1.secp256k1.getPublicKey((0, bytes_1.bytesFrom)(pk), true));
+        this.privateKey = pk;
     }
     async signMessageRaw(message) {
-        const signature = secp256k1_1.secp256k1.sign((0, bytes_1.bytesFrom)(message), (0, bytes_1.bytesFrom)(this.privateKey));
+        const msg = typeof message === "string" ? message : (0, hex_1.hexFrom)(message);
+        const buffer = (0, bytes_1.bytesFrom)(`Nervos Message:${msg}`, "utf8");
+        const hash = (0, hasher_1.hashCkb)(buffer);
+        const signature = secp256k1_1.secp256k1.sign((0, bytes_1.bytesFrom)(hash), (0, bytes_1.bytesFrom)(this.privateKey));
         const { r, s, recovery } = signature;
         return (0, hex_1.hexFrom)((0, bytes_1.bytesConcat)((0, num_1.numBeToBytes)(r, 32), (0, num_1.numBeToBytes)(s, 32), (0, num_1.numBeToBytes)(recovery, 1)));
     }
-    getPublicKey() {
-        return secp256k1_1.secp256k1.getPublicKey((0, bytes_1.bytesFrom)(this.privateKey), true);
-    }
-    async prepareTransaction(txLike) {
-        const tx = ckb_1.Transaction.from(txLike);
-        const { script } = await this.getRecommendedAddressObj();
-        await tx.addCellDepsOfKnownScripts(this.client, client_1.KnownScript.Secp256k1Blake160);
-        await tx.prepareSighashAllWitness(script, 65, this.client);
-        return tx;
-    }
     async signOnlyTransaction(txLike) {
         const tx = ckb_1.Transaction.from(txLike);
         const { script } = await this.getRecommendedAddressObj();

package/dist.commonjs/signer/ckb/signerCkbPublicKey.d.ts

@@ -0,0 +1,18 @@
+import { Address } from "../../address";
+import { Transaction, TransactionLike } from "../../ckb";
+import { Client } from "../../client";
+import { Hex, HexLike } from "../../hex";
+import { Signer, SignerSignType, SignerType } from "../signer";
+export declare class SignerCkbPublicKey extends Signer {
+    get type(): SignerType;
+    get signType(): SignerSignType;
+    readonly publicKey: Hex;
+    constructor(client: Client, publicKey: HexLike);
+    connect(): Promise<void>;
+    isConnected(): Promise<boolean>;
+    getInternalAddress(): Promise<string>;
+    getIdentity(): Promise<string>;
+    getAddressObjs(): Promise<Address[]>;
+    prepareTransaction(txLike: TransactionLike): Promise<Transaction>;
+}
+//# sourceMappingURL=signerCkbPublicKey.d.ts.map

package/dist.commonjs/signer/ckb/signerCkbPublicKey.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"signerCkbPublicKey.d.ts","sourceRoot":"","sources":["../../../src/signer/ckb/signerCkbPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACzD,OAAO,EAAE,MAAM,EAAe,MAAM,cAAc,CAAC;AAEnD,OAAO,EAAE,GAAG,EAAE,OAAO,EAAW,MAAM,WAAW,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAE/D,qBAAa,kBAAmB,SAAQ,MAAM;IAC5C,IAAI,IAAI,IAAI,UAAU,CAErB;IAED,IAAI,QAAQ,IAAI,cAAc,CAE7B;IAED,SAAgB,SAAS,EAAE,GAAG,CAAC;gBAEnB,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO;IASxC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAExB,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAI/B,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAIrC,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAI9B,cAAc,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAUpC,kBAAkB,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC;CAUxE"}

package/dist.commonjs/signer/ckb/signerCkbPublicKey.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SignerCkbPublicKey = void 0;
+const address_1 = require("../../address");
+const bytes_1 = require("../../bytes");
+const ckb_1 = require("../../ckb");
+const client_1 = require("../../client");
+const hasher_1 = require("../../hasher");
+const hex_1 = require("../../hex");
+const signer_1 = require("../signer");
+class SignerCkbPublicKey extends signer_1.Signer {
+    get type() {
+        return signer_1.SignerType.CKB;
+    }
+    get signType() {
+        return signer_1.SignerSignType.CkbSecp256k1;
+    }
+    constructor(client, publicKey) {
+        super(client);
+        this.publicKey = (0, hex_1.hexFrom)(publicKey);
+        if ((0, bytes_1.bytesFrom)(this.publicKey).length !== 33) {
+            throw new Error("Public key must be 33 bytes!");
+        }
+    }
+    async connect() { }
+    async isConnected() {
+        return true;
+    }
+    async getInternalAddress() {
+        return this.getRecommendedAddress();
+    }
+    async getIdentity() {
+        return this.publicKey;
+    }
+    async getAddressObjs() {
+        return [
+            await address_1.Address.fromKnownScript(this.client, client_1.KnownScript.Secp256k1Blake160, (0, bytes_1.bytesFrom)((0, hasher_1.hashCkb)(this.publicKey)).slice(0, 20)),
+        ];
+    }
+    async prepareTransaction(txLike) {
+        const tx = ckb_1.Transaction.from(txLike);
+        const { script } = await this.getRecommendedAddressObj();
+        await tx.addCellDepsOfKnownScripts(this.client, client_1.KnownScript.Secp256k1Blake160);
+        await tx.prepareSighashAllWitness(script, 65, this.client);
+        return tx;
+    }
+}
+exports.SignerCkbPublicKey = SignerCkbPublicKey;

package/dist.commonjs/signer/ckb/verifyCkbSecp256k1.d.ts

@@ -0,0 +1,5 @@
+import { BytesLike } from "../../bytes";
+import { Hex } from "../../hex";
+export declare function messageHashCkbSecp256k1(message: string | BytesLike): Hex;
+export declare function verifyMessageCkbSecp256k1(message: string | BytesLike, signature: string, publicKey: string): boolean;
+//# sourceMappingURL=verifyCkbSecp256k1.d.ts.map

package/dist.commonjs/signer/ckb/verifyCkbSecp256k1.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"verifyCkbSecp256k1.d.ts","sourceRoot":"","sources":["../../../src/signer/ckb/verifyCkbSecp256k1.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAa,MAAM,aAAa,CAAC;AAEnD,OAAO,EAAE,GAAG,EAAW,MAAM,WAAW,CAAC;AAGzC,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,GAAG,CAIxE;AAED,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAUT"}

package/dist.commonjs/signer/ckb/verifyCkbSecp256k1.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.verifyMessageCkbSecp256k1 = exports.messageHashCkbSecp256k1 = void 0;
+const secp256k1_1 = require("@noble/curves/secp256k1");
+const bytes_1 = require("../../bytes");
+const hasher_1 = require("../../hasher");
+const hex_1 = require("../../hex");
+const num_1 = require("../../num");
+function messageHashCkbSecp256k1(message) {
+    const msg = typeof message === "string" ? message : (0, hex_1.hexFrom)(message);
+    const buffer = (0, bytes_1.bytesFrom)(`Nervos Message:${msg}`, "utf8");
+    return (0, hasher_1.hashCkb)(buffer);
+}
+exports.messageHashCkbSecp256k1 = messageHashCkbSecp256k1;
+function verifyMessageCkbSecp256k1(message, signature, publicKey) {
+    const signatureBytes = (0, bytes_1.bytesFrom)(signature);
+    return secp256k1_1.secp256k1.verify(new secp256k1_1.secp256k1.Signature((0, num_1.numFrom)(signatureBytes.slice(0, 32)), (0, num_1.numFrom)(signatureBytes.slice(32, 64))).addRecoveryBit(Number((0, num_1.numFrom)(signatureBytes.slice(64, 65)))), (0, bytes_1.bytesFrom)(messageHashCkbSecp256k1(message)), (0, bytes_1.bytesFrom)(publicKey));
+}
+exports.verifyMessageCkbSecp256k1 = verifyMessageCkbSecp256k1;

package/dist.commonjs/signer/signer/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/signer/signer/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/signer/signer/index.ts"],"names":[],"mappings":"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"}

package/dist.commonjs/signer/signer/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SignerInfo = exports.Signer = exports.Signature = exports.SignerType = exports.SignerSignType = void 0;
 const btc_1 = require("../btc");
+const verifyCkbSecp256k1_1 = require("../ckb/verifyCkbSecp256k1");
 const verifyJoyId_1 = require("../ckb/verifyJoyId");
 const verify_1 = require("../evm/verify");
 const verify_2 = require("../nostr/verify");
@@ -66,6 +67,7 @@ class Signer {
             case SignerSignType.NostrEvent:
                 return (0, verify_2.verifyMessageNostrEvent)(message, signature.signature, signature.identity);
             case SignerSignType.CkbSecp256k1:
+                return (0, verifyCkbSecp256k1_1.verifyMessageCkbSecp256k1)(message, signature.signature, signature.identity);
             case SignerSignType.Unknown:
                 throw new Error("Unknown signer sign type");
         }

package/dist.commonjs/utils/index.d.ts

@@ -3,7 +3,7 @@
  *
  * @param transformer - The transformer.
  * @param value - The value to be transformed.
- * @returns If the value is empty, it remains its type. Otherwise it will be transformed.
+ * @returns If the value is empty, it becomes undefined. Otherwise it will be transformed.
  */
 export declare function apply<T, R>(transformer: (val: T) => R, value: undefined): undefined;
 /**
@@ -11,15 +11,15 @@ export declare function apply<T, R>(transformer: (val: T) => R, value: undefined
  *
  * @param transformer - The transformer.
  * @param value - The value to be transformed.
- * @returns If the value is empty, it remains its type. Otherwise it will be transformed.
+ * @returns If the value is empty, it becomes undefined. Otherwise it will be transformed.
  */
-export declare function apply<T, R>(transformer: (val: T) => R, value: null): null;
+export declare function apply<T, R>(transformer: (val: T) => R, value: null): undefined;
 /**
  * A type safe way to apply a transformer on a value if it's not empty.
  *
  * @param transformer - The transformer.
  * @param value - The value to be transformed.
- * @returns If the value is empty, it remains its type. Otherwise it will be transformed.
+ * @returns If the value is empty, it becomes undefined. Otherwise it will be transformed.
  */
 export declare function apply<T, R>(transformer: (val: T) => R, value: T): R;
 /**
@@ -27,7 +27,7 @@ export declare function apply<T, R>(transformer: (val: T) => R, value: T): R;
  *
  * @param transformer - The transformer.
  * @param value - The value to be transformed.
- * @returns If the value is empty, it remains its type. Otherwise it will be transformed.
+ * @returns If the value is empty, it becomes undefined. Otherwise it will be transformed.
  */
 export declare function apply<T, R>(transformer: (val: T) => R, value: T | undefined): R | undefined;
 /**
@@ -35,17 +35,26 @@ export declare function apply<T, R>(transformer: (val: T) => R, value: T | undef
  *
  * @param transformer - The transformer.
  * @param value - The value to be transformed.
- * @returns If the value is empty, it remains its type. Otherwise it will be transformed.
+ * @returns If the value is empty, it becomes undefined. Otherwise it will be transformed.
  */
-export declare function apply<T, R>(transformer: (val: T) => R, value: T | null): R | null;
+export declare function apply<T, R>(transformer: (val: T) => R, value: T | null): R | undefined;
 /**
  * A type safe way to apply a transformer on a value if it's not empty.
  *
  * @param transformer - The transformer.
  * @param value - The value to be transformed.
- * @returns If the value is empty, it remains its type. Otherwise it will be transformed.
+ * @returns If the value is empty, it becomes undefined. Otherwise it will be transformed.
  */
-export declare function apply<T, R>(transformer: (val: T) => R, value: undefined | null): undefined | null;
+export declare function apply<T, R>(transformer: (val: T) => R, value: undefined | null): undefined;
+/**
+/**
+ * A type safe way to apply a transformer on a value if it's not empty.
+ *
+ * @param transformer - The transformer.
+ * @param value - The value to be transformed.
+ * @returns If the value is empty, it becomes undefined. Otherwise it will be transformed.
+ */
+export declare function apply<T, R>(transformer: (val: T) => R, value: T | undefined | null): R | undefined;
 /**
  * Similar to Array.reduce, but the accumulator can returns Promise.
  *

package/dist.commonjs/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EACxB,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAC1B,KAAK,EAAE,SAAS,GACf,SAAS,CAAC;AACb;;;;;;GAMG;AACH,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,IAAI,GAAG,IAAI,CAAC;AAC3E;;;;;;GAMG;AACH,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC;AACrE;;;;;;GAMG;AACH,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EACxB,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAC1B,KAAK,EAAE,CAAC,GAAG,SAAS,GACnB,CAAC,GAAG,SAAS,CAAC;AACjB;;;;;;GAMG;AACH,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EACxB,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAC1B,KAAK,EAAE,CAAC,GAAG,IAAI,GACd,CAAC,GAAG,IAAI,CAAC;AACZ;;;;;;GAMG;AACH,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EACxB,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAC1B,KAAK,EAAE,SAAS,GAAG,IAAI,GACtB,SAAS,GAAG,IAAI,CAAC;AAmBpB;;;;;;GAMG;AACH,wBAAsB,WAAW,CAAC,CAAC,EAAE,CAAC,EACpC,MAAM,EAAE,CAAC,EAAE,EACX,WAAW,EAAE,CACX,CAAC,EAAE,CAAC,EACJ,CAAC,EAAE,CAAC,KACD,OAAO,CAAC,CAAC,GAAG,SAAS,GAAG,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,GAAG,IAAI,GAAG,IAAI,GACtE,OAAO,CAAC,CAAC,CAAC,CAAC;AACd;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAAC,CAAC,EAAE,CAAC,EACpC,MAAM,EAAE,CAAC,EAAE,EACX,WAAW,EAAE,CACX,CAAC,EAAE,CAAC,EACJ,CAAC,EAAE,CAAC,EACJ,CAAC,EAAE,MAAM,EACT,MAAM,EAAE,CAAC,EAAE,KACR,OAAO,CAAC,CAAC,GAAG,SAAS,GAAG,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,GAAG,IAAI,GAAG,IAAI,EACvE,IAAI,EAAE,CAAC,GACN,OAAO,CAAC,CAAC,CAAC,CAAC;AA4Bd,wBAAgB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAEpD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EACxB,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAC1B,KAAK,EAAE,SAAS,GACf,SAAS,CAAC;AACb;;;;;;GAMG;AACH,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,IAAI,GAAG,SAAS,CAAC;AAChF;;;;;;GAMG;AACH,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC;AACrE;;;;;;GAMG;AACH,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EACxB,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAC1B,KAAK,EAAE,CAAC,GAAG,SAAS,GACnB,CAAC,GAAG,SAAS,CAAC;AACjB;;;;;;GAMG;AACH,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EACxB,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAC1B,KAAK,EAAE,CAAC,GAAG,IAAI,GACd,CAAC,GAAG,SAAS,CAAC;AACjB;;;;;;GAMG;AACH,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EACxB,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAC1B,KAAK,EAAE,SAAS,GAAG,IAAI,GACtB,SAAS,CAAC;AACb;;;;;;;GAOG;AACH,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EACxB,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAC1B,KAAK,EAAE,CAAC,GAAG,SAAS,GAAG,IAAI,GAC1B,CAAC,GAAG,SAAS,CAAC;AAmBjB;;;;;;GAMG;AACH,wBAAsB,WAAW,CAAC,CAAC,EAAE,CAAC,EACpC,MAAM,EAAE,CAAC,EAAE,EACX,WAAW,EAAE,CACX,CAAC,EAAE,CAAC,EACJ,CAAC,EAAE,CAAC,KACD,OAAO,CAAC,CAAC,GAAG,SAAS,GAAG,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,GAAG,IAAI,GAAG,IAAI,GACtE,OAAO,CAAC,CAAC,CAAC,CAAC;AACd;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAAC,CAAC,EAAE,CAAC,EACpC,MAAM,EAAE,CAAC,EAAE,EACX,WAAW,EAAE,CACX,CAAC,EAAE,CAAC,EACJ,CAAC,EAAE,CAAC,EACJ,CAAC,EAAE,MAAM,EACT,MAAM,EAAE,CAAC,EAAE,KACR,OAAO,CAAC,CAAC,GAAG,SAAS,GAAG,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,GAAG,IAAI,GAAG,IAAI,EACvE,IAAI,EAAE,CAAC,GACN,OAAO,CAAC,CAAC,CAAC,CAAC;AA4Bd,wBAAgB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAEpD"}

package/dist.commonjs/utils/index.js

@@ -6,11 +6,11 @@ exports.isWebview = exports.reduceAsync = exports.apply = void 0;
  *
  * @param transformer - The transformer.
  * @param value - The value to be transformed.
- * @returns If the value is empty, it remains its type. Otherwise it will be transformed.
+ * @returns If the value is empty, it becomes undefined. Otherwise it will be transformed.
  */
 function apply(transformer, value) {
     if (value == null) {
-        return value;
+        return undefined;
     }
     return transformer(value);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/core",
-  "version": "0.0.10-alpha.0",
+  "version": "0.0.10-alpha.5",
   "description": "Core of CCC - CKBer's Codebase",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",
@@ -57,7 +57,7 @@
   },
   "dependencies": {
     "@ckb-lumos/helpers": "^0.22.2",
-    "@joyid/ckb": "^0.0.11",
+    "@joyid/ckb": "^1.0.1",
     "@noble/curves": "^1.4.2",
     "@noble/hashes": "^1.4.0",
     "abort-controller": "^3.0.0",
@@ -68,5 +68,5 @@
     "cross-fetch": "^4.0.0",
     "ethers": "^6.13.1"
   },
-  "gitHead": "8a4c789419f5e12e1f230cead213c59373834a1a"
+  "gitHead": "40a3d50aa3697a98c7ac711cd526ef322ccad760"
 }

package/src/ckb/transaction.ts

@@ -2,7 +2,7 @@ import type { TransactionSkeletonType } from "@ckb-lumos/helpers";
 import { ClientCollectableSearchKeyFilterLike } from "../advancedBarrel";
 import { Bytes, BytesLike, bytesFrom } from "../bytes";
 import { CellDepInfoLike, Client, KnownScript } from "../client";
-import { Zero, fixedPointFrom } from "../fixedPoint";
+import { Zero, fixedPointFrom, fixedPointToString } from "../fixedPoint";
 import { Hasher, hashCkb } from "../hasher";
 import { Hex, HexLike, hexFrom } from "../hex";
 import {
@@ -210,7 +210,7 @@ export class OutPoint {
 export type CellOutputLike = {
   capacity: NumLike;
   lock: ScriptLike;
-  type?: ScriptLike;
+  type?: ScriptLike | null;
 };
 export class CellOutput {
   /**
@@ -387,9 +387,9 @@ export class Cell {
 
 export type CellInputLike = {
   previousOutput: OutPointLike;
-  since?: NumLike;
-  cellOutput?: CellOutputLike;
-  outputData?: HexLike;
+  since?: NumLike | null;
+  cellOutput?: CellOutputLike | null;
+  outputData?: HexLike | null;
 };
 export class CellInput {
   /**
@@ -659,9 +659,9 @@ export class CellDep {
 }
 
 export type WitnessArgsLike = {
-  lock?: HexLike;
-  inputType?: HexLike;
-  outputType?: HexLike;
+  lock?: HexLike | null;
+  inputType?: HexLike | null;
+  outputType?: HexLike | null;
 };
 export class WitnessArgs {
   /**
@@ -771,14 +771,16 @@ export function udtBalanceFrom(dataLike: BytesLike) {
 }
 
 export type TransactionLike = {
-  version?: NumLike;
-  cellDeps?: CellDepLike[];
-  headerDeps?: HexLike[];
-  inputs?: CellInputLike[];
-  outputs?: (Omit<CellOutputLike, "capacity"> &
-    Partial<Pick<CellOutputLike, "capacity">>)[];
-  outputsData?: HexLike[];
-  witnesses?: HexLike[];
+  version?: NumLike | null;
+  cellDeps?: CellDepLike[] | null;
+  headerDeps?: HexLike[] | null;
+  inputs?: CellInputLike[] | null;
+  outputs?:
+    | (Omit<CellOutputLike, "capacity"> &
+        Partial<Pick<CellOutputLike, "capacity">>)[]
+    | null;
+  outputsData?: HexLike[] | null;
+  witnesses?: HexLike[] | null;
 };
 export class Transaction {
   /**
@@ -899,10 +901,7 @@ export class Transaction {
     const outputsData = outputs.map((_, i) =>
       hexFrom(tx.outputsData?.[i] ?? "0x"),
     );
-    if (
-      tx.outputsData !== undefined &&
-      outputsData.length < tx.outputsData.length
-    ) {
+    if (tx.outputsData != null && outputsData.length < tx.outputsData.length) {
       outputsData.push(
         ...tx.outputsData.slice(outputsData.length).map((d) => hexFrom(d)),
       );
@@ -1418,7 +1417,10 @@ export class Transaction {
       array: Cell[],
     ) => Promise<T | undefined> | T | undefined,
     init: T,
-  ): Promise<number> {
+  ): Promise<{
+    addedCount: number;
+    accumulated?: T;
+  }> {
     const scripts = (await from.getAddressObjs()).map(({ script }) => script);
     const collectedCells = [];
     let acc: T = init;
@@ -1453,13 +1455,18 @@ export class Transaction {
               }),
             ),
           );
-          return collectedCells.length;
+          return {
+            addedCount: collectedCells.length,
+          };
         }
         acc = next;
       }
     }
 
-    throw new Error("Failed to find enough cells for input");
+    return {
+      addedCount: collectedCells.length,
+      accumulated: acc,
+    };
   }
 
   async completeInputsByCapacity(
@@ -1474,7 +1481,7 @@ export class Transaction {
       return 0;
     }
 
-    return this.completeInputs(
+    const { addedCount, accumulated } = await this.completeInputs(
       from,
       filter ?? {
         scriptLenRange: [0, 1],
@@ -1482,10 +1489,35 @@ export class Transaction {
       },
       (acc, { cellOutput: { capacity } }) => {
         const sum = acc + capacity;
-        return sum > exceptedCapacity ? undefined : sum;
+        return sum >= exceptedCapacity ? undefined : sum;
       },
       inputsCapacity,
     );
+
+    if (accumulated === undefined) {
+      return addedCount;
+    }
+
+    throw new Error(
+      `Insufficient CKB, need ${fixedPointToString(exceptedCapacity - accumulated)} extra CKB`,
+    );
+  }
+
+  async completeInputsAll(
+    from: Signer,
+    filter?: ClientCollectableSearchKeyFilterLike,
+  ): Promise<number> {
+    const { addedCount } = await this.completeInputs(
+      from,
+      filter ?? {
+        scriptLenRange: [0, 1],
+        outputDataLenRange: [0, 1],
+      },
+      (acc, { cellOutput: { capacity } }) => acc + capacity,
+      Zero,
+    );
+
+    return addedCount;
   }
 
   async completeInputsByUdt(from: Signer, type: ScriptLike): Promise<number> {
@@ -1495,7 +1527,7 @@ export class Transaction {
       return 0;
     }
 
-    return this.completeInputs(
+    const { addedCount, accumulated } = await this.completeInputs(
       from,
       {
         script: type,
@@ -1504,10 +1536,18 @@ export class Transaction {
       (acc, { outputData }) => {
         const balance = udtBalanceFrom(outputData);
         const sum = acc + balance;
-        return sum > exceptedBalance ? undefined : sum;
+        return sum >= exceptedBalance ? undefined : sum;
       },
       inputsBalance,
     );
+
+    if (accumulated === undefined) {
+      return addedCount;
+    }
+
+    throw new Error(
+      `Insufficient coin, need ${exceptedBalance - accumulated} extra coin`,
+    );
   }
 
   estimateFee(feeRate: NumLike): Num {
@@ -1524,17 +1564,31 @@ export class Transaction {
     // Complete all inputs extra infos for cache
     await this.getInputsCapacity(from.client);
 
-    let leastFee = this.estimateFee(feeRate);
+    let leastFee = Zero;
     let leastExtraCapacity = Zero;
 
     while (true) {
       const prepared = await from.prepareTransaction(this.clone());
-      const collected = await prepared.completeInputsByCapacity(
-        from,
-        leastFee + leastExtraCapacity,
-        filter,
-      );
+      const collected = await (async () => {
+        try {
+          return await prepared.completeInputsByCapacity(
+            from,
+            leastFee + leastExtraCapacity,
+            filter,
+          );
+        } catch (err) {
+          if (leastExtraCapacity !== Zero) {
+            throw new Error("Not enough capacity for the change cell");
+          }
 
+          throw err;
+        }
+      })();
+
+      if (leastFee === Zero) {
+        // The initial fee is calculated based on prepared transaction
+        leastFee = prepared.estimateFee(feeRate);
+      }
       const extraCapacity =
         (await prepared.getInputsCapacity(from.client)) -
         prepared.getOutputsCapacity();

package/src/client/client.ts

@@ -41,7 +41,7 @@ export enum KnownScript {
 
 export type CellDepInfoLike = {
   cellDep: CellDepLike;
-  type?: ScriptLike;
+  type?: ScriptLike | null;
 };
 
 export class CellDepInfo {

package/src/client/clientPublicMainnet.advanced.ts

@@ -187,6 +187,38 @@ export const MAINNET_SCRIPTS: Record<
       },
     ],
   },
-  [KnownScript.SingleUseLock]: undefined,
-  [KnownScript.OutputTypeProxyLock]: undefined,
+  [KnownScript.SingleUseLock]: {
+    codeHash:
+      "0x8290467a512e5b9a6b816469b0edabba1f4ac474e28ffdd604c2a7c76446bbaf",
+    hashType: "data1",
+    cellDeps: [
+      {
+        cellDep: {
+          outPoint: {
+            txHash:
+              "0x10d63a996157d32c01078058000052674ca58d15f921bec7f1dcdac2160eb66b",
+            index: 4,
+          },
+          depType: "code",
+        },
+      },
+    ],
+  },
+  [KnownScript.OutputTypeProxyLock]: {
+    codeHash:
+      "0x2df53b592db3ae3685b7787adcfef0332a611edb83ca3feca435809964c3aff2",
+    hashType: "data1",
+    cellDeps: [
+      {
+        cellDep: {
+          outPoint: {
+            txHash:
+              "0x10d63a996157d32c01078058000052674ca58d15f921bec7f1dcdac2160eb66b",
+            index: 2,
+          },
+          depType: "code",
+        },
+      },
+    ],
+  },
 };

package/src/client/clientPublicTestnet.advanced.ts

@@ -207,7 +207,7 @@ export const TESTNET_SCRIPTS: Record<
         cellDep: {
           outPoint: {
             txHash:
-              "0x968c326f7a418f07a128f30d9a415251beaa2ec8bd6bbfda65780c94bebb2a85",
+              "0xb4f171c9c9caf7401f54a8e56225ae21d95032150a87a4678eac3f66a3137b93",
             index: 4,
           },
           depType: "code",
@@ -217,14 +217,14 @@ export const TESTNET_SCRIPTS: Record<
   },
   [KnownScript.OutputTypeProxyLock]: {
     codeHash:
-      "0xc0382e4109cff68a4f536441c0266d2e22f2808e61573129c9289ee0e5e5ed43",
+      "0x2df53b592db3ae3685b7787adcfef0332a611edb83ca3feca435809964c3aff2",
     hashType: "data1",
     cellDeps: [
       {
         cellDep: {
           outPoint: {
             txHash:
-              "0x968c326f7a418f07a128f30d9a415251beaa2ec8bd6bbfda65780c94bebb2a85",
+              "0xb4f171c9c9caf7401f54a8e56225ae21d95032150a87a4678eac3f66a3137b93",
             index: 2,
           },
           depType: "code",

package/src/client/clientTypes.advanced.ts

@@ -10,17 +10,17 @@ export function clientSearchKeyRangeFrom([a, b]: [NumLike, NumLike]): [
 }
 
 export type ClientCollectableSearchKeyFilterLike = {
-  script?: ScriptLike;
-  scriptLenRange?: [NumLike, NumLike];
-  outputData?: HexLike;
-  outputDataSearchMode?: "prefix" | "exact" | "partial";
-  outputDataLenRange?: [NumLike, NumLike];
-  outputCapacityRange?: [NumLike, NumLike];
+  script?: ScriptLike | null;
+  scriptLenRange?: [NumLike, NumLike] | null;
+  outputData?: HexLike | null;
+  outputDataSearchMode?: "prefix" | "exact" | "partial" | null;
+  outputDataLenRange?: [NumLike, NumLike] | null;
+  outputCapacityRange?: [NumLike, NumLike] | null;
 };
 export type ClientCollectableSearchKeyLike = {
   script: ScriptLike;
   scriptType: "lock" | "type";
   scriptSearchMode: "prefix" | "exact" | "partial";
-  filter?: ClientCollectableSearchKeyFilterLike;
-  withData?: boolean;
+  filter?: ClientCollectableSearchKeyFilterLike | null;
+  withData?: boolean | null;
 };