@ckb-ccc/core 0.0.11-alpha.2 → 0.0.12-alpha.0

package/dist.commonjs/signer/evm/signerEvm.js

@@ -5,20 +5,21 @@ const index_js_1 = require("../../address/index.js");
 const index_js_2 = require("../../bytes/index.js");
 const index_js_3 = require("../../ckb/index.js");
 const index_js_4 = require("../../client/index.js");
-const index_js_5 = require("../../hex/index.js");
-const index_js_6 = require("../../num/index.js");
-const index_js_7 = require("../../utils/index.js");
-const index_js_8 = require("../signer/index.js");
+const index_js_5 = require("../../hasher/index.js");
+const index_js_6 = require("../../hex/index.js");
+const index_js_7 = require("../../num/index.js");
+const index_js_8 = require("../../utils/index.js");
+const index_js_9 = require("../signer/index.js");
 /**
  * An abstract class extending Signer for Ethereum Virtual Machine (EVM) based signing operations.
  * This class provides methods to get EVM account, internal address, and signing transactions.
  */
-class SignerEvm extends index_js_8.Signer {
+class SignerEvm extends index_js_9.Signer {
     get type() {
-        return index_js_8.SignerType.EVM;
+        return index_js_9.SignerType.EVM;
     }
     get signType() {
-        return index_js_8.SignerSignType.EvmPersonal;
+        return index_js_9.SignerSignType.EvmPersonal;
     }
     /**
      * Gets the internal address, which is the EVM account in this case.
@@ -35,16 +36,37 @@ class SignerEvm extends index_js_8.Signer {
      */
     async getAddressObjs() {
         const account = await this.getEvmAccount();
-        return [
-            await this._getOmniLockEvmAddressObj(account),
-            await this._getOmniLockOldEvmAddressObj(account),
-        ];
+        const addresses = await Promise.all([
+            this._getOmniLockAddresses(account),
+            this._getPWLockAddresses(account),
+        ]);
+        return addresses.flat();
+    }
+    _getOmniLockAddresses(account) {
+        return Promise.all([
+            this._getOmniLockEvmAddressObj(account),
+            this._getOmniLockOldEvmAddressObj(account),
+        ]);
+    }
+    async _getPWLockAddresses(account) {
+        const addr = await this._getPWLockEvmAddressObj(account);
+        if (!addr) {
+            return [];
+        }
+        return [addr];
     }
     async _getOmniLockEvmAddressObj(account) {
-        return index_js_1.Address.fromKnownScript(this.client, index_js_4.KnownScript.OmniLock, (0, index_js_5.hexFrom)([0x12, ...(0, index_js_2.bytesFrom)(account), 0x00]));
+        return index_js_1.Address.fromKnownScript(this.client, index_js_4.KnownScript.OmniLock, (0, index_js_6.hexFrom)([0x12, ...(0, index_js_2.bytesFrom)(account), 0x00]));
     }
     async _getOmniLockOldEvmAddressObj(account) {
-        return index_js_1.Address.fromKnownScript(this.client, index_js_4.KnownScript.OmniLock, (0, index_js_5.hexFrom)([0x1, ...(0, index_js_2.bytesFrom)(account), 0x00]));
+        return index_js_1.Address.fromKnownScript(this.client, index_js_4.KnownScript.OmniLock, (0, index_js_6.hexFrom)([0x1, ...(0, index_js_2.bytesFrom)(account), 0x00]));
+    }
+    async _getPWLockEvmAddressObj(account) {
+        try {
+            return index_js_1.Address.fromKnownScript(this.client, index_js_4.KnownScript.PWLock, (0, index_js_6.hexFrom)((0, index_js_2.bytesFrom)(account)));
+        }
+        catch { }
+        return;
     }
     /**
      * prepare a transaction before signing. This method is not implemented and should be overridden by subclasses.
@@ -54,8 +76,17 @@ class SignerEvm extends index_js_8.Signer {
      */
     async prepareTransaction(txLike) {
         const tx = index_js_3.Transaction.from(txLike);
-        await tx.addCellDepsOfKnownScripts(this.client, index_js_4.KnownScript.OmniLock);
-        return (0, index_js_7.reduceAsync)(await this.getAddressObjs(), (tx, { script }) => tx.prepareSighashAllWitness(script, 85, this.client), tx);
+        if ((await tx.findInputIndexByLockId(await this.client.getKnownScript(index_js_4.KnownScript.OmniLock), this.client)) !== undefined) {
+            await tx.addCellDepsOfKnownScripts(this.client, index_js_4.KnownScript.OmniLock);
+        }
+        if ((await tx.findInputIndexByLockId(await this.client.getKnownScript(index_js_4.KnownScript.PWLock), this.client)) !== undefined) {
+            await tx.addCellDepsOfKnownScripts(this.client, index_js_4.KnownScript.PWLock);
+        }
+        const account = await this.getEvmAccount();
+        const omniLockAddresses = await this._getOmniLockAddresses(account);
+        const pwLockAddresses = await this._getPWLockAddresses(account);
+        const omniTx = (0, index_js_8.reduceAsync)(omniLockAddresses, (tx, { script }) => tx.prepareSighashAllWitness(script, 85, this.client), tx);
+        return (0, index_js_8.reduceAsync)(pwLockAddresses, (tx, { script }) => tx.prepareSighashAllWitness(script, 65, this.client), omniTx);
     }
     /**
      * Signs a transaction without modifying it.
@@ -70,21 +101,42 @@ class SignerEvm extends index_js_8.Signer {
         const { script: oldEvmScript } = await this._getOmniLockOldEvmAddressObj(account);
         tx = await this._signOmniLockScriptForTransaction(tx, evmScript, (hash) => `CKB transaction: ${hash}`);
         tx = await this._signOmniLockScriptForTransaction(tx, oldEvmScript, (hash) => (0, index_js_2.bytesFrom)(hash));
+        const pwAddress = await this._getPWLockEvmAddressObj(account);
+        if (pwAddress) {
+            tx = await this._signPWLockScriptForTransaction(tx, pwAddress.script, (hash) => (0, index_js_2.bytesFrom)(hash));
+        }
         return tx;
     }
     async _signOmniLockScriptForTransaction(tx, script, messageTransformer) {
-        const info = await tx.getSignHashInfo(script, this.client);
+        const info = await this._signPersonalEvmForTransaction(tx, script, messageTransformer);
         if (!info) {
             return tx;
         }
-        const signature = (0, index_js_2.bytesFrom)(await this.signMessageRaw(messageTransformer(info.message)));
-        if (signature[signature.length - 1] >= 27) {
-            signature[signature.length - 1] -= 27;
+        const witness = index_js_3.WitnessArgs.fromBytes(tx.witnesses[info.position]);
+        witness.lock = (0, index_js_6.hexFrom)((0, index_js_2.bytesConcat)((0, index_js_7.numToBytes)(5 * 4 + info.signature.length, 4), (0, index_js_7.numToBytes)(4 * 4, 4), (0, index_js_7.numToBytes)(5 * 4 + info.signature.length, 4), (0, index_js_7.numToBytes)(5 * 4 + info.signature.length, 4), (0, index_js_7.numToBytes)(info.signature.length, 4), info.signature));
+        tx.setWitnessArgsAt(info.position, witness);
+        return tx;
+    }
+    async _signPWLockScriptForTransaction(tx, script, messageTransformer) {
+        const info = await this._signPersonalEvmForTransaction(tx, script, messageTransformer, new index_js_5.HasherKeecak256());
+        if (!info) {
+            return tx;
         }
         const witness = index_js_3.WitnessArgs.fromBytes(tx.witnesses[info.position]);
-        witness.lock = (0, index_js_5.hexFrom)((0, index_js_2.bytesConcat)((0, index_js_6.numToBytes)(5 * 4 + signature.length, 4), (0, index_js_6.numToBytes)(4 * 4, 4), (0, index_js_6.numToBytes)(5 * 4 + signature.length, 4), (0, index_js_6.numToBytes)(5 * 4 + signature.length, 4), (0, index_js_6.numToBytes)(signature.length, 4), signature));
+        witness.lock = (0, index_js_6.hexFrom)(info.signature);
         tx.setWitnessArgsAt(info.position, witness);
         return tx;
     }
+    async _signPersonalEvmForTransaction(tx, script, messageTransformer, hasher) {
+        const info = await tx.getSignHashInfo(script, this.client, hasher);
+        if (!info) {
+            return;
+        }
+        const signature = (0, index_js_2.bytesFrom)(await this.signMessageRaw(messageTransformer(info.message)));
+        if (signature[signature.length - 1] >= 27) {
+            signature[signature.length - 1] -= 27;
+        }
+        return { signature, position: info.position };
+    }
 }
 exports.SignerEvm = SignerEvm;

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/utils/index.d.ts

@@ -71,6 +71,6 @@ export declare function reduceAsync<T, V>(values: T[], accumulator: (a: T, b: T)
  * @param init - The initial value.
  * @returns The accumulated result.
  */
-export declare function reduceAsync<T, V>(values: V[], accumulator: (a: T, b: V, i: number, values: V[]) => Promise<T | undefined | null | void> | T | undefined | null | void, init: T): Promise<T>;
+export declare function reduceAsync<T, V>(values: V[], accumulator: (a: T, b: V, i: number, values: V[]) => Promise<T | undefined | null | void> | T | undefined | null | void, init: T | Promise<T>): Promise<T>;
 export declare function isWebview(userAgent: string): boolean;
 //# sourceMappingURL=index.d.ts.map

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,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"}
+{"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,GAAG,OAAO,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,CAAC,CAAC,CAAC;AA4Bd,wBAAgB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAEpD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/core",
-  "version": "0.0.11-alpha.2",
+  "version": "0.0.12-alpha.0",
   "description": "Core of CCC - CKBer's Codebase",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",
@@ -65,10 +65,9 @@
     "abort-controller": "^3.0.0",
     "bech32": "^2.0.0",
     "bitcoinjs-message": "^2.2.0",
-    "blake2b": "^2.1.4",
     "buffer": "^6.0.3",
     "cross-fetch": "^4.0.0",
     "ethers": "^6.13.1"
   },
-  "gitHead": "fd2ee28eac9dc6a3572181b9da05eba204ee13df"
+  "gitHead": "171a9941a56575dd5db2e3fad21d04bff8ec3fc5"
 }

package/src/address/index.ts

@@ -94,7 +94,7 @@ export class Address {
     client: Client,
     script: KnownScript,
     args: HexLike,
-  ) {
+  ): Promise<Address> {
     return Address.from({
       script: await Script.fromKnownScript(client, script, args),
       prefix: client.addressPrefix,

package/src/ckb/script.ts

@@ -180,7 +180,7 @@ export class Script {
    * @returns An object representing the script in molecule data format.
    */
 
-  _toMolData() {
+  _toMolData(): mol.ScriptType {
     return {
       codeHash: bytesFrom(this.codeHash),
       hashType: hashTypeToBytes(this.hashType),

package/src/ckb/transaction.ts

@@ -7,7 +7,7 @@ import {
   fixedPointFrom,
   fixedPointToString,
 } from "../fixedPoint/index.js";
-import { Hasher, hashCkb } from "../hasher/index.js";
+import { Hasher, HasherCkb, hashCkb } from "../hasher/index.js";
 import { Hex, HexLike, hexFrom } from "../hex/index.js";
 import {
   Num,
@@ -148,7 +148,7 @@ export class OutPoint {
    * @returns An object representing the outpoint in molecule data format.
    */
 
-  _toMolData() {
+  _toMolData(): mol.OutPointType {
     return {
       txHash: bytesFrom(this.txHash),
       index: numToBytes(this.index, 4),
@@ -282,7 +282,7 @@ export class CellOutput {
    * @returns An object representing the cell output in molecule data format.
    */
 
-  _toMolData() {
+  _toMolData(): mol.CellOutputType {
     return {
       capacity: numToBytes(this.capacity, 8),
       lock: this.lock._toMolData(),
@@ -488,7 +488,7 @@ export class CellInput {
    * @returns An object representing the cell input in molecule data format.
    */
 
-  _toMolData() {
+  _toMolData(): mol.CellInputType {
     return {
       previousOutput: this.previousOutput._toMolData(),
       since: numToBytes(this.since, 8),
@@ -599,7 +599,7 @@ export class CellDep {
    * @returns An object representing the cell dependency in molecule data format.
    */
 
-  _toMolData() {
+  _toMolData(): mol.CellDepType {
     return {
       outPoint: this.outPoint._toMolData(),
       depType: depTypeToBytes(this.depType),
@@ -716,7 +716,7 @@ export class WitnessArgs {
    * @returns An object representing the witness arguments in molecule data format.
    */
 
-  _toMolData() {
+  _toMolData(): mol.WitnessArgsType {
     return {
       lock: apply(bytesFrom, this.lock),
       inputType: apply(bytesFrom, this.inputType),
@@ -765,7 +765,7 @@ export class WitnessArgs {
   }
 }
 
-export function udtBalanceFrom(dataLike: BytesLike) {
+export function udtBalanceFrom(dataLike: BytesLike): Num {
   const data = bytesFrom(dataLike).slice(0, 16);
   if (data.length !== 16) {
     throw new Error("Invalid UDT cell data");
@@ -1028,7 +1028,7 @@ export class Transaction {
    * ```
    */
 
-  hash() {
+  hash(): Hex {
     return hashCkb(this.rawToBytes());
   }
 
@@ -1070,10 +1070,10 @@ export class Transaction {
   async getSignHashInfo(
     scriptLike: ScriptLike,
     client: Client,
+    hasher: Hasher = new HasherCkb(),
   ): Promise<{ message: Hex; position: number } | undefined> {
     const script = Script.from(scriptLike);
     let position = -1;
-    const hasher = new Hasher();
     hasher.update(this.hash());
 
     for (let i = 0; i < this.witnesses.length; i += 1) {
@@ -1111,6 +1111,40 @@ export class Transaction {
     };
   }
 
+  /**
+   * Find the first occurrence of a input with the specified lock id
+   *
+   * @param scriptIdLike - The script associated with the transaction, represented as a ScriptLike object without args.
+   * @param client - The client for complete extra infos in the transaction.
+   * @returns A promise that resolves to the found index
+   *
+   * @example
+   * ```typescript
+   * const index = await tx.findInputIndexByLockId(scriptIdLike, client);
+   * ```
+   */
+  async findInputIndexByLockId(
+    scriptLike: Pick<ScriptLike, "codeHash" | "hashType">,
+    client: Client,
+  ): Promise<number | undefined> {
+    const script = Script.from({ ...scriptLike, args: "0x" });
+
+    for (let i = 0; i < this.inputs.length; i += 1) {
+      const input = this.inputs[i];
+      await input.completeExtraInfos(client);
+      if (!input.cellOutput) {
+        throw new Error("Unable to complete input");
+      }
+
+      if (
+        script.codeHash === input.cellOutput.lock.codeHash &&
+        script.hashType === input.cellOutput.lock.hashType
+      ) {
+        return i;
+      }
+    }
+  }
+
   /**
    * Find the first occurrence of a input with the specified lock
    *
@@ -1194,6 +1228,27 @@ export class Transaction {
     });
   }
 
+  /**
+   * Add cell deps at the start if they are not existed
+   *
+   * @param cellDepLikes - The cell deps to add
+   *
+   * @example
+   * ```typescript
+   * tx.addCellDepsAtBegin(cellDep);
+   * ```
+   */
+  addCellDepsAtStart(...cellDepsLike: (CellDepLike | CellDepLike[])[]): void {
+    cellDepsLike.flat().forEach((cellDepLike) => {
+      const cellDep = CellDep.from(cellDepLike);
+      if (this.cellDeps.some((c) => c.eq(cellDep))) {
+        return;
+      }
+
+      this.cellDeps.unshift(cellDep);
+    });
+  }
+
   /**
    * Add cell dep from infos if they are not existed
    *
@@ -1572,10 +1627,10 @@ export class Transaction {
     let leastExtraCapacity = Zero;
 
     while (true) {
-      const prepared = await from.prepareTransaction(this.clone());
+      const tx = this.clone();
       const collected = await (async () => {
         try {
-          return await prepared.completeInputsByCapacity(
+          return await tx.completeInputsByCapacity(
             from,
             leastFee + leastExtraCapacity,
             filter,
@@ -1589,22 +1644,21 @@ export class Transaction {
         }
       })();
 
+      await from.prepareTransaction(tx);
       if (leastFee === Zero) {
         // The initial fee is calculated based on prepared transaction
-        leastFee = prepared.estimateFee(feeRate);
+        leastFee = tx.estimateFee(feeRate);
       }
       const extraCapacity =
-        (await prepared.getInputsCapacity(from.client)) -
-        prepared.getOutputsCapacity();
+        (await tx.getInputsCapacity(from.client)) - tx.getOutputsCapacity();
       // The extra capacity paid the fee without a change
       if (extraCapacity === leastFee) {
-        this.copy(prepared);
+        this.copy(tx);
         return [collected, false];
       }
 
-      let changed = prepared.clone();
       const needed = numFrom(
-        await Promise.resolve(change(changed, extraCapacity - leastFee)),
+        await Promise.resolve(change(tx, extraCapacity - leastFee)),
       );
       // No enough extra capacity to create new cells for change
       if (needed > Zero) {
@@ -1613,8 +1667,7 @@ export class Transaction {
       }
 
       if (
-        (await changed.getInputsCapacity(from.client)) -
-          changed.getOutputsCapacity() !==
+        (await tx.getInputsCapacity(from.client)) - tx.getOutputsCapacity() !==
         leastFee
       ) {
         throw new Error(
@@ -1623,14 +1676,14 @@ export class Transaction {
       }
 
       // New change cells created, update the fee
-      await from.prepareTransaction(changed);
-      const changedFee = changed.estimateFee(feeRate);
+      await from.prepareTransaction(tx);
+      const changedFee = tx.estimateFee(feeRate);
       if (leastFee > changedFee) {
         throw new Error("The change function removed existed transaction data");
       }
       // The fee has been paid
       if (leastFee === changedFee) {
-        this.copy(changed);
+        this.copy(tx);
         return [collected, true];
       }
 

package/src/client/client.advanced.ts

@@ -57,7 +57,7 @@ export function filterScript(
 export function filterNumByRange(
   lengthLike: NumLike,
   range: [NumLike, NumLike] | undefined,
-) {
+): boolean {
   if (!range) {
     return true;
   }

package/src/client/client.ts

@@ -36,6 +36,7 @@ export enum KnownScript {
   XUdt = "XUdt",
   JoyId = "JoyId",
   COTA = "COTA",
+  PWLock = "PWLock",
   OmniLock = "OmniLock",
   NostrLock = "NostrLock",
   UniqueType = "UniqueType",
@@ -198,16 +199,26 @@ export abstract class Client {
     limit = 10,
   ): AsyncGenerator<Cell> {
     const key = ClientIndexerSearchKey.from(keyLike);
+    const foundedOutPoints = [];
+
     for (const cell of this.usableCells) {
-      if (filterCell(key, cell)) {
-        yield cell;
+      if (!filterCell(key, cell)) {
+        continue;
       }
+
+      foundedOutPoints.push(cell.outPoint);
+      yield cell;
     }
 
     for await (const cell of this.findCells(key, order, limit)) {
-      if (!this.unusableOutPoints.some((o) => o.eq(cell.outPoint))) {
-        yield cell;
+      if (
+        this.unusableOutPoints.some((o) => o.eq(cell.outPoint)) ||
+        foundedOutPoints.some((founded) => founded.eq(cell.outPoint))
+      ) {
+        continue;
       }
+
+      yield cell;
     }
   }
 

package/src/client/clientPublicMainnet.advanced.ts

@@ -5,7 +5,7 @@ export const MAINNET_SCRIPTS: Record<
   KnownScript,
   | (Pick<Script, "codeHash" | "hashType"> & { cellDeps: CellDepInfoLike[] })
   | undefined
-> = {
+> = Object.freeze({
   [KnownScript.Secp256k1Blake160]: {
     codeHash:
       "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8",
@@ -114,6 +114,29 @@ export const MAINNET_SCRIPTS: Record<
       },
     ],
   },
+  [KnownScript.PWLock]: {
+    codeHash:
+      "0xbf43c3602455798c1a61a596e0d95278864c552fafe231c063b3fabf97a8febc",
+    hashType: "type",
+    cellDeps: [
+      {
+        cellDep: {
+          outPoint: {
+            txHash:
+              "0x1d60cb8f4666e039f418ea94730b1a8c5aa0bf2f7781474406387462924d15d4",
+            index: 0,
+          },
+          depType: "code",
+        },
+        type: {
+          codeHash:
+            "0x00000000000000000000000000000000000000000000000000545950455f4944",
+          hashType: "type",
+          args: "0x42ade2f25eb938b5dbfd3d8f07b8b07aa593d848e7ff14bdfbbea5aeb6175261",
+        },
+      },
+    ],
+  },
   [KnownScript.OmniLock]: {
     codeHash:
       "0x9b819793a64463aed77c615d6cb226eea5487ccfc0783043a587254cda2b6f26",
@@ -221,4 +244,4 @@ export const MAINNET_SCRIPTS: Record<
       },
     ],
   },
-};
+});

package/src/client/clientPublicMainnet.ts

@@ -4,7 +4,11 @@ import { MAINNET_SCRIPTS } from "./clientPublicMainnet.advanced.js";
 import { ClientJsonRpc } from "./jsonRpc/index.js";
 
 export class ClientPublicMainnet extends ClientJsonRpc {
-  constructor(url = "https://mainnet.ckb.dev/", timeout?: number) {
+  constructor(
+    url = "https://mainnet.ckb.dev/",
+    timeout?: number,
+    private readonly scripts = MAINNET_SCRIPTS,
+  ) {
     super(url, timeout);
   }
 
@@ -17,7 +21,7 @@ export class ClientPublicMainnet extends ClientJsonRpc {
   ): Promise<
     Pick<Script, "codeHash" | "hashType"> & { cellDeps: CellDepInfo[] }
   > {
-    const found = MAINNET_SCRIPTS[script];
+    const found = this.scripts[script];
     if (!found) {
       throw new Error(
         `No script information was found for ${script} on ${this.addressPrefix}`,

package/src/client/clientPublicTestnet.advanced.ts

@@ -4,7 +4,7 @@ import { CellDepInfoLike, KnownScript } from "./client.js";
 export const TESTNET_SCRIPTS: Record<
   KnownScript,
   Pick<Script, "codeHash" | "hashType"> & { cellDeps: CellDepInfoLike[] }
-> = {
+> = Object.freeze({
   [KnownScript.Secp256k1Blake160]: {
     codeHash:
       "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8",
@@ -119,6 +119,29 @@ export const TESTNET_SCRIPTS: Record<
       },
     ],
   },
+  [KnownScript.PWLock]: {
+    codeHash:
+      "0x58c5f491aba6d61678b7cf7edf4910b1f5e00ec0cde2f42e0abb4fd9aff25a63",
+    hashType: "type",
+    cellDeps: [
+      {
+        cellDep: {
+          outPoint: {
+            txHash:
+              "0x57a62003daeab9d54aa29b944fc3b451213a5ebdf2e232216a3cfed0dde61b38",
+            index: 0,
+          },
+          depType: "code",
+        },
+        type: {
+          codeHash:
+            "0x00000000000000000000000000000000000000000000000000545950455f4944",
+          hashType: "type",
+          args: "0xf6d90bfe3041d0fd7e01c45770241697f5f837974bd6ae1672a7ec0f9f523268",
+        },
+      },
+    ],
+  },
   [KnownScript.OmniLock]: {
     codeHash:
       "0xf329effd1c475a2978453c8600e1eaf0bc2087ee093c3ee64cc96ec6847752cb",
@@ -232,4 +255,4 @@ export const TESTNET_SCRIPTS: Record<
       },
     ],
   },
-};
+});

package/src/client/clientPublicTestnet.ts

@@ -4,7 +4,11 @@ import { TESTNET_SCRIPTS } from "./clientPublicTestnet.advanced.js";
 import { ClientJsonRpc } from "./jsonRpc/index.js";
 
 export class ClientPublicTestnet extends ClientJsonRpc {
-  constructor(url = "https://testnet.ckb.dev/", timeout?: number) {
+  constructor(
+    url = "https://testnet.ckb.dev/",
+    timeout?: number,
+    private readonly scripts = TESTNET_SCRIPTS,
+  ) {
     super(url, timeout);
   }
 
@@ -17,7 +21,7 @@ export class ClientPublicTestnet extends ClientJsonRpc {
   ): Promise<
     Pick<Script, "codeHash" | "hashType"> & { cellDeps: CellDepInfo[] }
   > {
-    const found = TESTNET_SCRIPTS[script];
+    const found = this.scripts[script];
     return {
       ...found,
       cellDeps: found.cellDeps.map((c) => CellDepInfo.from(c)),

package/src/client/jsonRpc/index.ts

@@ -63,7 +63,7 @@ export abstract class ClientJsonRpc extends Client {
    * @returns The URL of the JSON-RPC server.
    */
 
-  get url() {
+  get url(): string {
     return this.url_;
   }
 
@@ -206,7 +206,7 @@ export abstract class ClientJsonRpc extends Client {
     rpcMethod: string,
     inTransformers: (((_: any) => unknown) | undefined)[],
     outTransformer?: (_: any) => unknown,
-  ) {
+  ): (...req: unknown[]) => Promise<unknown> {
     return async (...req: unknown[]) => {
       const payload = ClientJsonRpc.buildPayload(
         rpcMethod,
@@ -234,7 +234,7 @@ export abstract class ClientJsonRpc extends Client {
    * @throws Will throw an error if the response ID does not match the request ID, or if the response contains an error.
    */
 
-  async send(payload: JsonRpcPayload) {
+  async send(payload: JsonRpcPayload): Promise<unknown> {
     const aborter = new AbortController();
     const abortTimer = setTimeout(() => aborter.abort(), this.timeout);
 

package/src/fixedPoint/index.ts

@@ -76,11 +76,11 @@ export function fixedPointFrom(val: FixedPointLike, decimals = 8): FixedPoint {
  * Represents the fixed point value of zero as a bigint.
  */
 
-export const Zero = 0n;
+export const Zero: FixedPoint = 0n;
 
 /**
  * Represents the fixed point value of one as a FixedPoint (bigint).
  * Equivalent to 1 in fixed-point representation with default decimals (8).
  */
 
-export const One = fixedPointFrom("1");
+export const One: FixedPoint = fixedPointFrom("1");