@ckb-ccc/core 0.0.5-alpha.2 → 0.0.6-alpha.0

package/dist.commonjs/signer/nostr/signerNostr.js

@@ -0,0 +1,88 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SignerNostr = void 0;
+const bech32_1 = require("bech32");
+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");
+const verify_1 = require("./verify");
+class SignerNostr extends signer_1.Signer {
+    get type() {
+        return signer_1.SignerType.Nostr;
+    }
+    get signType() {
+        return signer_1.SignerSignType.NostrEvent;
+    }
+    /**
+     * Sign a message.
+     *
+     * @returns A promise that resolves to the signature.
+     */
+    async signMessageRaw(message) {
+        return (0, hex_1.hexFrom)((await this.signNostrEvent((0, verify_1.buildNostrEventFromMessage)(message))).sig);
+    }
+    /**
+     * Gets the internal address, which is the EVM account in this case.
+     *
+     * @returns A promise that resolves to a string representing the internal address.
+     */
+    async getInternalAddress() {
+        return bech32_1.bech32.encode("npub", bech32_1.bech32.toWords((0, bytes_1.bytesFrom)(await this.getNostrPublicKey())));
+    }
+    /**
+     * Gets an array of Address objects representing the known script addresses for the signer.
+     *
+     * @returns A promise that resolves to an array of Address objects.
+     */
+    async getAddressObjs() {
+        const publicKey = await this.getNostrPublicKey();
+        return [
+            await address_1.Address.fromKnownScript(client_1.KnownScript.NostrLock, (0, hex_1.hexFrom)((0, bytes_1.bytesConcat)([0x00], (0, hasher_1.ckbHash)(publicKey).slice(0, 42))), this.client),
+        ];
+    }
+    /**
+     * prepare a transaction before signing.
+     *
+     * @param txLike - The transaction to prepare, represented as a TransactionLike object.
+     * @returns A promise that resolves to the prepared Transaction object.
+     */
+    async prepareTransaction(txLike) {
+        const tx = ckb_1.Transaction.from(txLike);
+        const { script } = await this.getRecommendedAddressObj();
+        await tx.prepareSighashAllWitness(script, 572, this.client);
+        return tx;
+    }
+    /**
+     * Signs a transaction without modifying it.
+     *
+     * @param txLike - The transaction to sign, represented as a TransactionLike object.
+     * @returns A promise that resolves to a signed Transaction object.
+     */
+    async signOnlyTransaction(txLike) {
+        let tx = ckb_1.Transaction.from(txLike);
+        const { script } = await this.getRecommendedAddressObj();
+        const info = await tx.getSignHashInfo(script, this.client);
+        if (!info) {
+            return tx;
+        }
+        const signedEvent = (0, bytes_1.bytesFrom)(JSON.stringify(await this.signNostrEvent({
+            pubkey: (await this.getNostrPublicKey()).slice(2),
+            tags: [[SignerNostr.CKB_SIG_HASH_ALL_TAG, info.message.slice(2)]],
+            created_at: Math.floor(Date.now() / 1000),
+            kind: SignerNostr.CKB_UNLOCK_EVENT_KIND,
+            content: SignerNostr.CKB_UNLOCK_EVENT_CONTENT,
+        })), "utf8");
+        const witness = ckb_1.WitnessArgs.fromBytes(tx.witnesses[info.position]);
+        witness.lock = (0, hex_1.hexFrom)(signedEvent);
+        tx.setWitnessArgsAt(info.position, witness);
+        return tx;
+    }
+}
+exports.SignerNostr = SignerNostr;
+SignerNostr.CKB_SIG_HASH_ALL_TAG = "ckb_sighash_all";
+SignerNostr.CKB_UNLOCK_EVENT_KIND = 23334;
+SignerNostr.CKB_UNLOCK_EVENT_CONTENT = "Signing a CKB transaction\n\nIMPORTANT: Please verify the integrity and authenticity of connected Nostr client before signing this message\n";

package/dist.commonjs/signer/nostr/verify.d.ts

@@ -0,0 +1,5 @@
+import { BytesLike } from "../../bytes";
+import { NostrEvent } from "./signerNostr";
+export declare function buildNostrEventFromMessage(message: string | BytesLike): NostrEvent;
+export declare function verifyMessageNostrEvent(message: string | BytesLike, signature: string, address: string): boolean;
+//# sourceMappingURL=verify.d.ts.map

package/dist.commonjs/signer/nostr/verify.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../../src/signer/nostr/verify.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAa,MAAM,aAAa,CAAC;AAEnD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,MAAM,GAAG,SAAS,GAC1B,UAAU,CA2BZ;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,GACd,OAAO,CAoBT"}

