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

package/dist.commonjs/utils/index.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.apply = void 0;
+function apply(transformer, value) {
+    if (value == null) {
+        return value;
+    }
+    return transformer(value);
+}
+exports.apply = apply;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/core",
-  "version": "0.0.4-alpha.8",
+  "version": "0.0.4",
   "description": "Common Chains Connector Core",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",
@@ -11,14 +11,27 @@
     "url": "git://github.com/ckb-ecofund/ccc.git"
   },
   "main": "dist/index.js",
+  "module": "dist.commonjs/index.js",
   "exports": {
-    ".": "./dist/index.js",
-    "./barrel": "./dist/barrel.js",
-    "./advancedBarrel": "./dist/advancedBarrel.js",
-    "./advanced": "./dist/advanced.js"
+    ".": {
+      "import": "./dist/index.js",
+      "default": "./dist.commonjs/index.js"
+    },
+    "./barrel": {
+      "import": "./dist/barrel.js",
+      "default": "./dist.commonjs/barrel.js"
+    },
+    "./advancedBarrel": {
+      "import": "./dist/advancedBarrel.js",
+      "default": "./dist.commonjs/advancedBarrel.js"
+    },
+    "./advanced": {
+      "import": "./dist/advanced.js",
+      "default": "./dist.commonjs/advanced.js"
+    }
   },
   "scripts": {
-    "build": "rimraf ./dist && tsc",
+    "build": "rimraf ./dist && rimraf ./dist.commonjs && tsc && tsc --project tsconfig.commonjs.json",
     "lint": "eslint",
     "format": "prettier --write . && eslint --fix"
   },
@@ -47,5 +60,5 @@
     "buffer": "^6.0.3",
     "cross-fetch": "^4.0.0"
   },
-  "gitHead": "98556e415832a41aeedb467e8a72b8861fe6a32d"
+  "gitHead": "76485b6b76ce3c97d5acebd42decbafd546aa433"
 }

package/src/signer/btc/signerBtcPublicKeyReadonly.ts

@@ -26,6 +26,15 @@ 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.
    *
@@ -33,6 +42,15 @@ export class SignerBtcPublicKeyReadonly extends SignerBtc {
    */
   async connect(): Promise<void> {}
 
+  /**
+   * Check if the signer is connected.
+   *
+   * @returns A promise that resolves the connection status.
+   */
+  async isConnected(): Promise<boolean> {
+    return true;
+  }
+
   /**
    * Gets the Bitcoin account associated with the signer.
    *

package/src/signer/ckb/signerCkbScriptReadonly.ts

@@ -22,6 +22,15 @@ export class SignerCkbScriptReadonly extends Signer {
     this.script = Script.from(script);
   }
 
+  /**
+   * Construct a new signer with the client replaced.
+   *
+   * @returns A promise that resolves the new Signer.
+   */
+  async replaceClient(client: Client): Promise<SignerCkbScriptReadonly> {
+    return new SignerCkbScriptReadonly(client, this.script);
+  }
+
   /**
    * Connects to the client. This implementation does nothing as the class is read-only.
    *
@@ -29,6 +38,15 @@ export class SignerCkbScriptReadonly extends Signer {
    */
   async connect(): Promise<void> {}
 
+  /**
+   * Check if the signer is connected.
+   *
+   * @returns A promise that resolves the connection status.
+   */
+  async isConnected(): Promise<boolean> {
+    return true;
+  }
+
   /**
    * Gets the internal address for the script.
    *

package/src/signer/evm/signerEvm.ts

@@ -1,6 +1,6 @@
 import { Address } from "../../address";
-import { bytesConcat, bytesFrom } from "../../bytes";
-import { Transaction, TransactionLike, WitnessArgs } from "../../ckb";
+import { BytesLike, bytesConcat, bytesFrom } from "../../bytes";
+import { Script, Transaction, TransactionLike, WitnessArgs } from "../../ckb";
 import { KnownScript } from "../../client";
 import { hexFrom } from "../../hex";
 import { numToBytes } from "../../num";
@@ -36,14 +36,27 @@ export abstract class SignerEvm extends Signer {
   async getAddressObjs(): Promise<Address[]> {
     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: string): Promise<Address> {
+    return Address.fromKnownScript(
+      KnownScript.OmniLock,
+      hexFrom([0x12, ...bytesFrom(account), 0x00]),
+      this.client,
+    );
+  }
+
+  async _getOmniLockOldEvmAddressObj(account: string): Promise<Address> {
+    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.
    *
@@ -51,8 +64,15 @@ export abstract class SignerEvm extends Signer {
    * @returns A promise that resolves to the prepared Transaction object.
    */
   async prepareTransaction(txLike: TransactionLike): Promise<Transaction> {
-    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)),
+    );
   }
 
   /**
@@ -62,16 +82,39 @@ export abstract class SignerEvm extends Signer {
    * @returns A promise that resolves to a signed Transaction object.
    */
   async signOnlyTransaction(txLike: TransactionLike): Promise<Transaction> {
-    const tx = Transaction.from(txLike);
+    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;
+  }
 
