@ckb-ccc/core 0.0.5-alpha.10 → 0.0.5-alpha.13

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

@@ -1,36 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SignerInfo =
-  exports.Signer =
-  exports.Signature =
-  exports.SignerType =
-  exports.SignerSignType =
-    void 0;
+exports.SignerInfo = exports.Signer = exports.Signature = exports.SignerType = exports.SignerSignType = void 0;
 const btc_1 = require("../btc");
 const verifyJoyId_1 = require("../ckb/verifyJoyId");
 const verify_1 = require("../evm/verify");
 var SignerSignType;
 (function (SignerSignType) {
-  SignerSignType["Unknown"] = "Unknown";
-  SignerSignType["BtcEcdsa"] = "BtcEcdsa";
-  SignerSignType["EvmPersonal"] = "EvmPersonal";
-  SignerSignType["JoyId"] = "JoyId";
+    SignerSignType["Unknown"] = "Unknown";
+    SignerSignType["BtcEcdsa"] = "BtcEcdsa";
+    SignerSignType["EvmPersonal"] = "EvmPersonal";
+    SignerSignType["JoyId"] = "JoyId";
 })(SignerSignType || (exports.SignerSignType = SignerSignType = {}));
 /**
  * An enumeration of signer display types in wallet.
  */
 var SignerType;
 (function (SignerType) {
-  SignerType["EVM"] = "EVM";
-  SignerType["BTC"] = "BTC";
-  SignerType["CKB"] = "CKB";
+    SignerType["EVM"] = "EVM";
+    SignerType["BTC"] = "BTC";
+    SignerType["CKB"] = "CKB";
 })(SignerType || (exports.SignerType = SignerType = {}));
 class Signature {
-  constructor(signature, identity, signType) {
-    this.signature = signature;
-    this.identity = identity;
-    this.signType = signType;
-  }
+    constructor(signature, identity, signType) {
+        this.signature = signature;
+        this.identity = identity;
+        this.signType = signType;
+    }
 }
 exports.Signature = Signature;
 /**
@@ -38,197 +33,179 @@ exports.Signature = Signature;
  * This class provides methods to connect, get addresses, and sign transactions.
  */
 class Signer {
-  constructor(client_) {
-    this.client_ = client_;
-  }
-  get client() {
-    return this.client_;
-  }
-  static async verifyMessage(message, signature) {
-    switch (signature.signType) {
-      case SignerSignType.EvmPersonal:
-        return (0, verify_1.verifyMessageEvmPersonal)(
-          message,
-          signature.signature,
-          signature.identity,
-        );
-      case SignerSignType.BtcEcdsa:
-        return (0, btc_1.verifyMessageBtcEcdsa)(
-          message,
-          signature.signature,
-          signature.identity,
-        );
-      case SignerSignType.JoyId:
-        return (0, verifyJoyId_1.verifyMessageJoyId)(
-          message,
-          signature.signature,
-          signature.identity,
-        );
-      case SignerSignType.Unknown:
-        throw new Error("Unknown signer sign type");
-    }
-  }
-  /**
-   * Replace the current client.
-   */
-  async replaceClient(client) {
-    this.client_ = client;
-  }
-  /**
-   * Disconnects to the signer.
-   *
-   * @returns A promise that resolves when disconnected.
-   */
-  async disconnect() {}
-  /**
-   * Gets the identity for verifying signature, usually it's address
-   *
-   * @returns A promise that resolves to a string representing the identity
-   */
-  async getIdentity() {
-    return this.getInternalAddress();
-  }
-  /**
-   * Gets the recommended Address object for the signer.
-   *
-   * @param _preference - Optional preference parameter.
-   * @returns A promise that resolves to the recommended Address object.
-   */
-  async getRecommendedAddressObj(_preference) {
-    return (await this.getAddressObjs())[0];
-  }
-  /**
-   * Gets the recommended address for the signer as a string.
-   *
-   * @param preference - Optional preference parameter.
-   * @returns A promise that resolves to the recommended address as a string.
-   */
-  async getRecommendedAddress(preference) {
-    return (await this.getRecommendedAddressObj(preference)).toString();
-  }
-  /**
-   * Gets an array of addresses associated with the signer as strings.
-   *
-   * @returns A promise that resolves to an array of addresses as strings.
-   */
-  async getAddresses() {
-    return this.getAddressObjs().then((addresses) =>
-      addresses.map((address) => address.toString()),
-    );
-  }
-  /**
-   * Gets balance of all addresses
-   *
-   * @returns A promise that resolves to the balance
-   */
-  async getBalance() {
-    return this.client.getBalance(
-      (await this.getAddressObjs()).map(({ script }) => script),
-    );
-  }
-  /**
-   * Signs a message.
-   *
-   * @param _ - The message to sign, as a string or BytesLike object.
-   * @returns A promise that resolves to the signature info.
-   * @throws Will throw an error if not implemented.
-   */
-  async signMessage(message) {
-    return {
-      signature: await this.signMessageRaw(message),
-      identity: await this.getIdentity(),
-      signType: this.signType,
-    };
-  }
-  /**
-   * Signs a message and returns signature only. This method is not implemented and should be overridden by subclasses.
-   *
-   * @param _ - The message to sign, as a string or BytesLike object.
-   * @returns A promise that resolves to the signature as a string.
-   * @throws Will throw an error if not implemented.
-   */
-  signMessageRaw(_) {
-    throw Error("Signer.signMessageRaw not implemented");
-  }
-  /**
-   * Verify a signature.
-   *
-   * @param _ - The original message.
-   * @param _ - The signature to verify.
-   * @returns A promise that resolves to the verification result.
-   * @throws Will throw an error if not implemented.
-   */
-  async verifyMessage(message, signature) {
-    if (typeof signature === "string") {
-      return this.verifyMessageRaw(message, signature);
-    }
-    if (
-      signature.identity !== (await this.getIdentity()) ||
-      ![SignerSignType.Unknown, this.signType].includes(signature.signType)
-    ) {
-      return false;
-    }
-    return this.verifyMessageRaw(message, signature.signature);
-  }
-  /**
-   * Verify a string signature. This method is not implemented and should be overridden by subclasses.
-   *
-   * @param _0 - The original message.
-   * @param _1 - The signature to verify.
-   * @returns A promise that resolves to the verification result.
-   * @throws Will throw an error if not implemented.
-   */
-  verifyMessageRaw(_0, _1) {
-    throw Error("Signer.verifyMessageRaw not implemented");
-  }
-  /**
-   * Sends a transaction after signing it.
-   *
-   * @param tx - The transaction to send, represented as a TransactionLike object.
-   * @returns A promise that resolves to the transaction hash as a Hex string.
-   */
-  async sendTransaction(tx) {
-    return this.client.sendTransaction(await this.signTransaction(tx));
-  }
-  /**
-   * Signs a transaction.
-   *
-   * @param tx - The transaction to sign, represented as a TransactionLike object.
-   * @returns A promise that resolves to the signed Transaction object.
-   */
-  async signTransaction(tx) {
-    const preparedTx = await this.prepareTransaction(tx);
-    return this.signOnlyTransaction(preparedTx);
-  }
-  /**
-   * prepare a transaction before signing. This method is not implemented and should be overridden by subclasses.
-   *
-   * @param _ - The transaction to prepare, represented as a TransactionLike object.
-   * @returns A promise that resolves to the prepared Transaction object.
-   * @throws Will throw an error if not implemented.
-   */
-  prepareTransaction(_) {
-    throw Error("Signer.prepareTransaction not implemented");
-  }
-  /**
-   * Signs a transaction without preparing information for it. This method is not implemented and should be overridden by subclasses.
-   *
-   * @param _ - The transaction to sign, represented as a TransactionLike object.
-   * @returns A promise that resolves to the signed Transaction object.
-   * @throws Will throw an error if not implemented.
-   */
-  signOnlyTransaction(_) {
-    throw Error("Signer.signOnlyTransaction not implemented");
-  }
+    constructor(client_) {
+        this.client_ = client_;
+    }
+    get client() {
+        return this.client_;
+    }
+    static async verifyMessage(message, signature) {
+        switch (signature.signType) {
+            case SignerSignType.EvmPersonal:
+                return (0, verify_1.verifyMessageEvmPersonal)(message, signature.signature, signature.identity);
+            case SignerSignType.BtcEcdsa:
+                return (0, btc_1.verifyMessageBtcEcdsa)(message, signature.signature, signature.identity);
+            case SignerSignType.JoyId:
+                return (0, verifyJoyId_1.verifyMessageJoyId)(message, signature.signature, signature.identity);
+            case SignerSignType.Unknown:
+                throw new Error("Unknown signer sign type");
+        }
+    }
+    /**
+     * Replace the current client.
+     */
+    async replaceClient(client) {
+        this.client_ = client;
+    }
+    /**
+     * Disconnects to the signer.
+     *
+     * @returns A promise that resolves when disconnected.
+     */
+    async disconnect() { }
+    /**
+     * Gets the identity for verifying signature, usually it's address
+     *
+     * @returns A promise that resolves to a string representing the identity
+     */
+    async getIdentity() {
+        return this.getInternalAddress();
+    }
+    /**
+     * Gets the recommended Address object for the signer.
+     *
+     * @param _preference - Optional preference parameter.
+     * @returns A promise that resolves to the recommended Address object.
+     */
+    async getRecommendedAddressObj(_preference) {
+        return (await this.getAddressObjs())[0];
+    }
+    /**
+     * Gets the recommended address for the signer as a string.
+     *
+     * @param preference - Optional preference parameter.
+     * @returns A promise that resolves to the recommended address as a string.
+     */
+    async getRecommendedAddress(preference) {
+        return (await this.getRecommendedAddressObj(preference)).toString();
+    }
+    /**
+     * Gets an array of addresses associated with the signer as strings.
+     *
+     * @returns A promise that resolves to an array of addresses as strings.
+     */
+    async getAddresses() {
+        return this.getAddressObjs().then((addresses) => addresses.map((address) => address.toString()));
+    }
+    /**
+     * Gets balance of all addresses
+     *
+     * @returns A promise that resolves to the balance
+     */
+    async getBalance() {
+        return this.client.getBalance((await this.getAddressObjs()).map(({ script }) => script));
+    }
+    /**
+     * Signs a message.
+     *
+     * @param _ - The message to sign, as a string or BytesLike object.
+     * @returns A promise that resolves to the signature info.
+     * @throws Will throw an error if not implemented.
+     */
+    async signMessage(message) {
+        return {
+            signature: await this.signMessageRaw(message),
+            identity: await this.getIdentity(),
+            signType: this.signType,
+        };
+    }
+    /**
+     * Signs a message and returns signature only. This method is not implemented and should be overridden by subclasses.
+     *
+     * @param _ - The message to sign, as a string or BytesLike object.
+     * @returns A promise that resolves to the signature as a string.
+     * @throws Will throw an error if not implemented.
+     */
+    signMessageRaw(_) {
+        throw Error("Signer.signMessageRaw not implemented");
+    }
+    /**
+     * Verify a signature.
+     *
+     * @param _ - The original message.
+     * @param _ - The signature to verify.
+     * @returns A promise that resolves to the verification result.
+     * @throws Will throw an error if not implemented.
+     */
+    async verifyMessage(message, signature) {
+        if (typeof signature === "string") {
+            return this.verifyMessageRaw(message, signature);
+        }
+        if (signature.identity !== (await this.getIdentity()) ||
+            ![SignerSignType.Unknown, this.signType].includes(signature.signType)) {
+            return false;
+        }
+        return this.verifyMessageRaw(message, signature.signature);
+    }
+    /**
+     * Verify a string signature. This method is not implemented and should be overridden by subclasses.
+     *
+     * @param _0 - The original message.
+     * @param _1 - The signature to verify.
+     * @returns A promise that resolves to the verification result.
+     * @throws Will throw an error if not implemented.
+     */
+    verifyMessageRaw(_0, _1) {
+        throw Error("Signer.verifyMessageRaw not implemented");
+    }
+    /**
+     * Sends a transaction after signing it.
+     *
+     * @param tx - The transaction to send, represented as a TransactionLike object.
+     * @returns A promise that resolves to the transaction hash as a Hex string.
+     */
+    async sendTransaction(tx) {
+        return this.client.sendTransaction(await this.signTransaction(tx));
+    }
+    /**
+     * Signs a transaction.
+     *
+     * @param tx - The transaction to sign, represented as a TransactionLike object.
+     * @returns A promise that resolves to the signed Transaction object.
+     */
+    async signTransaction(tx) {
+        const preparedTx = await this.prepareTransaction(tx);
+        return this.signOnlyTransaction(preparedTx);
+    }
+    /**
+     * prepare a transaction before signing. This method is not implemented and should be overridden by subclasses.
+     *
+     * @param _ - The transaction to prepare, represented as a TransactionLike object.
+     * @returns A promise that resolves to the prepared Transaction object.
+     * @throws Will throw an error if not implemented.
+     */
+    prepareTransaction(_) {
+        throw Error("Signer.prepareTransaction not implemented");
+    }
+    /**
+     * Signs a transaction without preparing information for it. This method is not implemented and should be overridden by subclasses.
+     *
+     * @param _ - The transaction to sign, represented as a TransactionLike object.
+     * @returns A promise that resolves to the signed Transaction object.
+     * @throws Will throw an error if not implemented.
+     */
+    signOnlyTransaction(_) {
+        throw Error("Signer.signOnlyTransaction not implemented");
+    }
 }
 exports.Signer = Signer;
 /**
  * A class representing information about a signer, including its type and the signer instance.
  */
 class SignerInfo {
-  constructor(name, signer) {
-    this.name = name;
-    this.signer = signer;
-  }
+    constructor(name, signer) {
+        this.name = name;
+        this.signer = signer;
+    }
 }
 exports.SignerInfo = SignerInfo;

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

