@ckb-ccc/joy-id 0.0.5-alpha.0 → 0.0.5-alpha.10

package/dist.commonjs/evm/index.js

@@ -0,0 +1,101 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EvmSigner = void 0;
+const core_1 = require("@ckb-ccc/core");
+const common_1 = require("@joyid/common");
+const common_2 = require("../common");
+const connectionsStorage_1 = require("../connectionsStorage");
+class EvmSigner extends core_1.ccc.SignerEvm {
+  assertConnection() {
+    if (!this.isConnected() || !this.connection) {
+      throw new Error("Not connected");
+    }
+    return this.connection;
+  }
+  constructor(
+    client,
+    name,
+    icon,
+    appUri = "https://app.joy.id",
+    connectionsRepo = new connectionsStorage_1.ConnectionsRepoLocalStorage(),
+  ) {
+    super(client);
+    this.name = name;
+    this.icon = icon;
+    this.appUri = appUri;
+    this.connectionsRepo = connectionsRepo;
+  }
+  getConfig() {
+    return {
+      redirectURL: location.href,
+      joyidAppURL: this.appUri,
+      requestNetwork: `ethereum`,
+      name: this.name,
+      logo: this.icon,
+    };
+  }
+  async getEvmAccount() {
+    return this.assertConnection().address;
+  }
+  async connect() {
+    const config = await this.getConfig();
+    const res = await (0, common_2.createPopup)(
+      (0, common_1.buildJoyIDURL)(config, "popup", "/auth"),
+      {
+        ...config,
+        type: common_1.DappRequestType.Auth,
+      },
+    );
+    this.connection = {
+      address: res.ethAddress,
+      publicKey: core_1.ccc.hexFrom(res.pubkey),
+      keyType: res.keyType,
+    };
+    await this.saveConnection();
+  }
+  async isConnected() {
+    if (this.connection) {
+      return true;
+    }
+    await this.restoreConnection();
+    return this.connection !== undefined;
+  }
+  async signMessageRaw(message) {
+    const { address } = this.assertConnection();
+    const challenge =
+      typeof message === "string"
+        ? message
+        : core_1.ccc.hexFrom(message).slice(2);
+    const config = this.getConfig();
+    const { signature } = await (0, common_2.createPopup)(
+      (0, common_1.buildJoyIDURL)(
+        {
+          ...config,
+          challenge,
+          isData: typeof message !== "string",
+          address,
+        },
+        "popup",
+        "/sign-message",
+      ),
+      { ...config, type: common_1.DappRequestType.SignMessage },
+    );
+    return core_1.ccc.hexFrom(signature);
+  }
+  async saveConnection() {
+    return this.connectionsRepo.set(
+      {
+        uri: this.getConfig().joyidAppURL,
+        addressType: "ethereum",
+      },
+      this.connection,
+    );
+  }
+  async restoreConnection() {
+    this.connection = await this.connectionsRepo.get({
+      uri: this.getConfig().joyidAppURL,
+      addressType: "ethereum",
+    });
+  }
+}
+exports.EvmSigner = EvmSigner;

package/dist.commonjs/index.d.ts

@@ -1,2 +1,2 @@
 export * as JoyId from "./barrel";
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=index.d.ts.map

package/dist.commonjs/index.js

@@ -1,27 +1,48 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
+var __createBinding =
+  (this && this.__createBinding) ||
+  (Object.create
+    ? function (o, m, k, k2) {
+        if (k2 === undefined) k2 = k;
+        var desc = Object.getOwnPropertyDescriptor(m, k);
+        if (
+          !desc ||
+          ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)
+        ) {
+          desc = {
+            enumerable: true,
+            get: function () {
+              return m[k];
+            },
+          };
+        }
+        Object.defineProperty(o, k2, desc);
+      }
+    : function (o, m, k, k2) {
+        if (k2 === undefined) k2 = k;
+        o[k2] = m[k];
+      });
+var __setModuleDefault =
+  (this && this.__setModuleDefault) ||
+  (Object.create
+    ? function (o, v) {
+        Object.defineProperty(o, "default", { enumerable: true, value: v });
+      }
+    : function (o, v) {
+        o["default"] = v;
+      });
+var __importStar =
+  (this && this.__importStar) ||
+  function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null)
+      for (var k in mod)
+        if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
+          __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
-};
+  };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JoyId = void 0;
 exports.JoyId = __importStar(require("./barrel"));

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

@@ -1,3 +1,7 @@
 import { ccc } from "@ckb-ccc/core";