package/dist.commonjs/signer/nostr/verify.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.verifyMessageNostrEvent = exports.buildNostrEventFromMessage = void 0;
+const secp256k1_1 = require("@noble/curves/secp256k1");
+const sha256_1 = require("@noble/hashes/sha256");
+const bech32_1 = require("bech32");
+const bytes_1 = require("../../bytes");
+const hex_1 = require("../../hex");
+function buildNostrEventFromMessage(message) {
+    if (typeof message === "string") {
+        try {
+            const event = JSON.parse(message);
+            if (typeof event === "object" &&
+                typeof event.created_at === "number" &&
+                typeof event.kind === "number" &&
+                typeof event.content === "string" &&
+                Array.isArray(event.args) &&
+                event.args.every((tag) => Array.isArray(tag) &&
+                    tag.every((v) => typeof v === "string"))) {
+                return event;
+            }
+        }
+        catch (_) { }
+    }
+    return {
+        kind: 23335,
+        created_at: 0,
+        content: typeof message === "string" ? message : (0, hex_1.hexFrom)(message),
+        tags: [],
+    };
+}
+exports.buildNostrEventFromMessage = buildNostrEventFromMessage;
+function verifyMessageNostrEvent(message, signature, address) {
+    const { words } = bech32_1.bech32.decode(address);
+    const publicKey = (0, hex_1.hexFrom)(bech32_1.bech32.fromWords(words)).slice(2);
+    const event = buildNostrEventFromMessage(message);
+    const serialized = JSON.stringify([
+        0,
+        publicKey,
+        event.created_at,
+        event.kind,
+        event.tags,
+        event.content,
+    ]);
+    const eventHash = (0, hex_1.hexFrom)((0, sha256_1.sha256)((0, bytes_1.bytesFrom)(serialized, "utf8")));
+    try {
+        return secp256k1_1.schnorr.verify(signature.slice(2), eventHash.slice(2), publicKey);
+    }
+    catch (_) {
+        return false;
+    }
+}
+exports.verifyMessageNostrEvent = verifyMessageNostrEvent;

package/dist.commonjs/signer/{signer.d.ts → signer/index.d.ts}

@@ -1,14 +1,15 @@
-import { Address } from "../address";
-import { BytesLike } from "../bytes";
-import { Transaction, TransactionLike } from "../ckb";
-import { Client } from "../client";
-import { Hex } from "../hex";
-import { Num } from "../num";
+import { Address } from "../../address";
+import { BytesLike } from "../../bytes";
+import { Transaction, TransactionLike } from "../../ckb";
+import { Client } from "../../client";
+import { Hex } from "../../hex";
+import { Num } from "../../num";
 export declare enum SignerSignType {
     Unknown = "Unknown",
     BtcEcdsa = "BtcEcdsa",
     EvmPersonal = "EvmPersonal",
-    JoyId = "JoyId"
+    JoyId = "JoyId",
+    NostrEvent = "NostrEvent"
 }
 /**
  * An enumeration of signer display types in wallet.
@@ -16,7 +17,8 @@ export declare enum SignerSignType {
 export declare enum SignerType {
     EVM = "EVM",
     BTC = "BTC",
-    CKB = "CKB"
+    CKB = "CKB",
+    Nostr = "Nostr"
 }
 export declare class Signature {
     signature: string;
@@ -36,23 +38,16 @@ export declare abstract class Signer {
     get client(): Client;
     static verifyMessage(message: string | BytesLike, signature: Signature): Promise<boolean>;
     /**
-     * Construct a new signer with the client replaced.
-     *
-     * @returns A promise that resolves the new Signer.
+     * Replace the current client.
+     * returns false if the new client is invalid for this signer.
      */
-    abstract replaceClient(client: Client): Promise<Signer>;
+    replaceClient(client: Client): Promise<boolean>;
     /**
      * Connects to the signer.
      *
      * @returns A promise that resolves when the connection is complete.
      */
     abstract connect(): Promise<void>;
