@ckb-ccc/core 0.0.4-alpha.11 → 0.0.4-alpha.13

package/dist/signer/btc/signerBtcPublicKeyReadonly.js

@@ -39,7 +39,6 @@ export class SignerBtcPublicKeyReadonly extends SignerBtc {
     async isConnected() {
         return true;
     }
-    ;
     /**
      * Gets the Bitcoin account associated with the signer.
      *

package/dist/signer/ckb/signerCkbScriptReadonly.js

@@ -38,7 +38,6 @@ export class SignerCkbScriptReadonly extends Signer {
     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.js

@@ -42,7 +42,6 @@ export class SignerEvmAddressReadonly extends SignerEvm {
     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

@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/core",
-  "version": "0.0.4-alpha.11",
+  "version": "0.0.4-alpha.13",
   "description": "Common Chains Connector Core",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",
@@ -47,5 +47,5 @@
     "buffer": "^6.0.3",
     "cross-fetch": "^4.0.0"
   },
-  "gitHead": "db0297c0753349e2650d2845f42f546316078d5d"
+  "gitHead": "92a34e4c924a2b41702bcc1247edd5a01fe6925b"
 }

package/src/signer/btc/signerBtcPublicKeyReadonly.ts

@@ -49,7 +49,7 @@ export class SignerBtcPublicKeyReadonly extends SignerBtc {
    */
   async isConnected(): Promise<boolean> {
     return true;
-  };
+  }
 
   /**
    * Gets the Bitcoin account associated with the signer.

package/src/signer/ckb/signerCkbScriptReadonly.ts

@@ -45,7 +45,7 @@ export class SignerCkbScriptReadonly extends Signer {
    */
   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

@@ -50,7 +50,7 @@ export class SignerEvmAddressReadonly extends SignerEvm {
    */
   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());