-export declare function getJoyIdSigners(client: ccc.Client): ccc.SignerInfo[];
-//# sourceMappingURL=index.d.ts.map
+export declare function getJoyIdSigners(
+  client: ccc.Client,
+  name: string,
+  icon: string,
+): ccc.SignerInfo[];
+//# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/signerFactory/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAIpC,wBAAgB,eAAe,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,UAAU,EAAE,CAuBpE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/signerFactory/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAMpC,wBAAgB,eAAe,CAC7B,MAAM,EAAE,GAAG,CAAC,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GACX,GAAG,CAAC,UAAU,EAAE,CAoClB"}

package/dist.commonjs/signerFactory/index.js

@@ -2,30 +2,49 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getJoyIdSigners = void 0;
 const core_1 = require("@ckb-ccc/core");
+const common_1 = require("@joyid/common");
 const btc_1 = require("../btc");
 const ckb_1 = require("../ckb");
-function getJoyIdSigners(client) {
+const evm_1 = require("../evm");
+function getJoyIdSigners(client, name, icon) {
+  if (
+    (0, common_1.isStandaloneBrowser)() ||
+    core_1.ccc.isWebview(window.navigator.userAgent)
+  ) {
     return [
-        {
-            type: core_1.ccc.SignerType.CKB,
-            name: "CKB",
-            signer: new ckb_1.CkbSigner(client),
-        },
-        {
-            type: core_1.ccc.SignerType.BTC,
-            name: "BTC",
-            signer: new btc_1.BitcoinSigner(client),
-        },
-        {
-            type: core_1.ccc.SignerType.BTC,
-            name: "BTC (P2WPKH)",
-            signer: new btc_1.BitcoinSigner(client, "p2wpkh"),
-        },
-        {
-            type: core_1.ccc.SignerType.BTC,
-            name: "BTC (P2TR)",
-            signer: new btc_1.BitcoinSigner(client, "p2tr"),
-        },
-    ];
+      core_1.ccc.SignerType.CKB,
+      core_1.ccc.SignerType.EVM,
+      core_1.ccc.SignerType.BTC,
+    ].map((type) => ({
+      name: type,
+      signer: new core_1.ccc.SignerAlwaysError(
+        client,
+        type,
+        "JoyID can only be used with standard browsers",
+      ),
+    }));
+  }
+  return [
+    {
+      name: "CKB",
+      signer: new ckb_1.CkbSigner(client, name, icon),
+    },
+    {
+      name: "BTC",
+      signer: new btc_1.BitcoinSigner(client, name, icon),
+    },
+    {
+      name: "EVM",
+      signer: new evm_1.EvmSigner(client, name, icon),
+    },
+    {
+      name: "BTC (P2WPKH)",
+      signer: new btc_1.BitcoinSigner(client, name, icon, "p2wpkh"),
+    },
+    {
+      name: "BTC (P2TR)",
+      signer: new btc_1.BitcoinSigner(client, name, icon, "p2tr"),
+    },
+  ];
 }
 exports.getJoyIdSigners = getJoyIdSigners;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/joy-id",
-  "version": "0.0.5-alpha.0",
+  "version": "0.0.5-alpha.10",
   "description": "Connector's support for JoyID",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",
@@ -38,9 +38,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@ckb-ccc/core": "0.0.5-alpha.0",
+    "@ckb-ccc/core": "0.0.5-alpha.10",
     "@joyid/ckb": "^0.0.11",
     "@joyid/common": "^0.0.3"
   },
-  "gitHead": "8a927f901a8f2fe7dfe2f6bf78a44689d6503949"
+  "gitHead": "91ea3a92b02117905449ce4d2afef88bd3ffcc60"
 }

package/src/advancedBarrel.ts

@@ -1 +1,2 @@
+export * from "./common";
 export * from "./connectionsStorage";

package/src/barrel.ts

@@ -1,3 +1,4 @@
 export * from "./btc";
 export * from "./ckb";
+export * from "./evm";
 export * from "./signerFactory";

package/src/btc/index.ts

@@ -1,5 +1,6 @@
 import { ccc } from "@ckb-ccc/core";