-    const { script } = await this.getRecommendedAddressObj();
+  async _signOmniLockScriptForTransaction(
+    tx: Transaction,
+    script: Script,
+    messageTransformer: (hash: string) => BytesLike,
+  ): Promise<Transaction> {
     const info = await getSignHashInfo(tx, script, this.client);
     if (!info) {
       return tx;
     }
 
     const signature = bytesFrom(
-      await this.signMessage(`CKB transaction: ${info.message}`),
+      await this.signMessage(messageTransformer(info.message)),
     );
     if (signature[signature.length - 1] >= 27) {
       signature[signature.length - 1] -= 27;

package/src/signer/evm/signerEvmAddressReadonly.ts

@@ -6,7 +6,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 abstract class SignerEvmAddressReadonly extends SignerEvm {
+export class SignerEvmAddressReadonly extends SignerEvm {
   private readonly address: Hex;
 
   /**
@@ -21,6 +21,15 @@ export abstract class SignerEvmAddressReadonly extends SignerEvm {
     this.address = hexFrom(address);
   }
 
+  /**
+   * Construct a new signer with the client replaced.
+   *
+   * @returns A promise that resolves the new Signer.
+   */
+  async replaceClient(client: Client): Promise<SignerEvmAddressReadonly> {
+    return new SignerEvmAddressReadonly(client, this.address);
+  }
+
   /**
    * Connects to the client. This implementation does nothing as the class is read-only.
    *
@@ -34,6 +43,15 @@ export abstract class SignerEvmAddressReadonly extends SignerEvm {
 
   async connect(): Promise<void> {}
 
+  /**
+   * Check if the signer is connected.
+   *
+   * @returns A promise that resolves the connection status.
+   */
+  async isConnected(): Promise<boolean> {
+    return true;
+  }
+
   /**
    * Gets the EVM account associated with the signer.
    *

package/src/signer/helpers.ts

@@ -112,9 +112,11 @@ export async function prepareSighashAllWitness(
     return tx;
   }
 
-  const witness = tx.witnesses[position]
-    ? WitnessArgs.fromBytes(tx.witnesses[position])
-    : WitnessArgs.from({});
+  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/src/signer/signer.ts

@@ -9,15 +9,33 @@ import { Hex } from "../hex";
  * This class provides methods to connect, get addresses, and sign transactions.
  */
 export abstract class Signer {
-  constructor(public readonly client: Client) {}
+  constructor(protected client_: Client) {}
+
+  get client(): Client {
+    return this.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 client.
+   * 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.
    *
@@ -142,5 +160,4 @@ export class SignerInfo {
 export type Wallet = {
   name: string;
   icon: string;
-  signers: SignerInfo[];
 };

package/tsconfig.base.json

@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "target": "es2020",
+    "incremental": true,
+    "allowJs": true,
+    "importHelpers": false,
+    "declaration": true,
+    "declarationMap": true,
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "esModuleInterop": true,
+    "strict": true,
+    "noImplicitAny": true,
+    "strictBindCallApply": true,
+    "strictNullChecks": true,
+    "alwaysStrict": true,
+    "noFallthroughCasesInSwitch": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "include": ["src/**/*"]
+}

package/tsconfig.commonjs.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "outDir": "./dist.commonjs"
+  }
+}