@tomo-inc/embedded-wallet-providers 0.0.16 → 0.0.17

package/dist/index.cjs

@@ -4,7 +4,25 @@ var injectProviders = require('@tomo-inc/inject-providers');
 var walletUtils = require('@tomo-inc/wallet-utils');
 var oidcAuth = require('@tomo-inc/oidc-auth');
 
-// src/embedded-wallet.ts
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var evmDappPopups = {
   connect: "/dapp/connect",
   eth_requestAccounts: "/dapp/connect",
@@ -80,11 +98,11 @@ var shopDappPopups = {
   rewardClaimedDialog: "/dapp-shop/dialog"
 };
 var dappPopups = {
-  [walletUtils.ChainTypes.EVM]: evmDappPopups,
-  [walletUtils.ChainTypes.DOGE]: dogeDappPopups,
-  [walletUtils.ChainTypes.SOL]: solanaDappPopups,
-  [walletUtils.ChainTypes.TRON]: tronDappPopups,
-  [walletUtils.ChainTypes.BTC]: btcDappPopups,
+  [walletUtils.ChainTypeEnum.EVM]: evmDappPopups,
+  [walletUtils.ChainTypeEnum.DOGECOIN]: dogeDappPopups,
+  [walletUtils.ChainTypeEnum.SOLANA]: solanaDappPopups,
+  [walletUtils.ChainTypeEnum.TRON]: tronDappPopups,
+  [walletUtils.ChainTypeEnum.BITCOIN]: btcDappPopups,
   shop: shopDappPopups
 };
 
@@ -145,18 +163,24 @@ var onResponse = async (requestParams) => {
 };
 var EmbeddedWallet = class _EmbeddedWallet {
   constructor() {
-    this.isAvailable = false;
-    this.config = null;
-    this.info = null;
-    this.btcProvider = null;
-    this.dogecoinProvider = null;
-    this.evmProvider = null;
-    this.solanaProvider = null;
-    this.tronProvider = null;
+    this.themeConfig = null;
     this.walletIframe = null;
     this.walletOrigin = "";
     this.maskZIndex = 999;
-    this.persistedTheme = null;
+    this.isAvailable = false;
+    this.config = null;
+    this.info = null;
+    this.connectors = {
+      [walletUtils.ChainTypeEnum.BITCOIN]: null,
+      [walletUtils.ChainTypeEnum.DOGECOIN]: null,
+      [walletUtils.ChainTypeEnum.EVM]: null,
+      [walletUtils.ChainTypeEnum.SOLANA]: null,
+      [walletUtils.ChainTypeEnum.TRON]: null,
+      [walletUtils.ChainTypeEnum.SUI]: null,
+      [walletUtils.ChainTypeEnum.TON]: null,
+      [walletUtils.ChainTypeEnum.COSMOS]: null,
+      [walletUtils.ChainTypeEnum.APTOS]: null
+    };
     this.loginByGoogle = null;
     this.loginByX = null;
     this.loginStatusCallback = null;
@@ -181,10 +205,9 @@ var EmbeddedWallet = class _EmbeddedWallet {
     return _EmbeddedWallet.instance;
   }
   async init(config) {
-    var _a;
-    this.config = config;
-    if (!config.tomoClientId) {
-      throw new Error("tomoClientId is required.");
+    this.config = __spreadValues({}, config);
+    if (!config.clientId) {
+      throw new Error("clientId is required.");
     }
     if (!config.walletBaseUrl) {
       throw new Error("walletBaseUrl is required.");
@@ -197,33 +220,58 @@ var EmbeddedWallet = class _EmbeddedWallet {
     }
     hostArr.reverse();
     const rdns = hostArr.join(".");
-    this.info = {
-      uuid: hostArr.join("-"),
-      name: config.name,
-      icon: config.logo,
-      rdns,
-      links: {
-        homepage: config.walletBaseUrl
-      }
-    };
     const productInfo = {
       name: config.name,
       rdns,
       icon: config.logo
     };
-    this.btcProvider = new injectProviders.BtcProvider(productInfo, { sendRequest, onResponse });
-    this.dogecoinProvider = new injectProviders.DogecoinProvider(productInfo, { sendRequest, onResponse });
-    this.evmProvider = new injectProviders.EvmProvider(productInfo, { sendRequest, onResponse });
-    this.solanaProvider = new injectProviders.SolanaProvider(productInfo, { sendRequest, onResponse });
-    this.tronProvider = new injectProviders.TronProvider(productInfo, { sendRequest, onResponse });
-    const { loginByGoogle, loginByX } = oidcAuth.OidcAuth(config);
+    this.info = __spreadProps(__spreadValues({}, productInfo), {
+      uuid: hostArr.join("-"),
+      links: {
+        homepage: config.walletBaseUrl
+      }
+    });
+    this.connectors = __spreadProps(__spreadValues({}, this.connectors), {
+      [walletUtils.ChainTypeEnum.EVM]: {
+        provider: new injectProviders.EvmProvider(productInfo, { sendRequest, onResponse }),
+        standard: walletUtils.ProviderStandard.EIP1193,
+        protocol: walletUtils.ProviderProtocol.INJECT
+      },
+      [walletUtils.ChainTypeEnum.BITCOIN]: {
+        provider: new injectProviders.BitcoinProvider(productInfo, { sendRequest, onResponse }),
+        standard: walletUtils.ProviderStandard.NORMAL,
+        protocol: walletUtils.ProviderProtocol.INJECT
+      },
+      [walletUtils.ChainTypeEnum.DOGECOIN]: {
+        provider: new injectProviders.DogecoinProvider(productInfo, { sendRequest, onResponse }),
+        standard: walletUtils.ProviderStandard.NORMAL,
+        protocol: walletUtils.ProviderProtocol.INJECT
+      },
+      [walletUtils.ChainTypeEnum.SOLANA]: {
+        provider: new injectProviders.SolanaProvider(productInfo, { sendRequest, onResponse }),
+        standard: walletUtils.ProviderStandard.NORMAL,
+        protocol: walletUtils.ProviderProtocol.INJECT
+      },
+      [walletUtils.ChainTypeEnum.TRON]: {
+        provider: new injectProviders.TronProvider(productInfo, { sendRequest, onResponse }),
+        standard: walletUtils.ProviderStandard.NORMAL,
+        protocol: walletUtils.ProviderProtocol.INJECT
+      }
+    });
+    const { loginByGoogle, loginByX } = oidcAuth.OidcAuth({
+      tomoStage: config.stage,
+      xClientId: config.xClientId,
+      googleClientId: config.googleClientId
+    });
     this.loginByGoogle = loginByGoogle;
     this.loginByX = loginByX;
     const { isAvailable, message, connectedInfo } = await this.login();
     this.isAvailable = isAvailable;
+    console.log("embedded-wallet-providers connectedInfo::", connectedInfo);
     const { connected, address = [] } = (connectedInfo == null ? void 0 : connectedInfo.evmProvider) || {};
     if (connected && address.length > 0) {
-      (_a = this.evmProvider) == null ? void 0 : _a.setConnectedStatus({ connected, address });
+      const evmConnector = this.connectors[walletUtils.ChainTypeEnum.EVM];
+      (evmConnector == null ? void 0 : evmConnector.provider) && evmConnector.provider.setConnectedStatus({ connected, address });
     }
     return { isAvailable, message, connectedInfo };
   }
@@ -240,11 +288,11 @@ var EmbeddedWallet = class _EmbeddedWallet {
     }
     return new Promise((resolve, reject) => {
       try {
-        const { walletBaseUrl, tomoClientId, tomoStage, logo, name } = config || {};
-        if (!walletBaseUrl || !tomoClientId) {
-          throw new Error("walletBaseUrl + tomoClientId is required");
+        const { walletBaseUrl, clientId, stage, logo, name } = config || {};
+        if (!walletBaseUrl || !clientId) {
+          throw new Error("walletBaseUrl + clientId is required");
         }
-        const EMBEDDED_WALLET_ID = tomoClientId;
+        const EMBEDDED_WALLET_ID = clientId;
         let walletIframe = document.getElementById(EMBEDDED_WALLET_ID);
         if (!walletIframe) {
           walletIframe = document.createElement("iframe");
@@ -252,8 +300,15 @@ var EmbeddedWallet = class _EmbeddedWallet {
           walletIframe.id = EMBEDDED_WALLET_ID;
           document.body.appendChild(walletIframe);
         }
-        const dappOrigin = window.location.origin;
-        walletIframe.src = `${walletBaseUrl}#dappOrigin=${dappOrigin}&tomoStage=${tomoStage}&tomoClientId=${tomoClientId}&oidcToken=${oidcToken || ""}&logo=${logo || ""}&name=${name || ""}`;
+        const searchParams = new URLSearchParams({
+          dappOrigin: window.location.origin,
+          tomoStage: stage,
+          tomoClientId: clientId,
+          oidcToken: oidcToken || "",
+          logo: logo || "",
+          name: name || ""
+        });
+        walletIframe.src = `${walletBaseUrl}#${searchParams.toString()}`;
         walletIframe.allow = "publickey-credentials-get; publickey-credentials-create";
         this.walletIframe = walletIframe;
       } catch (error) {
@@ -263,10 +318,11 @@ var EmbeddedWallet = class _EmbeddedWallet {
       const receiveResponse = ({ origin, data }) => {
         var _a;
         if ((data == null ? void 0 : data.type) === "wallet-ready" && origin === this.walletOrigin) {
+          console.log("------receiveResponse", data, origin);
           this.isAvailable = ((_a = data == null ? void 0 : data.data) == null ? void 0 : _a.isAvailable) || false;
-          if (this.persistedTheme) {
+          if (this.themeConfig) {
             setTimeout(() => {
-              this.request("theme-change", this.persistedTheme);
+              this.request("theme-change", this.themeConfig);
             }, 0);
           }
           resolve(data == null ? void 0 : data.data);
@@ -284,7 +340,7 @@ var EmbeddedWallet = class _EmbeddedWallet {
     });
   }
   async themeChange(theme) {
-    this.persistedTheme = theme;
+    this.themeConfig = theme;
     this.request("theme-change", theme);
   }
   popup() {

package/dist/index.d.cts

@@ -1,17 +1,8 @@
+import { BitcoinProvider, DogecoinProvider, EvmProvider, SolanaProvider, TronProvider } from '@tomo-inc/inject-providers';
+import { ChainTypeEnum, ProviderStandard, ProviderProtocol } from '@tomo-inc/wallet-utils';
 export { EmailLoginResult } from '@tomo-inc/oidc-auth';
-import { BtcProvider, DogecoinProvider, EvmProvider, SolanaProvider, TronProvider } from '@tomo-inc/inject-providers';
 
-interface InitConfig {
-    xClientId: string;
-    googleClientId: string;
-    name: string;
-    logo: string;
-    tomoStage: "dev" | "prod";
-    tomoClientId: string;
-    walletBaseUrl: string;
-    relayBaseUrl?: string;
-    theme: any;
-}
+type TomoStage = "dev" | "pre" | "prod";
 interface WalletInfo {
     uuid: string;
     name: string;
@@ -25,30 +16,46 @@ interface WalletInfo {
 type WalletRequestMethod = "logout" | "token" | "market" | "assets" | "transactions" | "wallet" | "emailLogin" | "theme-change";
 type WalletOpenMethod = "wallet" | "swap" | "onRamp" | "funding" | "mfaVerify" | "mnemonic" | "setting";
 type EmbeddedWalletConfig = {
-    tomoStage: "dev" | "pre" | "prod";
+    xClientId: string;
+    googleClientId: string;
+    clientId: string;
     name: string;
     logo: string;
-    clientId: string;
-    googleClientId: string;
-    xClientId: string;
+    stage: TomoStage;
     walletBaseUrl: string;
+    relayBaseUrl?: string;
+    theme?: any;
     [key: string]: unknown;
 };
+type UnsupportedType = null;
+type ProviderConfig<TProvider> = {
+    provider: TProvider;
+    standard: ProviderStandard;
+    protocol: ProviderProtocol;
+};
+/** Maps each chain type to its provider so that providers[ChainTypeEnum.EVM] is inferred as EvmProvider | null, etc. */
+type EmbeddedWalletConnectors = {
+    [ChainTypeEnum.BITCOIN]: ProviderConfig<BitcoinProvider> | UnsupportedType;
+    [ChainTypeEnum.DOGECOIN]: ProviderConfig<DogecoinProvider> | UnsupportedType;
+    [ChainTypeEnum.EVM]: ProviderConfig<EvmProvider> | UnsupportedType;
+    [ChainTypeEnum.SOLANA]: ProviderConfig<SolanaProvider> | UnsupportedType;
+    [ChainTypeEnum.TRON]: ProviderConfig<TronProvider> | UnsupportedType;
+    [ChainTypeEnum.SUI]: UnsupportedType;
+    [ChainTypeEnum.TON]: UnsupportedType;
+    [ChainTypeEnum.COSMOS]: UnsupportedType;
+    [ChainTypeEnum.APTOS]: UnsupportedType;
+};
 
 declare class EmbeddedWallet {
-    isAvailable: boolean;
-    config: InitConfig | null;
-    info: WalletInfo | null;
-    btcProvider: BtcProvider | null;
-    dogecoinProvider: DogecoinProvider | null;
-    evmProvider: EvmProvider | null;
-    solanaProvider: SolanaProvider | null;
-    tronProvider: TronProvider | null;
+    private static instance;
+    private themeConfig;
     walletIframe: HTMLIFrameElement | null;
     walletOrigin: string;
     maskZIndex: number;
-    private static instance;
-    private persistedTheme;
+    isAvailable: boolean;
+    config: EmbeddedWalletConfig | null;
+    info: WalletInfo | null;
+    connectors: EmbeddedWalletConnectors;
     loginByGoogle: (() => Promise<string>) | null;
     loginByX: (() => Promise<string>) | null;
     loginStatusCallback: (({ type }: {
@@ -56,7 +63,7 @@ declare class EmbeddedWallet {
     }) => void) | null;
     constructor();
     static getInstance(): EmbeddedWallet;
-    init(config: InitConfig): Promise<{
+    init(config: EmbeddedWalletConfig): Promise<{
         isAvailable: boolean;
         message: string | undefined;
         connectedInfo: any;
@@ -99,4 +106,4 @@ declare class EmbeddedWallet {
     open(method: WalletOpenMethod, params?: any): Promise<any>;
 }
 
-export { EmbeddedWallet, type EmbeddedWalletConfig, type InitConfig };
+export { EmbeddedWallet, type EmbeddedWalletConfig };

package/dist/index.d.ts

@@ -1,17 +1,8 @@
+import { BitcoinProvider, DogecoinProvider, EvmProvider, SolanaProvider, TronProvider } from '@tomo-inc/inject-providers';
+import { ChainTypeEnum, ProviderStandard, ProviderProtocol } from '@tomo-inc/wallet-utils';
 export { EmailLoginResult } from '@tomo-inc/oidc-auth';
-import { BtcProvider, DogecoinProvider, EvmProvider, SolanaProvider, TronProvider } from '@tomo-inc/inject-providers';
 
-interface InitConfig {
-    xClientId: string;
-    googleClientId: string;
-    name: string;
-    logo: string;
-    tomoStage: "dev" | "prod";
-    tomoClientId: string;
-    walletBaseUrl: string;
-    relayBaseUrl?: string;
-    theme: any;
-}
+type TomoStage = "dev" | "pre" | "prod";
 interface WalletInfo {
     uuid: string;
     name: string;
@@ -25,30 +16,46 @@ interface WalletInfo {
 type WalletRequestMethod = "logout" | "token" | "market" | "assets" | "transactions" | "wallet" | "emailLogin" | "theme-change";
 type WalletOpenMethod = "wallet" | "swap" | "onRamp" | "funding" | "mfaVerify" | "mnemonic" | "setting";
 type EmbeddedWalletConfig = {
-    tomoStage: "dev" | "pre" | "prod";
+    xClientId: string;
+    googleClientId: string;
+    clientId: string;
     name: string;
     logo: string;
-    clientId: string;
-    googleClientId: string;
-    xClientId: string;
+    stage: TomoStage;
     walletBaseUrl: string;
+    relayBaseUrl?: string;
+    theme?: any;
     [key: string]: unknown;
 };
+type UnsupportedType = null;
+type ProviderConfig<TProvider> = {
+    provider: TProvider;
+    standard: ProviderStandard;
+    protocol: ProviderProtocol;
+};
+/** Maps each chain type to its provider so that providers[ChainTypeEnum.EVM] is inferred as EvmProvider | null, etc. */
+type EmbeddedWalletConnectors = {
+    [ChainTypeEnum.BITCOIN]: ProviderConfig<BitcoinProvider> | UnsupportedType;
+    [ChainTypeEnum.DOGECOIN]: ProviderConfig<DogecoinProvider> | UnsupportedType;
+    [ChainTypeEnum.EVM]: ProviderConfig<EvmProvider> | UnsupportedType;
+    [ChainTypeEnum.SOLANA]: ProviderConfig<SolanaProvider> | UnsupportedType;
+    [ChainTypeEnum.TRON]: ProviderConfig<TronProvider> | UnsupportedType;
+    [ChainTypeEnum.SUI]: UnsupportedType;
+    [ChainTypeEnum.TON]: UnsupportedType;
+    [ChainTypeEnum.COSMOS]: UnsupportedType;
+    [ChainTypeEnum.APTOS]: UnsupportedType;
+};
 
 declare class EmbeddedWallet {
-    isAvailable: boolean;
-    config: InitConfig | null;
-    info: WalletInfo | null;
-    btcProvider: BtcProvider | null;
-    dogecoinProvider: DogecoinProvider | null;
-    evmProvider: EvmProvider | null;
-    solanaProvider: SolanaProvider | null;
-    tronProvider: TronProvider | null;
+    private static instance;
+    private themeConfig;
     walletIframe: HTMLIFrameElement | null;
     walletOrigin: string;
     maskZIndex: number;
-    private static instance;
-    private persistedTheme;
+    isAvailable: boolean;
+    config: EmbeddedWalletConfig | null;
+    info: WalletInfo | null;
+    connectors: EmbeddedWalletConnectors;
     loginByGoogle: (() => Promise<string>) | null;
     loginByX: (() => Promise<string>) | null;
     loginStatusCallback: (({ type }: {
@@ -56,7 +63,7 @@ declare class EmbeddedWallet {
     }) => void) | null;
     constructor();
     static getInstance(): EmbeddedWallet;
-    init(config: InitConfig): Promise<{
+    init(config: EmbeddedWalletConfig): Promise<{
         isAvailable: boolean;
         message: string | undefined;
         connectedInfo: any;
@@ -99,4 +106,4 @@ declare class EmbeddedWallet {
     open(method: WalletOpenMethod, params?: any): Promise<any>;
 }
 
-export { EmbeddedWallet, type EmbeddedWalletConfig, type InitConfig };
+export { EmbeddedWallet, type EmbeddedWalletConfig };

package/dist/index.js

@@ -1,8 +1,26 @@
-import { BtcProvider, DogecoinProvider, EvmProvider, SolanaProvider, TronProvider } from '@tomo-inc/inject-providers';
-import { ChainTypes } from '@tomo-inc/wallet-utils';
+import { TronProvider, SolanaProvider, DogecoinProvider, BitcoinProvider, EvmProvider } from '@tomo-inc/inject-providers';
+import { ChainTypeEnum, ProviderProtocol, ProviderStandard } from '@tomo-inc/wallet-utils';
 import { OidcAuth } from '@tomo-inc/oidc-auth';
 
-// src/embedded-wallet.ts
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var evmDappPopups = {
   connect: "/dapp/connect",
   eth_requestAccounts: "/dapp/connect",
@@ -78,11 +96,11 @@ var shopDappPopups = {
   rewardClaimedDialog: "/dapp-shop/dialog"
 };
 var dappPopups = {
-  [ChainTypes.EVM]: evmDappPopups,
-  [ChainTypes.DOGE]: dogeDappPopups,
-  [ChainTypes.SOL]: solanaDappPopups,
-  [ChainTypes.TRON]: tronDappPopups,
-  [ChainTypes.BTC]: btcDappPopups,
+  [ChainTypeEnum.EVM]: evmDappPopups,
+  [ChainTypeEnum.DOGECOIN]: dogeDappPopups,
+  [ChainTypeEnum.SOLANA]: solanaDappPopups,
+  [ChainTypeEnum.TRON]: tronDappPopups,
+  [ChainTypeEnum.BITCOIN]: btcDappPopups,
   shop: shopDappPopups
 };
 
@@ -143,18 +161,24 @@ var onResponse = async (requestParams) => {
 };
 var EmbeddedWallet = class _EmbeddedWallet {
   constructor() {
-    this.isAvailable = false;
-    this.config = null;
-    this.info = null;
-    this.btcProvider = null;
-    this.dogecoinProvider = null;
-    this.evmProvider = null;
-    this.solanaProvider = null;
-    this.tronProvider = null;
+    this.themeConfig = null;
     this.walletIframe = null;
     this.walletOrigin = "";
     this.maskZIndex = 999;
-    this.persistedTheme = null;
+    this.isAvailable = false;
+    this.config = null;
+    this.info = null;
+    this.connectors = {
+      [ChainTypeEnum.BITCOIN]: null,
+      [ChainTypeEnum.DOGECOIN]: null,
+      [ChainTypeEnum.EVM]: null,
+      [ChainTypeEnum.SOLANA]: null,
+      [ChainTypeEnum.TRON]: null,
+      [ChainTypeEnum.SUI]: null,
+      [ChainTypeEnum.TON]: null,
+      [ChainTypeEnum.COSMOS]: null,
+      [ChainTypeEnum.APTOS]: null
+    };
     this.loginByGoogle = null;
     this.loginByX = null;
     this.loginStatusCallback = null;
@@ -179,10 +203,9 @@ var EmbeddedWallet = class _EmbeddedWallet {
     return _EmbeddedWallet.instance;
   }
   async init(config) {
-    var _a;
-    this.config = config;
-    if (!config.tomoClientId) {
-      throw new Error("tomoClientId is required.");
+    this.config = __spreadValues({}, config);
+    if (!config.clientId) {
+      throw new Error("clientId is required.");
     }
     if (!config.walletBaseUrl) {
       throw new Error("walletBaseUrl is required.");
@@ -195,33 +218,58 @@ var EmbeddedWallet = class _EmbeddedWallet {
     }
     hostArr.reverse();
     const rdns = hostArr.join(".");
-    this.info = {
-      uuid: hostArr.join("-"),
-      name: config.name,
-      icon: config.logo,
-      rdns,
-      links: {
-        homepage: config.walletBaseUrl
-      }
-    };
     const productInfo = {
       name: config.name,
       rdns,
       icon: config.logo
     };
-    this.btcProvider = new BtcProvider(productInfo, { sendRequest, onResponse });
-    this.dogecoinProvider = new DogecoinProvider(productInfo, { sendRequest, onResponse });
-    this.evmProvider = new EvmProvider(productInfo, { sendRequest, onResponse });
-    this.solanaProvider = new SolanaProvider(productInfo, { sendRequest, onResponse });
-    this.tronProvider = new TronProvider(productInfo, { sendRequest, onResponse });
-    const { loginByGoogle, loginByX } = OidcAuth(config);
+    this.info = __spreadProps(__spreadValues({}, productInfo), {
+      uuid: hostArr.join("-"),
+      links: {
+        homepage: config.walletBaseUrl
+      }
+    });
+    this.connectors = __spreadProps(__spreadValues({}, this.connectors), {
+      [ChainTypeEnum.EVM]: {
+        provider: new EvmProvider(productInfo, { sendRequest, onResponse }),
+        standard: ProviderStandard.EIP1193,
+        protocol: ProviderProtocol.INJECT
+      },
+      [ChainTypeEnum.BITCOIN]: {
+        provider: new BitcoinProvider(productInfo, { sendRequest, onResponse }),
+        standard: ProviderStandard.NORMAL,
+        protocol: ProviderProtocol.INJECT
+      },
+      [ChainTypeEnum.DOGECOIN]: {
+        provider: new DogecoinProvider(productInfo, { sendRequest, onResponse }),
+        standard: ProviderStandard.NORMAL,
+        protocol: ProviderProtocol.INJECT
+      },
+      [ChainTypeEnum.SOLANA]: {
+        provider: new SolanaProvider(productInfo, { sendRequest, onResponse }),
+        standard: ProviderStandard.NORMAL,
+        protocol: ProviderProtocol.INJECT
+      },
+      [ChainTypeEnum.TRON]: {
+        provider: new TronProvider(productInfo, { sendRequest, onResponse }),
+        standard: ProviderStandard.NORMAL,
+        protocol: ProviderProtocol.INJECT
+      }
+    });
+    const { loginByGoogle, loginByX } = OidcAuth({
+      tomoStage: config.stage,
+      xClientId: config.xClientId,
+      googleClientId: config.googleClientId
+    });
     this.loginByGoogle = loginByGoogle;
     this.loginByX = loginByX;
     const { isAvailable, message, connectedInfo } = await this.login();
     this.isAvailable = isAvailable;
+    console.log("embedded-wallet-providers connectedInfo::", connectedInfo);
     const { connected, address = [] } = (connectedInfo == null ? void 0 : connectedInfo.evmProvider) || {};
     if (connected && address.length > 0) {
-      (_a = this.evmProvider) == null ? void 0 : _a.setConnectedStatus({ connected, address });
+      const evmConnector = this.connectors[ChainTypeEnum.EVM];
+      (evmConnector == null ? void 0 : evmConnector.provider) && evmConnector.provider.setConnectedStatus({ connected, address });
     }
     return { isAvailable, message, connectedInfo };
   }
@@ -238,11 +286,11 @@ var EmbeddedWallet = class _EmbeddedWallet {
     }
     return new Promise((resolve, reject) => {
       try {
-        const { walletBaseUrl, tomoClientId, tomoStage, logo, name } = config || {};
-        if (!walletBaseUrl || !tomoClientId) {
-          throw new Error("walletBaseUrl + tomoClientId is required");
+        const { walletBaseUrl, clientId, stage, logo, name } = config || {};
+        if (!walletBaseUrl || !clientId) {
+          throw new Error("walletBaseUrl + clientId is required");
         }
-        const EMBEDDED_WALLET_ID = tomoClientId;
+        const EMBEDDED_WALLET_ID = clientId;
         let walletIframe = document.getElementById(EMBEDDED_WALLET_ID);
         if (!walletIframe) {
           walletIframe = document.createElement("iframe");
@@ -250,8 +298,15 @@ var EmbeddedWallet = class _EmbeddedWallet {
           walletIframe.id = EMBEDDED_WALLET_ID;
           document.body.appendChild(walletIframe);
         }
-        const dappOrigin = window.location.origin;
-        walletIframe.src = `${walletBaseUrl}#dappOrigin=${dappOrigin}&tomoStage=${tomoStage}&tomoClientId=${tomoClientId}&oidcToken=${oidcToken || ""}&logo=${logo || ""}&name=${name || ""}`;
+        const searchParams = new URLSearchParams({
+          dappOrigin: window.location.origin,
+          tomoStage: stage,
+          tomoClientId: clientId,
+          oidcToken: oidcToken || "",
+          logo: logo || "",
+          name: name || ""
+        });
+        walletIframe.src = `${walletBaseUrl}#${searchParams.toString()}`;
         walletIframe.allow = "publickey-credentials-get; publickey-credentials-create";
         this.walletIframe = walletIframe;
       } catch (error) {
@@ -261,10 +316,11 @@ var EmbeddedWallet = class _EmbeddedWallet {
       const receiveResponse = ({ origin, data }) => {
         var _a;
         if ((data == null ? void 0 : data.type) === "wallet-ready" && origin === this.walletOrigin) {
+          console.log("------receiveResponse", data, origin);
           this.isAvailable = ((_a = data == null ? void 0 : data.data) == null ? void 0 : _a.isAvailable) || false;
-          if (this.persistedTheme) {
+          if (this.themeConfig) {
             setTimeout(() => {
-              this.request("theme-change", this.persistedTheme);
+              this.request("theme-change", this.themeConfig);
             }, 0);
           }
           resolve(data == null ? void 0 : data.data);
@@ -282,7 +338,7 @@ var EmbeddedWallet = class _EmbeddedWallet {
     });
   }
   async themeChange(theme) {
-    this.persistedTheme = theme;
+    this.themeConfig = theme;
     this.request("theme-change", theme);
   }
   popup() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomo-inc/embedded-wallet-providers",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "author": "tomo.inc",
   "license": "MIT",
   "private": false,
@@ -17,8 +17,8 @@
   },
   "dependencies": {
     "@tomo-inc/oidc-auth": "0.0.16",
-    "@tomo-inc/wallet-utils": "0.0.16",
-    "@tomo-inc/inject-providers": "0.0.14"
+    "@tomo-inc/wallet-utils": "0.0.17",
+    "@tomo-inc/inject-providers": "0.0.15"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",

package/src/embedded-wallet.ts

@@ -1,24 +1,45 @@
-import { BtcProvider, DogecoinProvider, EvmProvider, SolanaProvider, TronProvider } from "@tomo-inc/inject-providers";
+import {
+  BitcoinProvider,
+  DogecoinProvider,
+  EvmProvider,
+  SolanaProvider,
+  TronProvider,
+} from "@tomo-inc/inject-providers";
 import { onResponse, sendRequest } from "./hub";
 
 import { OidcAuth } from "@tomo-inc/oidc-auth";
-import { InitConfig, WalletInfo, WalletOpenMethod, WalletRequestMethod } from "./types";
-
+import { ChainTypeEnum, ProviderProtocol, ProviderStandard } from "@tomo-inc/wallet-utils";
+import {
+  EmbeddedWalletConfig,
+  EmbeddedWalletConnectors,
+  WalletInfo,
+  WalletOpenMethod,
+  WalletRequestMethod,
+} from "./types";
+
+// ------------------------------------------------------------
 export class EmbeddedWallet {
-  public isAvailable: boolean = false;
-  public config: InitConfig | null = null;
-  public info: WalletInfo | null = null;
-  public btcProvider: BtcProvider | null = null;
-  public dogecoinProvider: DogecoinProvider | null = null;
-  public evmProvider: EvmProvider | null = null;
-  public solanaProvider: SolanaProvider | null = null;
-  public tronProvider: TronProvider | null = null;
+  private static instance: EmbeddedWallet;
+  private themeConfig: any | null = null;
 
   public walletIframe: HTMLIFrameElement | null = null;
   public walletOrigin: string = "";
   public maskZIndex: number = 999;
-  private static instance: EmbeddedWallet;
-  private persistedTheme: any | null = null;
+  public isAvailable: boolean = false;
+  public config: EmbeddedWalletConfig | null = null;
+  public info: WalletInfo | null = null;
+  public connectors: EmbeddedWalletConnectors = {
+    [ChainTypeEnum.BITCOIN]: null,
+    [ChainTypeEnum.DOGECOIN]: null,
+    [ChainTypeEnum.EVM]: null,
+    [ChainTypeEnum.SOLANA]: null,
+    [ChainTypeEnum.TRON]: null,
+    [ChainTypeEnum.SUI]: null,
+    [ChainTypeEnum.TON]: null,
+    [ChainTypeEnum.COSMOS]: null,
+    [ChainTypeEnum.APTOS]: null,
+  };
+
   public loginByGoogle: (() => Promise<string>) | null = null;
   public loginByX: (() => Promise<string>) | null = null;
   public loginStatusCallback: (({ type }: { type: string }) => void) | null = null;
@@ -31,12 +52,13 @@ export class EmbeddedWallet {
     return EmbeddedWallet.instance;
   }
 
-  public async init(config: InitConfig) {
-    this.config = config;
+  public async init(config: EmbeddedWalletConfig) {
+    this.config = { ...config };
 
-    if (!config.tomoClientId) {
-      throw new Error("tomoClientId is required.");
+    if (!config.clientId) {
+      throw new Error("clientId is required.");
     }
+
     if (!config.walletBaseUrl) {
       throw new Error("walletBaseUrl is required.");
     }
@@ -50,29 +72,54 @@ export class EmbeddedWallet {
     hostArr.reverse();
     const rdns = hostArr.join(".");
 
-    this.info = {
-      uuid: hostArr.join("-"),
+    const productInfo = {
       name: config.name,
-      icon: config.logo,
       rdns,
+      icon: config.logo,
+    };
+
+    this.info = {
+      ...productInfo,
+      uuid: hostArr.join("-"),
       links: {
         homepage: config.walletBaseUrl,
       },
     };
 
-    const productInfo = {
-      name: config.name,
-      rdns,
-      icon: config.logo,
+    this.connectors = {
+      ...this.connectors,
+      [ChainTypeEnum.EVM]: {
+        provider: new EvmProvider(productInfo, { sendRequest, onResponse }),
+        standard: ProviderStandard.EIP1193,
+        protocol: ProviderProtocol.INJECT,
+      },
+      [ChainTypeEnum.BITCOIN]: {
+        provider: new BitcoinProvider(productInfo, { sendRequest, onResponse }),
+        standard: ProviderStandard.NORMAL,
+        protocol: ProviderProtocol.INJECT,
+      },
+      [ChainTypeEnum.DOGECOIN]: {
+        provider: new DogecoinProvider(productInfo, { sendRequest, onResponse }),
+        standard: ProviderStandard.NORMAL,
+        protocol: ProviderProtocol.INJECT,
+      },
+      [ChainTypeEnum.SOLANA]: {
+        provider: new SolanaProvider(productInfo, { sendRequest, onResponse }),
+        standard: ProviderStandard.NORMAL,
+        protocol: ProviderProtocol.INJECT,
+      },
+      [ChainTypeEnum.TRON]: {
+        provider: new TronProvider(productInfo, { sendRequest, onResponse }),
+        standard: ProviderStandard.NORMAL,
+        protocol: ProviderProtocol.INJECT,
+      },
     };
 
-    this.btcProvider = new BtcProvider(productInfo, { sendRequest, onResponse });
-    this.dogecoinProvider = new DogecoinProvider(productInfo, { sendRequest, onResponse });
-    this.evmProvider = new EvmProvider(productInfo, { sendRequest, onResponse });
-    this.solanaProvider = new SolanaProvider(productInfo, { sendRequest, onResponse });
-    this.tronProvider = new TronProvider(productInfo, { sendRequest, onResponse });
-
-    const { loginByGoogle, loginByX } = OidcAuth(config);
+    const { loginByGoogle, loginByX } = OidcAuth({
+      tomoStage: config.stage,
+      xClientId: config.xClientId,
+      googleClientId: config.googleClientId,
+    });
 
     this.loginByGoogle = loginByGoogle;
     this.loginByX = loginByX;
@@ -80,9 +127,12 @@ export class EmbeddedWallet {
     const { isAvailable, message, connectedInfo } = await this.login();
     this.isAvailable = isAvailable;
 
+    console.log("embedded-wallet-providers connectedInfo::", connectedInfo);
+
     const { connected, address = [] } = connectedInfo?.evmProvider || {};
     if (connected && address.length > 0) {
-      this.evmProvider?.setConnectedStatus({ connected, address });
+      const evmConnector = this.connectors[ChainTypeEnum.EVM];
+      evmConnector?.provider && evmConnector.provider.setConnectedStatus({ connected, address });
     }
     return { isAvailable, message, connectedInfo };
   }
@@ -102,12 +152,12 @@ export class EmbeddedWallet {
 
     return new Promise((resolve, reject) => {
       try {
-        const { walletBaseUrl, tomoClientId, tomoStage, logo, name } = config || {};
-        if (!walletBaseUrl || !tomoClientId) {
-          throw new Error("walletBaseUrl + tomoClientId is required");
+        const { walletBaseUrl, clientId, stage, logo, name } = config || {};
+        if (!walletBaseUrl || !clientId) {
+          throw new Error("walletBaseUrl + clientId is required");
         }
 
-        const EMBEDDED_WALLET_ID = tomoClientId;
+        const EMBEDDED_WALLET_ID = clientId;
 
         let walletIframe = document.getElementById(EMBEDDED_WALLET_ID) as HTMLIFrameElement | null;
         if (!walletIframe) {
@@ -116,9 +166,15 @@ export class EmbeddedWallet {
           walletIframe.id = EMBEDDED_WALLET_ID;
           document.body.appendChild(walletIframe);
         }
-
-        const dappOrigin = window.location.origin;
-        walletIframe.src = `${walletBaseUrl}#dappOrigin=${dappOrigin}&tomoStage=${tomoStage}&tomoClientId=${tomoClientId}&oidcToken=${oidcToken || ""}&logo=${logo || ""}&name=${name || ""}`;
+        const searchParams = new URLSearchParams({
+          dappOrigin: window.location.origin,
+          tomoStage: stage,
+          tomoClientId: clientId,
+          oidcToken: oidcToken || "",
+          logo: logo || "",
+          name: name || "",
+        });
+        walletIframe.src = `${walletBaseUrl}#${searchParams.toString()}`;
         walletIframe.allow = "publickey-credentials-get; publickey-credentials-create";
         this.walletIframe = walletIframe;
       } catch (error) {
@@ -128,12 +184,13 @@ export class EmbeddedWallet {
 
       const receiveResponse = ({ origin, data }: { origin: string; data: any }) => {
         if (data?.type === "wallet-ready" && origin === this.walletOrigin) {
+          console.log("------receiveResponse", data, origin);
           this.isAvailable = data?.data?.isAvailable || false;
           // Apply persisted theme after wallet is ready
-          if (this.persistedTheme) {
+          if (this.themeConfig) {
             // Apply persisted theme asynchronously
             setTimeout(() => {
-              this.request("theme-change", this.persistedTheme);
+              this.request("theme-change", this.themeConfig);
             }, 0);
           }
           resolve(data?.data);
@@ -154,7 +211,7 @@ export class EmbeddedWallet {
 
   public async themeChange(theme: any) {
     // Persist theme to memory
-    this.persistedTheme = theme;
+    this.themeConfig = theme;
     this.request("theme-change", theme);
   }
 
@@ -185,13 +242,6 @@ export class EmbeddedWallet {
    * call relay for cubist logout, retrieve sessionInfo
    */
   public async logout(): Promise<boolean> {
-    // const { tomoClientId = "" } = this.config || {};
-    // if (tomoClientId) {
-    //   const walletIframe = document.getElementById(tomoClientId) as HTMLIFrameElement | null;
-    //   if (walletIframe) {
-    //     walletIframe.parentElement?.removeChild(walletIframe);
-    //   }
-    // }
     if (this.walletIframe) {
       this.walletIframe.src = `${this.walletOrigin}#logout=true`;
     }

package/src/index.ts

@@ -1,4 +1,4 @@
-export type { EmbeddedWalletConfig, InitConfig } from "./types";
+export type { EmbeddedWalletConfig } from "./types";
 
 export type { EmailLoginResult } from "@tomo-inc/oidc-auth";
 

package/src/relay-route.ts

@@ -1,4 +1,4 @@
-import { ChainTypes } from "@tomo-inc/wallet-utils";
+import { ChainTypeEnum } from "@tomo-inc/wallet-utils";
 
 /*
 popups = {
@@ -94,11 +94,11 @@ const shopDappPopups = {
 };
 
 const dappPopups = {
-  [ChainTypes.EVM]: evmDappPopups,
-  [ChainTypes.DOGE]: dogeDappPopups,
-  [ChainTypes.SOL]: solanaDappPopups,
-  [ChainTypes.TRON]: tronDappPopups,
-  [ChainTypes.BTC]: btcDappPopups,
+  [ChainTypeEnum.EVM]: evmDappPopups,
+  [ChainTypeEnum.DOGECOIN]: dogeDappPopups,
+  [ChainTypeEnum.SOLANA]: solanaDappPopups,
+  [ChainTypeEnum.TRON]: tronDappPopups,
+  [ChainTypeEnum.BITCOIN]: btcDappPopups,
   shop: shopDappPopups,
 };
 

package/src/types.ts

@@ -1,15 +1,14 @@
-export interface InitConfig {
-  xClientId: string;
-  googleClientId: string;
-  name: string;
-  logo: string;
-  tomoStage: "dev" | "prod";
-  tomoClientId: string;
-  walletBaseUrl: string;
-  relayBaseUrl?: string;
-  theme: any;
-}
+import {
+  BitcoinProvider,
+  DogecoinProvider,
+  EvmProvider,
+  SolanaProvider,
+  TronProvider,
+} from "@tomo-inc/inject-providers";
+
+import { ChainTypeEnum, ProviderProtocol, ProviderStandard } from "@tomo-inc/wallet-utils";
 
+export type TomoStage = "dev" | "pre" | "prod";
 export interface WalletInfo {
   uuid: string;
   name: string;
@@ -34,12 +33,49 @@ export type WalletRequestMethod =
 export type WalletOpenMethod = "wallet" | "swap" | "onRamp" | "funding" | "mfaVerify" | "mnemonic" | "setting";
 
 export type EmbeddedWalletConfig = {
-  tomoStage: "dev" | "pre" | "prod";
+  // social services client ids
+  xClientId: string;
+  googleClientId: string;
+  clientId: string;
+
+  // wallet info
   name: string;
   logo: string;
-  clientId: string;
-  googleClientId: string;
-  xClientId: string;
+
+  // tomo services configuration
+  stage: TomoStage;
   walletBaseUrl: string;
+  relayBaseUrl?: string;
+  // See: @tomo-inc/tomo-ui/types.ts
+  theme?: any;
+
   [key: string]: unknown;
 };
+
+export type UnsupportedType = null;
+export type ProviderType =
+  | BitcoinProvider
+  | DogecoinProvider
+  | EvmProvider
+  | SolanaProvider
+  | TronProvider
+  | UnsupportedType;
+
+export type ProviderConfig<TProvider> = {
+  provider: TProvider;
+  standard: ProviderStandard;
+  protocol: ProviderProtocol;
+};
+
+/** Maps each chain type to its provider so that providers[ChainTypeEnum.EVM] is inferred as EvmProvider | null, etc. */
+export type EmbeddedWalletConnectors = {
+  [ChainTypeEnum.BITCOIN]: ProviderConfig<BitcoinProvider> | UnsupportedType;
+  [ChainTypeEnum.DOGECOIN]: ProviderConfig<DogecoinProvider> | UnsupportedType;
+  [ChainTypeEnum.EVM]: ProviderConfig<EvmProvider> | UnsupportedType;
+  [ChainTypeEnum.SOLANA]: ProviderConfig<SolanaProvider> | UnsupportedType;
+  [ChainTypeEnum.TRON]: ProviderConfig<TronProvider> | UnsupportedType;
+  [ChainTypeEnum.SUI]: UnsupportedType;
+  [ChainTypeEnum.TON]: UnsupportedType;
+  [ChainTypeEnum.COSMOS]: UnsupportedType;
+  [ChainTypeEnum.APTOS]: UnsupportedType;
+};