-import { authWithPopup, signMessageWithPopup } from "@joyid/common";
+import { DappRequestType, buildJoyIDURL } from "@joyid/common";
+import { createPopup } from "../common";
 import {
   Connection,
   ConnectionsRepo,
@@ -19,15 +20,23 @@ export class BitcoinSigner extends ccc.SignerBtc {
 
   constructor(
     client: ccc.Client,
+    private readonly name: string,
+    private readonly icon: string,
     private readonly addressType: "auto" | "p2wpkh" | "p2tr" = "auto",
-    private readonly uri = "https://app.joy.id",
+    private readonly appUri = "https://app.joy.id",
     private readonly connectionsRepo: ConnectionsRepo = new ConnectionsRepoLocalStorage(),
   ) {
     super(client);
   }
 
-  async replaceClient(client: ccc.Client): Promise<BitcoinSigner> {
-    return new BitcoinSigner(client, this.addressType, this.uri);
+  private getConfig() {
+    return {
+      redirectURL: location.href,
+      joyidAppURL: this.appUri,
+      requestNetwork: `btc-${this.addressType}`,
+      name: this.name,
+      logo: this.icon,
+    };
   }
 
   async getBtcAccount(): Promise<string> {
@@ -41,10 +50,10 @@ export class BitcoinSigner extends ccc.SignerBtc {
   }
 
   async connect(): Promise<void> {
-    const res = await authWithPopup({
-      joyidAppURL: this.uri,
-      redirectURL: location.href,
-      requestNetwork: `btc-${this.addressType}`,
+    const config = this.getConfig();
+    const res = await createPopup(buildJoyIDURL(config, "popup", "/auth"), {
+      ...config,
+      type: DappRequestType.Auth,
     });
 
     const { address, pubkey } = (() => {
@@ -61,11 +70,11 @@ export class BitcoinSigner extends ccc.SignerBtc {
     };
     await Promise.all([
       this.connectionsRepo.set(
-        { uri: this.uri, addressType: `btc-${res.btcAddressType}` },
+        { uri: this.appUri, addressType: `btc-${res.btcAddressType}` },
         this.connection,
       ),
       this.connectionsRepo.set(
-        { uri: this.uri, addressType: "btc-auto" },
+        { uri: this.appUri, addressType: "btc-auto" },
         this.connection,
       ),
     ]);
@@ -77,26 +86,32 @@ export class BitcoinSigner extends ccc.SignerBtc {
     }
 
     this.connection = await this.connectionsRepo.get({
-      uri: this.uri,
+      uri: this.appUri,
       addressType: `btc-${this.addressType}`,
     });
     return this.connection !== undefined;
   }
 
-  async signMessage(message: string | ccc.BytesLike): Promise<string> {
+  async signMessageRaw(message: string | ccc.BytesLike): Promise<string> {
     const { address } = this.assertConnection();
 
     const challenge =
       typeof message === "string" ? message : ccc.hexFrom(message).slice(2);
 
-    const { signature } = await signMessageWithPopup({
-      joyidAppURL: this.uri,
-      requestNetwork: `btc-${this.addressType}`,
-      challenge,
-      address,
-      signMessageType: "ecdsa",
-      redirectURL: location.href,
-    });
+    const config = this.getConfig();
+    const { signature } = await createPopup(
+      buildJoyIDURL(
+        {
+          ...config,
+          challenge,
+          address,
+          signMessageType: "ecdsa",
+        },
+        "popup",
+        "/sign-message",
+      ),
+      { ...config, type: DappRequestType.SignMessage },
+    );
     return signature;
   }
 }

package/src/ckb/index.ts

@@ -1,13 +1,7 @@
 import { ccc } from "@ckb-ccc/core";
 import { Aggregator } from "@joyid/ckb";
-import {
-  DappRequestType,
-  authWithPopup,
-  buildJoyIDURL,
-  createBlockDialog,
-  openPopup,
-  runPopup,
-} from "@joyid/common";
+import { DappRequestType, buildJoyIDURL } from "@joyid/common";
+import { createPopup } from "../common";
 import {
   Connection,
   ConnectionsRepo,
@@ -15,6 +9,14 @@ import {
 } from "../connectionsStorage";
 
 export class CkbSigner extends ccc.Signer {
+  get type(): ccc.SignerType {
+    return ccc.SignerType.CKB;
+  }
+
+  get signType(): ccc.SignerSignType {
+    return ccc.SignerSignType.JoyId;
+  }
+
   private connection?: Connection;
 
   private async assertConnection(): Promise<Connection> {
@@ -27,42 +29,43 @@ export class CkbSigner extends ccc.Signer {
 
   constructor(
     client: ccc.Client,
-    private readonly _uri?: string,
+    private readonly name: string,
+    private readonly icon: string,
+    private readonly _appUri?: string,
     private readonly _aggregatorUri?: string,
     private readonly connectionsRepo: ConnectionsRepo = new ConnectionsRepoLocalStorage(),
   ) {
     super(client);
   }
 
-  async replaceClient(client: ccc.Client): Promise<CkbSigner> {
-    return new CkbSigner(client, this._uri);
-  }
-
-  private async getUri(): Promise<string> {
-    if (this._uri) {
-      return this._uri;
-    }
-
-    return (await this.client.getAddressPrefix()) === "ckb"
-      ? "https://app.joy.id"
-      : "https://testnet.joyid.dev";
+  private getConfig() {
+    return {
+      redirectURL: location.href,
+      joyidAppURL:
+        this._appUri ?? this.client.addressPrefix === "ckb"
+          ? "https://app.joy.id"
+          : "https://testnet.joyid.dev",
+      name: this.name,
+      logo: this.icon,
+    };
   }
 
-  private async getAggregatorUri(): Promise<string> {
+  private getAggregatorUri(): string {
     if (this._aggregatorUri) {
       return this._aggregatorUri;
     }
 
-    return (await this.client.getAddressPrefix()) === "ckb"
+    return this.client.addressPrefix === "ckb"
       ? "https://cota.nervina.dev/mainnet-aggregator"
       : "https://cota.nervina.dev/aggregator";
   }
 
   async connect(): Promise<void> {
-    const uri = await this.getUri();
-    const res = await authWithPopup({
-      joyidAppURL: uri,
-      redirectURL: location.href,
+    const config = this.getConfig();
+
+    const res = await createPopup(buildJoyIDURL(config, "popup", "/auth"), {
+      ...config,
+      type: DappRequestType.Auth,
     });
 
     this.connection = {
@@ -90,6 +93,14 @@ export class CkbSigner extends ccc.Signer {
     return (await this.assertConnection()).address;
   }
 
+  async getIdentity(): Promise<string> {
+    const connection = await this.assertConnection();
+    return JSON.stringify({
+      keyType: connection.keyType,
+      publicKey: connection.publicKey.slice(2),
+    });
+  }
+
   async getAddressObj(): Promise<ccc.Address> {
     return await ccc.Address.fromString(
       await this.getInternalAddress(),
@@ -116,7 +127,9 @@ export class CkbSigner extends ccc.Signer {
     const witness = tx.getWitnessArgsAt(position) ?? ccc.WitnessArgs.from({});
     witness.lock = "0x";
     await this.prepareTransactionForSubKey(tx, witness);
-    return tx.setWitnessArgsAt(position, witness);
+    tx.setWitnessArgsAt(position, witness);
+
+    return tx;
   }
 
   private async prepareTransactionForSubKey(
@@ -161,38 +174,61 @@ export class CkbSigner extends ccc.Signer {
   async signOnlyTransaction(
     txLike: ccc.TransactionLike,
   ): Promise<ccc.Transaction> {
-    const popup = openPopup("");
-    if (!popup) {
-      return createBlockDialog(async () => this.signOnlyTransaction(txLike));
-    }
     const tx = ccc.Transaction.from(txLike);
     const { script } = await this.getAddressObj();
 
-    popup.location.href = buildJoyIDURL(
+    const config = this.getConfig();
+    const res = await createPopup(
+      buildJoyIDURL(
+        {
+          ...config,
+          tx: JSON.parse(tx.stringify()),
+          signerAddress: (await this.assertConnection()).address,
+          witnessIndex: await tx.findInputIndexByLock(script, this.client),
+        },
+        "popup",
+        "/sign-ckb-raw-tx",
+      ),
       {
-        joyidAppURL: await this.getUri(),
-        tx: JSON.parse(tx.stringify()),
-        signerAddress: (await this.assertConnection()).address,
-        redirectURL: location.href,
-        witnessIndex: await tx.findInputIndexByLock(script, this.client),
+        ...config,
+        type: DappRequestType.SignCkbRawTx,
       },
-      "popup",
-      "/sign-ckb-raw-tx",
     );
 
-    const res = await runPopup({
-      timeoutInSeconds: 3600,
-      popup,
-      type: DappRequestType.SignCkbRawTx,
-    });
-
     return ccc.Transaction.from(res.tx);
   }
 
+  async signMessageRaw(message: string | ccc.BytesLike): Promise<string> {
+    const { address } = await this.assertConnection();
+
+    const challenge =
+      typeof message === "string" ? message : ccc.hexFrom(message).slice(2);
+
+    const config = this.getConfig();
+    const res = await createPopup(
+      buildJoyIDURL(
+        {
+          ...config,
+          challenge,
+          isData: typeof message !== "string",
+          address,
+        },
+        "popup",
+        "/sign-message",
+      ),
+      { ...config, type: DappRequestType.SignMessage },
+    );
+    return JSON.stringify({
+      signature: res.signature,
+      alg: res.alg,
+      message: res.message,
+    });
+  }
+
   private async saveConnection() {
     return this.connectionsRepo.set(
       {
-        uri: await this.getUri(),
+        uri: this.getConfig().joyidAppURL,
         addressType: "ckb",
       },
       this.connection,
@@ -201,7 +237,7 @@ export class CkbSigner extends ccc.Signer {
 
   private async restoreConnection() {
     this.connection = await this.connectionsRepo.get({
-      uri: await this.getUri(),
+      uri: this.getConfig().joyidAppURL,
       addressType: "ckb",
     });
   }