@@ -5,10 +5,7 @@
  * @param value - The value to be transformed.
  * @returns If the value is empty, it remains its type. Otherwise it will be transformed.
  */
-export declare function apply<T, R>(
-  transformer: (val: T) => R,
-  value: undefined,
-): undefined;
+export declare function apply<T, R>(transformer: (val: T) => R, value: undefined): undefined;
 /**
  * A type safe way to apply a transformer on a value if it's not empty.
  *
@@ -16,10 +13,7 @@ export declare function apply<T, R>(
  * @param value - The value to be transformed.
  * @returns If the value is empty, it remains its type. 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): null;
 /**
  * A type safe way to apply a transformer on a value if it's not empty.
  *
@@ -35,10 +29,7 @@ export declare function apply<T, R>(transformer: (val: T) => R, value: T): R;
  * @param value - The value to be transformed.
  * @returns If the value is empty, it remains its type. Otherwise it will be transformed.
  */
-export declare function apply<T, R>(
-  transformer: (val: T) => R,
-  value: T | undefined,
-): R | undefined;
+export declare function apply<T, R>(transformer: (val: T) => R, value: T | undefined): R | undefined;
 /**
  * A type safe way to apply a transformer on a value if it's not empty.
  *
@@ -46,10 +37,7 @@ export declare function apply<T, R>(
  * @param value - The value to be transformed.
  * @returns If the value is empty, it remains its type. 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 | null;
 /**
  * A type safe way to apply a transformer on a value if it's not empty.
  *
@@ -57,10 +45,7 @@ export declare function apply<T, R>(
  * @param value - The value to be transformed.
  * @returns If the value is empty, it remains its type. 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 | null;
 /**
  * Similar to Array.reduce, but the accumulator can returns Promise.
  *
@@ -68,13 +53,7 @@ export declare function apply<T, R>(
  * @param accumulator - A callback to be called for each value. If it returns null, the previous result will be kept.
  * @returns The accumulated result.
  */