-    /**
-     * Disconnects to the signer.
-     *
-     * @returns A promise that resolves when disconnected.
-     */
-    disconnect(): Promise<void>;
     /**
      * Check if the signer is connected.
      *
@@ -183,4 +178,4 @@ export type Wallet = {
     name: string;
     icon: string;
 };
-//# sourceMappingURL=signer.d.ts.map
+//# sourceMappingURL=index.d.ts.map

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

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

package/dist.commonjs/signer/{signer.js → signer/index.js}

@@ -1,15 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 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");
+const btc_1 = require("../btc");
+const verifyJoyId_1 = require("../ckb/verifyJoyId");
+const verify_1 = require("../evm/verify");
+const verify_2 = require("../nostr/verify");
 var SignerSignType;
 (function (SignerSignType) {
     SignerSignType["Unknown"] = "Unknown";
     SignerSignType["BtcEcdsa"] = "BtcEcdsa";
     SignerSignType["EvmPersonal"] = "EvmPersonal";
     SignerSignType["JoyId"] = "JoyId";
+    SignerSignType["NostrEvent"] = "NostrEvent";
 })(SignerSignType || (exports.SignerSignType = SignerSignType = {}));
 /**
  * An enumeration of signer display types in wallet.
@@ -19,6 +21,7 @@ var SignerType;
     SignerType["EVM"] = "EVM";
     SignerType["BTC"] = "BTC";
     SignerType["CKB"] = "CKB";
+    SignerType["Nostr"] = "Nostr";
 })(SignerType || (exports.SignerType = SignerType = {}));
 class Signature {
     constructor(signature, identity, signType) {
@@ -47,16 +50,20 @@ class Signer {
                 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.NostrEvent:
+                return (0, verify_2.verifyMessageNostrEvent)(message, signature.signature, signature.identity);
             case SignerSignType.Unknown:
                 throw new Error("Unknown signer sign type");
         }
     }
     /**
-     * Disconnects to the signer.
-     *
-     * @returns A promise that resolves when disconnected.
+     * Replace the current client.
+     * returns false if the new client is invalid for this signer.
      */
-    async disconnect() { }
+    async replaceClient(client) {
+        this.client_ = client;
+        return true;
+    }
     /**
      * Gets the identity for verifying signature, usually it's address
      *

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

@@ -1,7 +1,67 @@
+/**
+ * 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.
+ */
 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.
+ *
+ * @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.
+ */
 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.
+ *
+ * @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.
+ */
 export declare function apply<T, R>(transformer: (val: T) => R, value: T): R;
+/**
+ * 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.
+ */
 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.
+ *
+ * @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.
+ */
 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.
+ *
+ * @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.
+ */
 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.
