@ckb-ccc/eip6963 0.0.3-alpha.0 → 0.0.4-alpha.0

package/dist/signer.d.ts

@@ -1,13 +1,10 @@
 import { ccc } from "@ckb-ccc/core";
 import { ProviderDetail as EIP6963ProviderDetail } from "./eip6963.advanced";
-export declare class Signer extends ccc.Signer {
+export declare class Signer extends ccc.SignerEvm {
     readonly detail: EIP6963ProviderDetail;
     constructor(client: ccc.Client, detail: EIP6963ProviderDetail);
-    getEVMAccounts(): Promise<`0x${string}`[]>;
-    getInternalAddress(): Promise<string>;
-    getAddressObjs(): Promise<ccc.Address[]>;
+    getEvmAccount(): Promise<`0x${string}`>;
     connect(): Promise<void>;
     signMessage(message: string | ccc.BytesLike): Promise<ccc.Hex>;
-    signOnlyTransaction(tx: ccc.Transaction): Promise<ccc.Transaction>;
 }
 //# sourceMappingURL=signer.d.ts.map

package/dist/signer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,cAAc,IAAI,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE7E,qBAAa,MAAO,SAAQ,GAAG,CAAC,MAAM;aAGlB,MAAM,EAAE,qBAAqB;gBAD7C,MAAM,EAAE,GAAG,CAAC,MAAM,EACF,MAAM,EAAE,qBAAqB;IAKzC,cAAc;IAId,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAIrC,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IAaxC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAW9D,mBAAmB,CAAC,EAAE,EAAE,GAAG,CAAC,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;CA8BzE"}
+{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,cAAc,IAAI,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE7E,qBAAa,MAAO,SAAQ,GAAG,CAAC,SAAS;aAGrB,MAAM,EAAE,qBAAqB;gBAD7C,MAAM,EAAE,GAAG,CAAC,MAAM,EACF,MAAM,EAAE,qBAAqB;IAKzC,aAAa;IAIb,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;CAUrE"}

package/dist/signer.js

@@ -1,43 +1,21 @@
 import { ccc } from "@ckb-ccc/core";
-export class Signer extends ccc.Signer {
+export class Signer extends ccc.SignerEvm {
     constructor(client, detail) {
         super(client);
         this.detail = detail;
     }
-    async getEVMAccounts() {
-        return this.detail.provider.request({ method: "eth_accounts" });
-    }
-    async getInternalAddress() {
-        return (await this.getEVMAccounts())[0];
-    }
-    async getAddressObjs() {
-        const accounts = await this.getEVMAccounts();
-        return Promise.all(accounts.map((account) => ccc.Address.fromKnownScript(ccc.KnownScript.OmniLock, ccc.hexFrom([0x12, ...ccc.bytesFrom(account), 0x00]), this.client)));
+    async getEvmAccount() {
+        return (await this.detail.provider.request({ method: "eth_accounts" }))[0];
     }
     async connect() {
         await this.detail.provider.request({ method: "eth_requestAccounts" });
     }
     async signMessage(message) {
-        const challenge = typeof message === "string" ? message : ccc.hexFrom(message);
-        const [address] = await this.getEVMAccounts();
+        const challenge = typeof message === "string" ? ccc.bytesFrom(message, "utf8") : message;
+        const address = await this.getEvmAccount();
         return this.detail.provider.request({
             method: "personal_sign",
-            params: [challenge, address],
+            params: [ccc.hexFrom(challenge), address],
         });
     }
-    async signOnlyTransaction(tx) {
-        const { script } = await this.getRecommendedAddressObj();
-        const info = await ccc.getSignHashInfo(tx, script);
-        if (!info) {
-            return tx;
-        }
-        const signature = ccc.bytesFrom(await this.signMessage(`CKB transaction: ${info.message}`));
-        if (signature[signature.length - 1] >= 27) {
-            signature[signature.length - 1] -= 27;
-        }
-        const witness = ccc.WitnessArgs.fromBytes(tx.witnesses[info.position]);
-        witness.lock = ccc.hexFrom(ccc.bytesConcat(ccc.numToBytes(5 * 4 + signature.length, 4), ccc.numToBytes(4 * 4, 4), ccc.numToBytes(5 * 4 + signature.length, 4), ccc.numToBytes(5 * 4 + signature.length, 4), ccc.numToBytes(signature.length, 4), signature));
-        tx.witnesses[info.position] = ccc.hexFrom(witness.toBytes());
-        return tx;
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/eip6963",
-  "version": "0.0.3-alpha.0",
+  "version": "0.0.4-alpha.0",
   "description": "Common Chains Connector's support for EIP6963",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",
@@ -35,7 +35,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@ckb-ccc/core": "0.0.3-alpha.0"
+    "@ckb-ccc/core": "0.0.4-alpha.0"
   },
-  "gitHead": "4a995208e5135d11e9f72b9a9fd73174a3056fc7"
+  "gitHead": "e49045ed4b2778c92d6f49b79c17125245141a21"
 }

package/src/signer.ts

@@ -1,7 +1,7 @@
 import { ccc } from "@ckb-ccc/core";
 import { ProviderDetail as EIP6963ProviderDetail } from "./eip6963.advanced";
 
-export class Signer extends ccc.Signer {
+export class Signer extends ccc.SignerEvm {
   constructor(
     client: ccc.Client,
     public readonly detail: EIP6963ProviderDetail,
@@ -9,25 +9,8 @@ export class Signer extends ccc.Signer {
     super(client);
   }
 
-  async getEVMAccounts() {
-    return this.detail.provider.request({ method: "eth_accounts" });
-  }
-
-  async getInternalAddress(): Promise<string> {
-    return (await this.getEVMAccounts())[0];
-  }
-
-  async getAddressObjs(): Promise<ccc.Address[]> {
-    const accounts = await this.getEVMAccounts();
-    return Promise.all(
-      accounts.map((account) =>
-        ccc.Address.fromKnownScript(
-          ccc.KnownScript.OmniLock,
-          ccc.hexFrom([0x12, ...ccc.bytesFrom(account), 0x00]),
-          this.client,
-        ),
-      ),
-    );
+  async getEvmAccount() {
+    return (await this.detail.provider.request({ method: "eth_accounts" }))[0];
   }
 
   async connect(): Promise<void> {
@@ -36,43 +19,12 @@ export class Signer extends ccc.Signer {
 
   async signMessage(message: string | ccc.BytesLike): Promise<ccc.Hex> {
     const challenge =
-      typeof message === "string" ? message : ccc.hexFrom(message);
-    const [address] = await this.getEVMAccounts();
+      typeof message === "string" ? ccc.bytesFrom(message, "utf8") : message;
+    const address = await this.getEvmAccount();
 
     return this.detail.provider.request({
       method: "personal_sign",
-      params: [challenge, address],
+      params: [ccc.hexFrom(challenge), address],
     });
   }
-
-  async signOnlyTransaction(tx: ccc.Transaction): Promise<ccc.Transaction> {
-    const { script } = await this.getRecommendedAddressObj();
-    const info = await ccc.getSignHashInfo(tx, script);
-    if (!info) {
-      return tx;
-    }
-
-    const signature = ccc.bytesFrom(
-      await this.signMessage(`CKB transaction: ${info.message}`),
-    );
-    if (signature[signature.length - 1] >= 27) {
-      signature[signature.length - 1] -= 27;
-    }
-
-    const witness = ccc.WitnessArgs.fromBytes(tx.witnesses[info.position]);
-    witness.lock = ccc.hexFrom(
-      ccc.bytesConcat(
-        ccc.numToBytes(5 * 4 + signature.length, 4),
-        ccc.numToBytes(4 * 4, 4),
-        ccc.numToBytes(5 * 4 + signature.length, 4),
-        ccc.numToBytes(5 * 4 + signature.length, 4),
-        ccc.numToBytes(signature.length, 4),
-        signature,
-      ),
-    );
-
-    tx.witnesses[info.position] = ccc.hexFrom(witness.toBytes());
-
-    return tx;
-  }
 }