-export declare function reduceAsync<T, V>(
-  values: T[],
-  accumulator: (
-    a: T,
-    b: T,
-  ) => Promise<T | undefined | null | void> | T | undefined | null | void,
-): Promise<T>;
+export declare function reduceAsync<T, V>(values: T[], accumulator: (a: T, b: T) => Promise<T | undefined | null | void> | T | undefined | null | void): Promise<T>;
 /**
  * Similar to Array.reduce, but the accumulator can returns Promise.
  *
@@ -83,13 +62,6 @@ export declare function reduceAsync<T, V>(
  * @param init - The initial value.
  * @returns The accumulated result.
  */
-export declare function reduceAsync<T, V>(
-  values: V[],
-  accumulator: (
-    a: T,
-    b: 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) => Promise<T | undefined | null | void> | T | undefined | null | void, init: T): Promise<T>;
 export declare function isWebview(userAgent: string): boolean;
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=index.d.ts.map

package/dist.commonjs/utils/index.js

@@ -9,30 +9,24 @@ exports.isWebview = exports.reduceAsync = exports.apply = void 0;
  * @returns If the value is empty, it remains its type. Otherwise it will be transformed.
  */
 function apply(transformer, value) {
-  if (value == null) {
-    return value;
-  }
-  return transformer(value);
+    if (value == null) {
+        return value;
+    }
+    return transformer(value);
 }
 exports.apply = apply;
 async function reduceAsync(values, accumulator, init) {
-  if (init === undefined) {
-    if (values.length === 0) {
-      throw new TypeError("Reduce of empty array with no initial value");
+    if (init === undefined) {
+        if (values.length === 0) {
+            throw new TypeError("Reduce of empty array with no initial value");
+        }
+        init = values[0];
+        values = values.slice(1);
     }
-    init = values[0];
-    values = values.slice(1);
-  }
-  return values.reduce(
-    (current, b) =>
-      current.then((v) =>
-        Promise.resolve(accumulator(v, b)).then((r) => r ?? v),
-      ),
-    Promise.resolve(init),
-  );
+    return values.reduce((current, b) => current.then((v) => Promise.resolve(accumulator(v, b)).then((r) => r ?? v)), Promise.resolve(init));
 }
 exports.reduceAsync = reduceAsync;
 function isWebview(userAgent) {
-  return /webview|wv|ip((?!.*Safari)|(?=.*like Safari))/i.test(userAgent);
+    return /webview|wv|ip((?!.*Safari)|(?=.*like Safari))/i.test(userAgent);
 }
 exports.isWebview = isWebview;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/core",
-  "version": "0.0.5-alpha.10",
+  "version": "0.0.5-alpha.13",
   "description": "Common Chains Connector Core",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",
@@ -67,5 +67,5 @@
     "cross-fetch": "^4.0.0",
     "ethers": "^6.13.1"
   },
