@ckb-ccc/core 0.0.4-alpha.6 → 0.0.4

package/dist/signer/btc/signerBtcPublicKeyReadonly.d.ts

@@ -16,12 +16,24 @@ export declare class SignerBtcPublicKeyReadonly extends SignerBtc {
      * @param publicKey - The public key associated with the signer.
      */
     constructor(client: Client, account: string, publicKey: HexLike);
+    /**
+     * Construct a new signer with the client replaced.
+     *
+     * @returns A promise that resolves the new Signer.
+     */
+    replaceClient(client: Client): Promise<SignerBtcPublicKeyReadonly>;
     /**
      * Connects to the client. This implementation does nothing as the class is read-only.
      *
      * @returns A promise that resolves when the connection is complete.
      */
     connect(): Promise<void>;
+    /**
+     * Check if the signer is connected.
+     *
+     * @returns A promise that resolves the connection status.
+     */
+    isConnected(): Promise<boolean>;
     /**
      * Gets the Bitcoin account associated with the signer.
      *

package/dist/signer/btc/signerBtcPublicKeyReadonly.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signerBtcPublicKeyReadonly.d.ts","sourceRoot":"","sources":["../../../src/signer/btc/signerBtcPublicKeyReadonly.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,GAAG,EAAE,OAAO,EAAW,MAAM,WAAW,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC;;;GAGG;AACH,qBAAa,0BAA2B,SAAQ,SAAS;IAYrD,OAAO,CAAC,QAAQ,CAAC,OAAO;IAX1B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAM;IAEhC;;;;;;OAMG;gBAED,MAAM,EAAE,MAAM,EACG,OAAO,EAAE,MAAM,EAChC,SAAS,EAAE,OAAO;IAOpB;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAE9B;;;;;;;;;OASG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAItC;;;;;;;;;OASG;IACG,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC;CAGtC"}
+{"version":3,"file":"signerBtcPublicKeyReadonly.d.ts","sourceRoot":"","sources":["../../../src/signer/btc/signerBtcPublicKeyReadonly.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,GAAG,EAAE,OAAO,EAAW,MAAM,WAAW,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC;;;GAGG;AACH,qBAAa,0BAA2B,SAAQ,SAAS;IAYrD,OAAO,CAAC,QAAQ,CAAC,OAAO;IAX1B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAM;IAEhC;;;;;;OAMG;gBAED,MAAM,EAAE,MAAM,EACG,OAAO,EAAE,MAAM,EAChC,SAAS,EAAE,OAAO;IAOpB;;;;OAIG;IACG,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAIxE;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAE9B;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAIrC;;;;;;;;;OASG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAItC;;;;;;;;;OASG;IACG,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC;CAGtC"}

package/dist/signer/btc/signerBtcPublicKeyReadonly.js

@@ -17,12 +17,28 @@ export class SignerBtcPublicKeyReadonly extends SignerBtc {
         this.account = account;
         this.publicKey = hexFrom(publicKey);
     }
+    /**
+     * Construct a new signer with the client replaced.
+     *
+     * @returns A promise that resolves the new Signer.
+     */
+    async replaceClient(client) {
+        return new SignerBtcPublicKeyReadonly(client, this.account, this.publicKey);
+    }
     /**
      * Connects to the client. This implementation does nothing as the class is read-only.
      *
      * @returns A promise that resolves when the connection is complete.
      */
     async connect() { }
+    /**
+     * Check if the signer is connected.
+     *
+     * @returns A promise that resolves the connection status.
+     */
+    async isConnected() {
+        return true;
+    }
     /**
      * Gets the Bitcoin account associated with the signer.
      *

package/dist/signer/ckb/signerCkbScriptReadonly.d.ts

@@ -15,12 +15,24 @@ export declare class SignerCkbScriptReadonly extends Signer {
      * @param script - The script associated with the signer.
      */
     constructor(client: Client, script: ScriptLike);
+    /**
+     * Construct a new signer with the client replaced.
+     *
+     * @returns A promise that resolves the new Signer.
+     */
+    replaceClient(client: Client): Promise<SignerCkbScriptReadonly>;
     /**
      * Connects to the client. This implementation does nothing as the class is read-only.
      *
      * @returns A promise that resolves when the connection is complete.
      */
     connect(): Promise<void>;
+    /**
+     * Check if the signer is connected.
+     *
+     * @returns A promise that resolves the connection status.
+     */
+    isConnected(): Promise<boolean>;
     /**
      * Gets the internal address for the script.
      *

package/dist/signer/ckb/signerCkbScriptReadonly.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signerCkbScriptReadonly.d.ts","sourceRoot":"","sources":["../../../src/signer/ckb/signerCkbScriptReadonly.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAU,UAAU,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC;;;GAGG;AACH,qBAAa,uBAAwB,SAAQ,MAAM;IACjD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAEhC;;;;;OAKG;gBACS,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU;IAM9C;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAE9B;;;;;;;;;OASG;IACG,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAI3C;;;;;;;;;OASG;IAEG,cAAc,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;CAG3C"}
+{"version":3,"file":"signerCkbScriptReadonly.d.ts","sourceRoot":"","sources":["../../../src/signer/ckb/signerCkbScriptReadonly.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAU,UAAU,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC;;;GAGG;AACH,qBAAa,uBAAwB,SAAQ,MAAM;IACjD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAEhC;;;;;OAKG;gBACS,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU;IAM9C;;;;OAIG;IACG,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAIrE;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAE9B;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAIrC;;;;;;;;;OASG;IACG,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAI3C;;;;;;;;;OASG;IAEG,cAAc,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;CAG3C"}

package/dist/signer/ckb/signerCkbScriptReadonly.js

@@ -16,12 +16,28 @@ export class SignerCkbScriptReadonly extends Signer {
         super(client);
         this.script = Script.from(script);
     }
+    /**
+     * Construct a new signer with the client replaced.
+     *
+     * @returns A promise that resolves the new Signer.
+     */
+    async replaceClient(client) {
+        return new SignerCkbScriptReadonly(client, this.script);
+    }
     /**
      * Connects to the client. This implementation does nothing as the class is read-only.
      *
      * @returns A promise that resolves when the connection is complete.
      */
     async connect() { }
+    /**
+     * Check if the signer is connected.
+     *
+     * @returns A promise that resolves the connection status.
+     */
+    async isConnected() {
+        return true;
+    }
     /**
      * Gets the internal address for the script.
      *

package/dist/signer/evm/signerEvm.d.ts

@@ -1,5 +1,6 @@
 import { Address } from "../../address";
-import { Transaction, TransactionLike } from "../../ckb";
+import { BytesLike } from "../../bytes";
+import { Script, Transaction, TransactionLike } from "../../ckb";
 import { Signer } from "../signer";
 /**
  * An abstract class extending Signer for Ethereum Virtual Machine (EVM) based signing operations.
@@ -24,6 +25,8 @@ export declare abstract class SignerEvm extends Signer {
      * @returns A promise that resolves to an array of Address objects.
      */
     getAddressObjs(): Promise<Address[]>;
+    _getOmniLockEvmAddressObj(account: string): Promise<Address>;
+    _getOmniLockOldEvmAddressObj(account: string): Promise<Address>;
     /**
      * prepare a transaction before signing. This method is not implemented and should be overridden by subclasses.
      *
@@ -38,5 +41,6 @@ export declare abstract class SignerEvm extends Signer {
      * @returns A promise that resolves to a signed Transaction object.
      */
     signOnlyTransaction(txLike: TransactionLike): Promise<Transaction>;
+    _signOmniLockScriptForTransaction(tx: Transaction, script: Script, messageTransformer: (hash: string) => BytesLike): Promise<Transaction>;
 }
 //# sourceMappingURL=signerEvm.d.ts.map