+ *
+ * @param values - The array to be reduced.
+ * @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>;
+/**
+ * Similar to Array.reduce, but the accumulator can returns Promise.
+ *
+ * @param values - The array to be reduced.
+ * @param accumulator - A callback to be called for each value. If it returns null, the previous result will be kept.
+ * @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 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,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EACxB,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAC1B,KAAK,EAAE,SAAS,GACf,SAAS,CAAC;AACb,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,IAAI,GAAG,IAAI,CAAC;AAC3E,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC;AACrE,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,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,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"}
+{"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,KACD,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;AA0Bd,wBAAgB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAEpD"}

package/dist.commonjs/utils/index.js

@@ -1,6 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.apply = void 0;
+exports.isWebview = exports.reduceAsync = exports.apply = void 0;
+/**
+ * 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.
+ */
 function apply(transformer, value) {
     if (value == null) {
         return value;
@@ -8,3 +15,18 @@ function apply(transformer, 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");
+        }
+        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));
+}
+exports.reduceAsync = reduceAsync;
+function isWebview(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.2",
+  "version": "0.0.6-alpha.0",
   "description": "Common Chains Connector Core",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",
@@ -58,14 +58,15 @@
   "dependencies": {
     "@ckb-lumos/helpers": "^0.22.2",
     "@joyid/ckb": "^0.0.11",
+    "@noble/curves": "^1.4.2",
     "@noble/hashes": "^1.4.0",
-    "@unisat/wallet-utils": "^1.0.0",
     "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": "abbcbe8e25dc561e0a134d3906f40bb49b8a035f"
+  "gitHead": "2cbb4f450ed88e773a353a13ad006dbe6208f67f"
 }

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");
@@ -961,7 +994,7 @@ export class Transaction {
    * await tx.setWitnessArgsAt(0, witnessArgs);
    * ```
    */
-  setWitnessArgsAt(index: number, witness: WitnessArgs): Transaction {
+  setWitnessArgsAt(index: number, witness: WitnessArgs): void {
     if (this.witnesses.length < index) {
       this.witnesses.push(
         ...Array.from(
@@ -972,7 +1005,6 @@ export class Transaction {
     }
 
     this.witnesses[index] = hexFrom(witness.toBytes());
-    return this;
   }
 
   /**
@@ -992,14 +1024,14 @@ export class Transaction {
     scriptLike: ScriptLike,
     lockLen: number,
     client: Client,
-  ): Promise<Transaction> {
+  ): Promise<void> {
     const position = await this.findInputIndexByLock(scriptLike, client);
     if (position === undefined) {
-      return this;
+      return;
     }
 
     const witness = this.getWitnessArgsAt(position) ?? WitnessArgs.from({});
     witness.lock = hexFrom(Array.from(new Array(lockLen), () => 0));
-    return this.setWitnessArgsAt(position, witness);
+    this.setWitnessArgsAt(position, witness);
   }
 }

package/src/client/client.ts

@@ -8,6 +8,7 @@ import {
 import { Zero } from "../fixedPoint";
 import { Hex, HexLike } from "../hex";
 import { Num, NumLike, numFrom } from "../num";
+import { reduceAsync } from "../utils";
 import {
   ClientFindCellsResponse,
   ClientIndexerSearchKeyLike,
@@ -16,12 +17,13 @@ import {
 } from "./clientTypes";
 
 export enum KnownScript {
-  Secp256k1Blake160,
-  Secp256k1Multisig,
-  AnyoneCanPay,
-  JoyId,
-  COTA,
-  OmniLock,
+  Secp256k1Blake160 = "Secp256k1Blake160",
+  Secp256k1Multisig = "Secp256k1Multisig",
+  AnyoneCanPay = "AnyoneCanPay",
+  JoyId = "JoyId",
+  COTA = "COTA",
+  OmniLock = "OmniLock",
+  NostrLock = "NostrLock",
 }
 
 export abstract class Client {
@@ -121,10 +123,10 @@ export abstract class Client {
   }
 
   async getBalance(locks: ScriptLike[]): Promise<Num> {
-    return locks.reduce(
-      (res: Promise<Num>, lock) =>
-        this.getBalanceSingle(lock).then((a) => res.then((b) => a + b)),
-      Promise.resolve(Zero),
+    return reduceAsync(
+      locks,
+      async (acc, lock) => acc + (await this.getBalanceSingle(lock)),
+      Zero,
     );
   }
 }

package/src/client/clientPublicMainnet.advanced.ts

@@ -3,7 +3,7 @@ import { KnownScript } from "./client";
 
 export const MAINNET_SCRIPTS: Record<
   KnownScript,
-  Pick<Script, "codeHash" | "hashType">
+  Pick<Script, "codeHash" | "hashType"> | undefined
 > = {
   [KnownScript.Secp256k1Blake160]: {
     codeHash:
@@ -35,4 +35,5 @@ export const MAINNET_SCRIPTS: Record<
       "0x9b819793a64463aed77c615d6cb226eea5487ccfc0783043a587254cda2b6f26",
     hashType: "type",
   },
+  [KnownScript.NostrLock]: undefined,
 };

package/src/client/clientPublicMainnet.ts

@@ -15,6 +15,12 @@ export class ClientPublicMainnet extends ClientJsonRpc {
   async getKnownScript(
     script: KnownScript,
   ): Promise<Pick<Script, "codeHash" | "hashType">> {
-    return { ...MAINNET_SCRIPTS[script] };
+    const found = MAINNET_SCRIPTS[script];
+    if (!found) {
+      throw new Error(
+        `No script information was found for ${script} on ${this.addressPrefix}`,
+      );
+    }
+    return { ...found };
   }
 }

package/src/client/clientPublicTestnet.advanced.ts

@@ -35,4 +35,9 @@ export const TESTNET_SCRIPTS: Record<
       "0xf329effd1c475a2978453c8600e1eaf0bc2087ee093c3ee64cc96ec6847752cb",
     hashType: "type",
   },
+  [KnownScript.NostrLock]: {
+    codeHash:
+      "0x6ae5ee0cb887b2df5a9a18137315b9bdc55be8d52637b2de0624092d5f0c91d5",
+    hashType: "type",
+  },
 };

package/src/signer/btc/signerBtc.ts

@@ -79,12 +79,10 @@ export abstract class SignerBtc extends Signer {
    * @returns A promise that resolves to the prepared Transaction object.
    */
   async prepareTransaction(txLike: TransactionLike): Promise<Transaction> {
+    const tx = Transaction.from(txLike);
     const { script } = await this.getRecommendedAddressObj();
-    return Transaction.from(txLike).prepareSighashAllWitness(
-      script,
-      85,
-      this.client,
-    );
+    await tx.prepareSighashAllWitness(script, 85, this.client);
+    return tx;
   }
 
   /**
@@ -121,8 +119,7 @@ export abstract class SignerBtc extends Signer {
       ),
     );
 
-    tx.witnesses[info.position] = hexFrom(witness.toBytes());
-
+    tx.setWitnessArgsAt(info.position, witness);
     return tx;
   }
 }

package/src/signer/btc/signerBtcPublicKeyReadonly.ts

@@ -26,15 +26,6 @@ export class SignerBtcPublicKeyReadonly extends SignerBtc {
     this.publicKey = hexFrom(publicKey);
   }
 
-  /**
-   * Construct a new signer with the client replaced.
-   *
-   * @returns A promise that resolves the new Signer.
-   */
-  async replaceClient(client: Client): Promise<SignerBtcPublicKeyReadonly> {
-    return new SignerBtcPublicKeyReadonly(client, this.account, this.publicKey);
-  }
-
   /**
    * Connects to the client. This implementation does nothing as the class is read-only.
    *