-  "gitHead": "91ea3a92b02117905449ce4d2afef88bd3ffcc60"
+  "gitHead": "ea98fe4d33d85079871803fcf055ab3f7dc2a87c"
 }

package/src/ckb/transaction.ts

@@ -384,24 +384,23 @@ export class CellInput {
    * @returns The completed instance.
    * @example
    * ```typescript
-   * if (!cellInput.cellOutput) {
-   *   await cellInput.completeExtraInfos();
-   * }
+   * await cellInput.completeExtraInfos();
    * ```
    */
 
-  async completeExtraInfos(client: Client): Promise<CellInput> {
+  async completeExtraInfos(client: Client): Promise<void> {
     if (this.cellOutput && this.outputData && this.blockNumber) {
-      return this;
+      return;
     }
 
     const cell = await client.getCell(this.previousOutput);
-    if (cell) {
-      this.cellOutput = cell.cellOutput;
-      this.outputData = cell.outputData;
-      this.blockNumber = cell.blockNumber;
+    if (!cell) {
+      return;
     }
-    return this;
+
+    this.cellOutput = cell.cellOutput;
+    this.outputData = cell.outputData;
+    this.blockNumber = cell.blockNumber;
   }
 
   /**
@@ -867,8 +866,9 @@ export class Transaction {
     hasher.update(this.hash());
 
     for (let i = 0; i < this.witnesses.length; i += 1) {
-      if (this.inputs[i]) {
-        const input = await this.inputs[i].completeExtraInfos(client);
+      const input = this.inputs[i];
+      if (input) {
+        await input.completeExtraInfos(client);
 
         if (!input.cellOutput) {
           throw Error("Unable to resolve inputs info");
@@ -919,7 +919,40 @@ export class Transaction {
     const script = Script.from(scriptLike);
 
     for (let i = 0; i < this.inputs.length; i += 1) {
-      const input = await this.inputs[i].completeExtraInfos(client);
+      const input = this.inputs[i];
+      await input.completeExtraInfos(client);
+
+      if (!input.cellOutput) {
+        throw Error("Unable to resolve inputs info");
+      }
+
+      if (script.eq(input.cellOutput.lock)) {
+        return i;
+      }
+    }
+  }
+
+  /**
+   * Find the last occurrence of a input with the specified lock
+   *
+   * @param scriptLike - The script associated with the transaction, represented as a ScriptLike object.
+   * @param client - The client for complete extra infos in the transaction.
+   * @returns A promise that resolves to the prepared transaction
+   *
+   * @example
+   * ```typescript
+   * const index = await tx.findLastInputIndexByLock(scriptLike, client);
+   * ```
+   */
+  async findLastInputIndexByLock(
+    scriptLike: ScriptLike,
+    client: Client,
+  ): Promise<number | undefined> {
+    const script = Script.from(scriptLike);
+
+    for (let i = this.inputs.length - 1; i >= 0; i -= 1) {
+      const input = this.inputs[i];
+      await input.completeExtraInfos(client);
 
       if (!input.cellOutput) {
         throw Error("Unable to resolve inputs info");