package/dist/signer/evm/signerEvm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signerEvm.d.ts","sourceRoot":"","sources":["../../../src/signer/evm/signerEvm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAe,MAAM,WAAW,CAAC;AAKtE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC;;;GAGG;AACH,8BAAsB,SAAU,SAAQ,MAAM;IAC5C;;;;OAIG;IACH,QAAQ,CAAC,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAEzC;;;;OAIG;IACG,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAI3C;;;;OAIG;IACG,cAAc,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAW1C;;;;;OAKG;IACG,kBAAkB,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC;IAKvE;;;;;OAKG;IACG,mBAAmB,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC;CAgCzE"}
+{"version":3,"file":"signerEvm.d.ts","sourceRoot":"","sources":["../../../src/signer/evm/signerEvm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,SAAS,EAA0B,MAAM,aAAa,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,eAAe,EAAe,MAAM,WAAW,CAAC;AAK9E,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC;;;GAGG;AACH,8BAAsB,SAAU,SAAQ,MAAM;IAC5C;;;;OAIG;IACH,QAAQ,CAAC,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAEzC;;;;OAIG;IACG,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAI3C;;;;OAIG;IACG,cAAc,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAQpC,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAQ5D,4BAA4B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAQrE;;;;;OAKG;IACG,kBAAkB,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC;IAYvE;;;;;OAKG;IACG,mBAAmB,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC;IAsBlE,iCAAiC,CACrC,EAAE,EAAE,WAAW,EACf,MAAM,EAAE,MAAM,EACd,kBAAkB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,SAAS,GAC9C,OAAO,CAAC,WAAW,CAAC;CA6BxB"}

package/dist/signer/evm/signerEvm.js

@@ -27,9 +27,16 @@ export class SignerEvm extends Signer {
     async getAddressObjs() {
         const account = await this.getEvmAccount();
         return [
-            await Address.fromKnownScript(KnownScript.OmniLock, hexFrom([0x12, ...bytesFrom(account), 0x00]), this.client),
+            await this._getOmniLockEvmAddressObj(account),
+            await this._getOmniLockOldEvmAddressObj(account),
         ];
     }
+    async _getOmniLockEvmAddressObj(account) {
+        return Address.fromKnownScript(KnownScript.OmniLock, hexFrom([0x12, ...bytesFrom(account), 0x00]), this.client);
+    }
+    async _getOmniLockOldEvmAddressObj(account) {
+        return Address.fromKnownScript(KnownScript.OmniLock, hexFrom([0x1, ...bytesFrom(account), 0x00]), this.client);
+    }
     /**
      * prepare a transaction before signing. This method is not implemented and should be overridden by subclasses.
      *
@@ -37,8 +44,8 @@ export class SignerEvm extends Signer {
      * @returns A promise that resolves to the prepared Transaction object.
      */
     async prepareTransaction(txLike) {
-        const { script } = await this.getRecommendedAddressObj();
-        return prepareSighashAllWitness(txLike, script, 85, this.client);
+        const addresses = await this.getAddressObjs();
+        return addresses.reduce((txPromise, { script }) => txPromise.then((tx) => prepareSighashAllWitness(tx, script, 85, this.client)), Promise.resolve(Transaction.from(txLike)));
     }
     /**
      * Signs a transaction without modifying it.
@@ -47,13 +54,20 @@ export class SignerEvm extends Signer {
      * @returns A promise that resolves to a signed Transaction object.
      */
     async signOnlyTransaction(txLike) {
-        const tx = Transaction.from(txLike);
-        const { script } = await this.getRecommendedAddressObj();
+        let tx = Transaction.from(txLike);
+        const account = await this.getEvmAccount();
+        const { script: evmScript } = await this._getOmniLockEvmAddressObj(account);
+        const { script: oldEvmScript } = await this._getOmniLockOldEvmAddressObj(account);
+        tx = await this._signOmniLockScriptForTransaction(tx, evmScript, (hash) => `CKB transaction: ${hash}`);
+        tx = await this._signOmniLockScriptForTransaction(tx, oldEvmScript, (hash) => bytesFrom(hash));
+        return tx;
+    }
+    async _signOmniLockScriptForTransaction(tx, script, messageTransformer) {
         const info = await getSignHashInfo(tx, script, this.client);
         if (!info) {
             return tx;
         }
-        const signature = bytesFrom(await this.signMessage(`CKB transaction: ${info.message}`));
+        const signature = bytesFrom(await this.signMessage(messageTransformer(info.message)));
         if (signature[signature.length - 1] >= 27) {
             signature[signature.length - 1] -= 27;
         }

package/dist/signer/evm/signerEvmAddressReadonly.d.ts

@@ -5,7 +5,7 @@ import { SignerEvm } from "./signerEvm";
  * A class extending SignerEvm that provides read-only access to an EVM address.
  * This class does not support signing operations.
  */
-export declare abstract class SignerEvmAddressReadonly extends SignerEvm {
+export declare class SignerEvmAddressReadonly extends SignerEvm {
     private readonly address;
     /**
      * Creates an instance of SignerEvmAddressReadonly.
@@ -14,6 +14,12 @@ export declare abstract class SignerEvmAddressReadonly extends SignerEvm {
      * @param address - The EVM address associated with the signer.
      */
     constructor(client: Client, address: HexLike);
+    /**
+     * Construct a new signer with the client replaced.
+     *
+     * @returns A promise that resolves the new Signer.
+     */
+    replaceClient(client: Client): Promise<SignerEvmAddressReadonly>;
     /**
      * Connects to the client. This implementation does nothing as the class is read-only.
      *
@@ -25,6 +31,12 @@ export declare abstract class SignerEvmAddressReadonly extends SignerEvm {
      * ```
      */
     connect(): Promise<void>;
+    /**
+     * Check if the signer is connected.
+     *
+     * @returns A promise that resolves the connection status.
+     */
+    isConnected(): Promise<boolean>;
     /**
      * Gets the EVM account associated with the signer.
      *

package/dist/signer/evm/signerEvmAddressReadonly.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signerEvmAddressReadonly.d.ts","sourceRoot":"","sources":["../../../src/signer/evm/signerEvmAddressReadonly.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAO,OAAO,EAAW,MAAM,WAAW,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC;;;GAGG;AACH,8BAAsB,wBAAyB,SAAQ,SAAS;IAC9D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAM;IAE9B;;;;;OAKG;gBACS,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;IAM5C;;;;;;;;;OASG;IAEG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAE9B;;;;;;;;;OASG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;CAGvC"}
+{"version":3,"file":"signerEvmAddressReadonly.d.ts","sourceRoot":"","sources":["../../../src/signer/evm/signerEvmAddressReadonly.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAO,OAAO,EAAW,MAAM,WAAW,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC;;;GAGG;AACH,qBAAa,wBAAyB,SAAQ,SAAS;IACrD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAM;IAE9B;;;;;OAKG;gBACS,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;IAM5C;;;;OAIG;IACG,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAItE;;;;;;;;;OASG;IAEG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAE9B;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAIrC;;;;;;;;;OASG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;CAGvC"}

package/dist/signer/evm/signerEvmAddressReadonly.js

@@ -15,6 +15,14 @@ export class SignerEvmAddressReadonly extends SignerEvm {
         super(client);
         this.address = hexFrom(address);
     }
+    /**
+     * Construct a new signer with the client replaced.
+     *
+     * @returns A promise that resolves the new Signer.
+     */
+    async replaceClient(client) {
+        return new SignerEvmAddressReadonly(client, this.address);
+    }
     /**
      * Connects to the client. This implementation does nothing as the class is read-only.
      *
@@ -26,6 +34,14 @@ export class SignerEvmAddressReadonly extends SignerEvm {
      * ```
      */
     async connect() { }
+    /**
+     * Check if the signer is connected.
+     *
+     * @returns A promise that resolves the connection status.
+     */
+    async isConnected() {
+        return true;
+    }
     /**
      * Gets the EVM account associated with the signer.
      *

package/dist/signer/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/signer/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EACV,WAAW,EACX,eAAe,EAEhB,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,OAAO,EAAE,GAAG,EAAW,MAAM,QAAQ,CAAC;AAEtC;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,eAAe,EACvB,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,OAAO,EAAE,GAAG,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC,CAuCzD;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,eAAe,EACvB,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,WAAW,CAAC,CA6BtB"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/signer/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EACV,WAAW,EACX,eAAe,EAEhB,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,OAAO,EAAE,GAAG,EAAW,MAAM,QAAQ,CAAC;AAEtC;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,eAAe,EACvB,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,OAAO,EAAE,GAAG,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC,CAuCzD;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,eAAe,EACvB,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,WAAW,CAAC,CA+BtB"}

package/dist/signer/helpers.js

@@ -32,7 +32,7 @@ export async function getSignHashInfo(txLike, scriptLike, client) {
                 throw Error("Unable to resolve inputs info");
             }
             if (!script.eq(input.cellOutput.lock)) {
-                return;
+                continue;
             }
             if (position === -1) {
                 position = i;
@@ -81,8 +81,9 @@ export async function prepareSighashAllWitness(txLike, scriptLike, lockLen, clie
     if (position === -1) {
         return tx;
     }
-    const witness = tx.witnesses[position]
-        ? WitnessArgs.fromBytes(tx.witnesses[position])
+    const rawWitness = tx.witnesses[position];
+    const witness = (rawWitness ?? "0x") !== "0x"
+        ? WitnessArgs.fromBytes(rawWitness)
         : WitnessArgs.from({});
     witness.lock = hexFrom(Array.from(new Array(lockLen), () => 0));
     tx.witnesses[position] = hexFrom(witness.toBytes());

package/dist/signer/signer.d.ts

@@ -8,14 +8,27 @@ import { Hex } from "../hex";
  * This class provides methods to connect, get addresses, and sign transactions.
  */
 export declare abstract class Signer {
-    readonly client: Client;
-    constructor(client: Client);
+    protected client_: Client;
+    constructor(client_: Client);
+    get client(): Client;
     /**
-     * Connects to the client.
+     * Construct a new signer with the client replaced.
+     *
+     * @returns A promise that resolves the new Signer.
+     */
+    abstract replaceClient(client: Client): Promise<Signer>;
+    /**
+     * Connects to the signer.
      *
      * @returns A promise that resolves when the connection is complete.
      */
     abstract connect(): Promise<void>;
+    /**
+     * Check if the signer is connected.
+     *
+     * @returns A promise that resolves the connection status.
+     */
+    abstract isConnected(): Promise<boolean>;
     /**
      * Gets the internal address associated with the signer.
      *
@@ -108,6 +121,5 @@ export declare class SignerInfo {
 export type Wallet = {
     name: string;
     icon: string;
-    signers: SignerInfo[];
 };
 //# sourceMappingURL=signer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../src/signer/signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAE7B;;;GAGG;AACH,8BAAsB,MAAM;aACE,MAAM,EAAE,MAAM;gBAAd,MAAM,EAAE,MAAM;IAE1C;;;;OAIG;IACH,QAAQ,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAEjC;;;;OAIG;IACH,QAAQ,CAAC,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAE9C;;;;OAIG;IACH,QAAQ,CAAC,cAAc,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAE7C;;;;;OAKG;IACG,wBAAwB,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAIvE;;;;;OAKG;IACG,qBAAqB,CAAC,UAAU,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAIlE;;;;OAIG;IACG,YAAY,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAMvC;;;;;;OAMG;IACH,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IAInD;;;;;OAKG;IACG,eAAe,CAAC,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC;IAIxD;;;;;OAKG;IACG,eAAe,CAAC,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC;IAKhE;;;;;;OAMG;IACH,kBAAkB,CAAC,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC;IAI5D;;;;;;OAMG;IACH,mBAAmB,CAAC,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC;CAG9D;AAED;;GAEG;AACH,oBAAY,UAAU;IACpB,GAAG,QAAQ;IACX,GAAG,QAAQ;CACZ;AAED;;GAEG;AACH,qBAAa,UAAU;IAEZ,IAAI,EAAE,UAAU;IAChB,MAAM,EAAE,MAAM;gBADd,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM;CAExB;AAED;;GAEG;AACH,MAAM,MAAM,MAAM,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,UAAU,EAAE,CAAC;CACvB,CAAC"}
+{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../src/signer/signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAE7B;;;GAGG;AACH,8BAAsB,MAAM;IACd,SAAS,CAAC,OAAO,EAAE,MAAM;gBAAf,OAAO,EAAE,MAAM;IAErC,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;OAIG;IACH,QAAQ,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAEvD;;;;OAIG;IACH,QAAQ,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAEjC;;;;OAIG;IACH,QAAQ,CAAC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAExC;;;;OAIG;IACH,QAAQ,CAAC,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAE9C;;;;OAIG;IACH,QAAQ,CAAC,cAAc,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAE7C;;;;;OAKG;IACG,wBAAwB,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAIvE;;;;;OAKG;IACG,qBAAqB,CAAC,UAAU,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAIlE;;;;OAIG;IACG,YAAY,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAMvC;;;;;;OAMG;IACH,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IAInD;;;;;OAKG;IACG,eAAe,CAAC,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC;IAIxD;;;;;OAKG;IACG,eAAe,CAAC,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC;IAKhE;;;;;;OAMG;IACH,kBAAkB,CAAC,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC;IAI5D;;;;;;OAMG;IACH,mBAAmB,CAAC,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC;CAG9D;AAED;;GAEG;AACH,oBAAY,UAAU;IACpB,GAAG,QAAQ;IACX,GAAG,QAAQ;CACZ;AAED;;GAEG;AACH,qBAAa,UAAU;IAEZ,IAAI,EAAE,UAAU;IAChB,MAAM,EAAE,MAAM;gBADd,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM;CAExB;AAED;;GAEG;AACH,MAAM,MAAM,MAAM,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC"}

package/dist/signer/signer.js

@@ -3,8 +3,11 @@
  * This class provides methods to connect, get addresses, and sign transactions.
  */
 export class Signer {
-    constructor(client) {
-        this.client = client;
+    constructor(client_) {
+        this.client_ = client_;
+    }
+    get client() {
+        return this.client_;
     }
     /**
      * Gets the recommended Address object for the signer.

package/dist.commonjs/address/address.advanced.d.ts

@@ -0,0 +1,65 @@
+import { Client } from "../client";
+import { type AddressLike } from "./index";
+/**
+ * Parses an address string into an address information object.
+ *
+ * @param address - The address string to parse.
+ * @returns An object containing the address prefix, address format, and payload array.
+ *
+ * @throws Will throw an error if the address format is unknown.
+ *
+ * @example
+ * ```typescript
+ * const addressInfo = addressPayloadFromString("ckt1112139193129");
+ * console.log(addressInfo.prefix); // Outputs the address prefix
+ * console.log(addressInfo.format); // Outputs the address format
+ * console.log(addressInfo.payload); // Outputs the payload array
+ * ```
+ */
+export declare function addressPayloadFromString(address: string): {
+    prefix: string;
+    format: AddressFormat;
+    payload: number[];
+};
+/**
+ * Converts an address payload into an address-like object.
+ *
+ * @param prefix - The address prefix.
+ * @param format - The format of the address, as defined by the AddressFormat enum.
+ * @param payload - The payload array containing the address data.
+ * @param client - The client instance used to fetch known scripts.
+ * @returns A promise that resolves to an AddressLike object.
+ *
+ * @throws Will throw an error if the payload length is insufficient or if the script type is unknown.
+ *
+ * @example
+ * ```typescript
+ * const address = await addressFromPayload("ckt", AddressFormat.Full, [/* payload data *\/], client);
+ * console.log(address.script); // Outputs the script object
+ * console.log(address.prefix); // Outputs the address prefix
+ * ```
+ */
+export declare function addressFromPayload(prefix: string, format: AddressFormat, payload: number[], client: Client): Promise<AddressLike>;
+export declare enum AddressFormat {
+    /**
+     * full version identifies the hashType
+     */
+    Full = 0,
+    /**
+     * @deprecated
+     * short version for locks with Known codeHash, deprecated
+     */
+    Short = 1,
+    /**
+     * @deprecated
+     * full version with hashType = "Data", deprecated
+     */
+    FullData = 2,
+    /**
+     * @deprecated
+     * full version with hashType = "Type", deprecated
+     */
+    FullType = 4
+}
+export declare const ADDRESS_BECH32_LIMIT = 1023;
+//# sourceMappingURL=address.advanced.d.ts.map

package/dist.commonjs/address/address.advanced.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"address.advanced.d.ts","sourceRoot":"","sources":["../../src/address/address.advanced.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAe,MAAM,WAAW,CAAC;AAEhD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3C;;;;;;;;;;;;;;;GAeG;AAEH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG;IACzD,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CA2BA;AAED;;;;;;;;;;;;;;;;;GAiBG;AAEH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,MAAM,EAAE,EACjB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,WAAW,CAAC,CA4EtB;AAED,oBAAY,aAAa;IACvB;;OAEG;IACH,IAAI,IAAO;IACX;;;OAGG;IACH,KAAK,IAAO;IACZ;;;OAGG;IACH,QAAQ,IAAO;IACf;;;OAGG;IACH,QAAQ,IAAO;CAChB;AAED,eAAO,MAAM,oBAAoB,OAAO,CAAC"}

package/dist.commonjs/address/address.advanced.js

@@ -0,0 +1,149 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ADDRESS_BECH32_LIMIT = exports.AddressFormat = exports.addressFromPayload = exports.addressPayloadFromString = void 0;
+const bech32_1 = require("bech32");
+const ckb_1 = require("../ckb");
+const client_1 = require("../client");
+const hex_1 = require("../hex");
+/**
+ * Parses an address string into an address information object.
+ *
+ * @param address - The address string to parse.
+ * @returns An object containing the address prefix, address format, and payload array.
+ *
+ * @throws Will throw an error if the address format is unknown.
+ *
+ * @example
+ * ```typescript
+ * const addressInfo = addressPayloadFromString("ckt1112139193129");
+ * console.log(addressInfo.prefix); // Outputs the address prefix
+ * console.log(addressInfo.format); // Outputs the address format
+ * console.log(addressInfo.payload); // Outputs the payload array
+ * ```
+ */
+function addressPayloadFromString(address) {
+    // Try parse full format address
+    {
+        const { words, prefix } = bech32_1.bech32m.decode(address, exports.ADDRESS_BECH32_LIMIT);
+        const [formatType, ...payload] = bech32_1.bech32m.fromWords(words);
+        if (formatType === AddressFormat.Full) {
+            return { prefix, format: AddressFormat.Full, payload };
+        }
+    }
+    // Try parse legacy 2019 format address
+    {
+        const { prefix, words } = bech32_1.bech32.decode(address, exports.ADDRESS_BECH32_LIMIT);
+        const [formatType, ...payload] = bech32_1.bech32.fromWords(words);
+        if ([
+            AddressFormat.FullData,
+            AddressFormat.FullType,
+            AddressFormat.Short,
+        ].includes(formatType)) {
+            return { prefix, format: formatType, payload };
+        }
+    }
+    throw Error(`Unknown address format ${address}`);
+}
+exports.addressPayloadFromString = addressPayloadFromString;
+/**
+ * Converts an address payload into an address-like object.
+ *
+ * @param prefix - The address prefix.
+ * @param format - The format of the address, as defined by the AddressFormat enum.
+ * @param payload - The payload array containing the address data.
+ * @param client - The client instance used to fetch known scripts.
+ * @returns A promise that resolves to an AddressLike object.
+ *
+ * @throws Will throw an error if the payload length is insufficient or if the script type is unknown.
+ *
+ * @example
+ * ```typescript
+ * const address = await addressFromPayload("ckt", AddressFormat.Full, [/* payload data *\/], client);
+ * console.log(address.script); // Outputs the script object
+ * console.log(address.prefix); // Outputs the address prefix
+ * ```
+ */
+async function addressFromPayload(prefix, format, payload, client) {
+    if (format === AddressFormat.Full) {
+        if (payload.length < 32 + 1) {
+            throw new Error(`Invalid full address without enough payload ${(0, hex_1.hexFrom)(payload)}`);
+        }
+        return {
+            script: {
+                codeHash: payload.slice(0, 32),
+                hashType: (0, ckb_1.hashTypeFromBytes)(payload.slice(32, 33)),
+                args: payload.slice(33),
+            },
+            prefix,
+        };
+    }
+    if (format === AddressFormat.FullData) {
+        if (payload.length < 32) {
+            throw new Error(`Invalid full data address without enough payload ${(0, hex_1.hexFrom)(payload)}`);
+        }
+        return {
+            script: {
+                codeHash: payload.slice(0, 32),
+                hashType: "data",
+                args: payload.slice(32),
+            },
+            prefix,
+        };
+    }
+    if (format === AddressFormat.FullType) {
+        if (payload.length < 32) {
+            throw new Error(`Invalid full type address without enough payload ${(0, hex_1.hexFrom)(payload)}`);
+        }
+        return {
+            script: {
+                codeHash: payload.slice(0, 32),
+                hashType: "type",
+                args: payload.slice(32),
+            },
+            prefix,
+        };
+    }
+    // format === AddressFormat.Short
+    if (payload.length !== 21) {
+        throw new Error(`Invalid short address without enough payload ${(0, hex_1.hexFrom)(payload)}`);
+    }
+    const script = [
+        client_1.KnownScript.Secp256k1Blake160,
+        client_1.KnownScript.Secp256k1Multisig,
+        client_1.KnownScript.AnyoneCanPay,
+    ][payload[0]];
+    if (script === undefined) {
+        throw new Error(`Invalid short address with unknown script ${(0, hex_1.hexFrom)(payload)}`);
+    }
+    return {
+        script: {
+            ...(await client.getKnownScript(script)),
+            args: payload.slice(1),
+        },
+        prefix,
+    };
+}
+exports.addressFromPayload = addressFromPayload;
+var AddressFormat;
+(function (AddressFormat) {
+    /**
+     * full version identifies the hashType
+     */
+    AddressFormat[AddressFormat["Full"] = 0] = "Full";
+    /**
+     * @deprecated
+     * short version for locks with Known codeHash, deprecated
+     */
+    AddressFormat[AddressFormat["Short"] = 1] = "Short";
+    /**
+     * @deprecated
+     * full version with hashType = "Data", deprecated
+     */
+    AddressFormat[AddressFormat["FullData"] = 2] = "FullData";
+    /**
+     * @deprecated
+     * full version with hashType = "Type", deprecated
+     */
+    AddressFormat[AddressFormat["FullType"] = 4] = "FullType";
+})(AddressFormat || (exports.AddressFormat = AddressFormat = {}));
+exports.ADDRESS_BECH32_LIMIT = 1023;

package/dist.commonjs/address/advanced.d.ts

@@ -0,0 +1,2 @@
+export * from "./address.advanced";
+//# sourceMappingURL=advanced.d.ts.map

package/dist.commonjs/address/advanced.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"advanced.d.ts","sourceRoot":"","sources":["../../src/address/advanced.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC"}

package/dist.commonjs/address/advanced.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./address.advanced"), exports);