@hot-labs/kit 1.0.40 → 1.0.43

package/src/cosmos/connector.ts

@@ -1,20 +1,17 @@
-import type { Keplr } from "@keplr-wallet/provider-extension";
+import { Keplr } from "@keplr-wallet/provider-extension";
 import { TxRaw } from "@keplr-wallet/proto-types/cosmos/tx/v1beta1/tx";
 import { StargateClient } from "@cosmjs/stargate";
+import { runInAction } from "mobx";
 import { hex } from "@scure/base";
 
-import { WalletType } from "../omni/config";
+import { chains, WalletType } from "../core/chains";
 import { HotConnector } from "../HotConnector";
-import { ConnectorType, OmniConnector, OmniConnectorOptions, WC_ICON } from "../OmniConnector";
+import { ConnectorType, OmniConnector, WC_ICON } from "../OmniConnector";
 import { OmniWallet } from "../OmniWallet";
 
 import { signAndSendTx } from "./helpers";
 import CosmosWallet from "./wallet";
 
-export interface CosmosConnectorOptions extends OmniConnectorOptions {
-  cosmosChains?: Record<string, { chain: string; rpc: string; denom: string; prefix: string }>;
-}
-
 declare global {
   interface Window {
     keplr?: Keplr;
@@ -42,8 +39,6 @@ const wallets = {
 };
 
 export default class CosmosConnector extends OmniConnector<CosmosWallet> {
-  cosmosChains: Record<string, { chain: string; rpc: string; denom: string; prefix: string }>;
-
   type = ConnectorType.WALLET;
   walletTypes = [WalletType.COSMOS];
   icon = "https://legacy.cosmos.network/presskit/cosmos-brandmark-dynamic-dark.svg";
@@ -51,12 +46,12 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
   isSupported = true;
   id = "cosmos";
 
-  constructor(wibe3: HotConnector, options?: CosmosConnectorOptions) {
-    super(wibe3, options);
+  constructor(wibe3: HotConnector) {
+    super(wibe3);
 
     this.options = [
       {
-        name: "keplr" in window ? "Keplr" : "Keplr Mobile",
+        name: "Keplr",
         download: "https://www.keplr.app/get",
         icon: "https://cdn.prod.website-files.com/667dc891bc7b863b5397495b/68a4ca95f93a9ab64dc67ab4_keplr-symbol.svg",
         type: "keplr" in window ? "extension" : "external",
@@ -71,36 +66,45 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
       },
     ];
 
-    this.cosmosChains = {
-      "juno-1": { chain: "juno-1", rpc: "https://juno-rpc.publicnode.com", denom: "ujuno", prefix: "juno" },
-      "gonka-mainnet": { chain: "gonka-mainnet", rpc: "https://dev.herewallet.app/api/v1/evm/rpc/4444119", denom: "ngonka", prefix: "gonka" },
-      "cosmoshub-4": { chain: "cosmoshub-4", rpc: "https://rpc.cosmoshub.certus.one", denom: "uatom", prefix: "cosmos" },
-      ...options?.cosmosChains,
-    };
+    Keplr.getKeplr().then((keplr) => {
+      const option = this.options.find((option) => option.id === "keplr")!;
+      runInAction(() => {
+        option.type = keplr ? "extension" : "external";
+        option.name = keplr ? "Keplr" : "Keplr Mobile";
+      });
+    });
 
-    this.getStorage().then(({ type, address, publicKey }) => {
+    this.getStorage().then(async ({ type, address, publicKey }) => {
       if (!address || !publicKey) return;
-      if (type === "keplr" && window.keplr) this.setKeplrWallet(window.keplr, address, publicKey);
+
+      if (type === "keplr") {
+        const keplr = await Keplr.getKeplr();
+        if (keplr) this.setKeplrWallet(keplr, address, publicKey);
+        else this.disconnect();
+      }
+
       if (type === "leap" && window.leap) this.setKeplrWallet(window.leap, address, publicKey);
     });
 
-    this.initWalletConnect().then(async (wc) => {
-      this.options.unshift({
-        download: "https://www.walletconnect.com/get",
-        name: "WalletConnect",
-        id: "walletconnect",
-        type: "external",
-        icon: WC_ICON,
-      });
+    this.initWalletConnect()
+      .then(async (wc) => {
+        this.options.unshift({
+          download: "https://www.walletconnect.com/get",
+          name: "WalletConnect",
+          id: "walletconnect",
+          type: "external",
+          icon: WC_ICON,
+        });
 
-      const selected = await this.getStorage();
-      if (selected.type !== "walletconnect") return;
-      this.setupWalletConnect(selected.id as "keplr" | "leap");
-    });
+        const selected = await this.getStorage();
+        if (selected.type !== "walletconnect") return;
+        this.setupWalletConnect(selected.id as "keplr" | "leap");
+      })
+      .catch(() => {});
   }
 
-  getConfig(chain: string) {
-    return this.cosmosChains[chain];
+  get chains() {
+    return chains.getByType(WalletType.COSMOS).map((t) => t.key);
   }
 
   async setupWalletConnect(id?: "keplr" | "leap"): Promise<CosmosWallet> {
@@ -139,7 +143,7 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
           },
         });
 
-        const client = await StargateClient.connect(this.getConfig(signDoc.chainId)?.rpc || "");
+        const client = await StargateClient.connect(chains.getByKey(signDoc.chainId).rpc || "");
         const protobufTx = TxRaw.encode({
           bodyBytes: signed.bodyBytes,
           authInfoBytes: signed.authInfoBytes,
@@ -162,8 +166,8 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
         publicKeyHex: publicKey,
         disconnect: () => keplr.disable(),
         sendTransaction: async (signDoc: any) => {
-          await keplr.enable(Object.keys(this.cosmosChains));
-          const rpcEndpoint = this.getConfig(signDoc.chainId)?.rpc || "";
+          await keplr.enable(this.chains);
+          const rpcEndpoint = chains.get(signDoc.chainId)?.rpc || "";
           return await signAndSendTx(keplr, rpcEndpoint, signDoc);
         },
       })
@@ -179,7 +183,7 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
           cosmos: {
             methods: ["cosmos_getAccounts", "cosmos_signDirect"],
             events: ["chainChanged", "accountsChanged"],
-            chains: Object.keys(this.cosmosChains).map((chain) => `cosmos:${chain}`),
+            chains: this.chains.map((chain) => `cosmos:${chain}`),
             rpcMap: {},
           },
         },
@@ -198,7 +202,7 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
       chainName: "Gonka",
     });
 
-    await extension.enable(Object.keys(this.cosmosChains));
+    await extension.enable(this.chains);
     const account = await extension.getKey("gonka-mainnet");
     await this.setStorage({ type, address: account.bech32Address, publicKey: hex.encode(account.pubKey) });
     return await this.setKeplrWallet(extension, account.bech32Address, hex.encode(account.pubKey));
@@ -212,7 +216,7 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
           cosmos: {
             methods: ["cosmos_getAccounts", "cosmos_signDirect"],
             events: ["chainChanged", "accountsChanged"],
-            chains: Object.keys(this.cosmosChains).map((chain) => `cosmos:${chain}`),
+            chains: this.chains.map((chain) => `cosmos:${chain}`),
             rpcMap: {},
           },
         },
@@ -220,7 +224,8 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
     }
 
     if (id === "keplr") {
-      return await this.connectKeplr("keplr", window.keplr);
+      const keplr = await Keplr.getKeplr();
+      return await this.connectKeplr("keplr", keplr);
     }
 
     if (id === "leap") {

package/src/cosmos/index.ts

@@ -0,0 +1,8 @@
+import CosmosConnector from "./connector";
+import CosmosWallet from "./wallet";
+
+import { HotConnector } from "../HotConnector";
+
+export { CosmosConnector, CosmosWallet };
+
+export default () => async (wibe3: HotConnector) => new CosmosConnector(wibe3);

package/src/cosmos/wallet.ts

@@ -1,8 +1,8 @@
 import { StargateClient } from "@cosmjs/stargate";
 
 import { OmniWallet, SignedAuth } from "../OmniWallet";
-import { chainsMap, WalletType } from "../omni/config";
-import { ReviewFee } from "../omni/bridge";
+import { chains, WalletType } from "../core/chains";
+import { ReviewFee } from "../core/bridge";
 import CosmosConnector from "./connector";
 
 interface ProtocolWallet {
@@ -68,7 +68,7 @@ export default class CosmosWallet extends OmniWallet {
   }
 
   async fetchBalance(chain: number, token: string): Promise<bigint> {
-    const config = this.connector.getConfig(chainsMap[chain].id);
+    const config = chains.get(chain);
     if (!config) throw new Error("Config not found");
     const client = await StargateClient.connect(config.rpc);
     const balance = await client.getBalance(this.address, token);

package/src/defaults.ts

@@ -0,0 +1,7 @@
+import near from "./near";
+import stellar from "./stellar";
+import ton from "./ton";
+import solana from "./solana";
+import evm from "./evm";
+
+export const defaultConnectors = [near(), evm(), solana(), ton(), stellar()];

package/src/evm/connector.ts

@@ -1,24 +1,17 @@
 import MetaMaskSDK from "@metamask/sdk";
 import { runInAction } from "mobx";
 
-import { ConnectorType, OmniConnector, OmniConnectorOptions, WC_ICON } from "../OmniConnector";
-import { WalletType } from "../omni/config";
-import { isInjected } from "../hot-wallet/hot";
+import { ConnectorType, OmniConnector, WC_ICON } from "../OmniConnector";
+import { Network, WalletType } from "../core/chains";
+import { isInjected } from "../hot-wallet/iframe";
 import { HotConnector } from "../HotConnector";
 import EvmWallet, { EvmProvider } from "./wallet";
 
-const chains = [1, 10, 56, 137, 8453, 42161, 421613, 80001];
-
-export interface EvmConnectorOptions extends OmniConnectorOptions {
-  chains?: number[];
-}
-
 class EvmConnector extends OmniConnector<EvmWallet, { provider: EvmProvider }> {
   icon = "https://storage.herewallet.app/upload/06b43b164683c2cbfe9a9c0699f0953fd56f1f802035e7701ea10501d9e091c6.png";
   walletTypes = [WalletType.EVM, WalletType.OMNI];
   type = ConnectorType.WALLET;
   name = "EVM Wallet";
-  chains = chains;
   id = "evm";
 
   MMSDK = new MetaMaskSDK({
@@ -29,10 +22,8 @@ class EvmConnector extends OmniConnector<EvmWallet, { provider: EvmProvider }> {
     },
   });
 
-  constructor(wibe3: HotConnector, readonly settings: EvmConnectorOptions = {}) {
-    super(wibe3, settings);
-
-    if (settings.chains) this.chains.push(...settings.chains);
+  constructor(wibe3: HotConnector) {
+    super(wibe3);
 
     window.addEventListener<any>("eip6963:announceProvider", async (provider) => {
       if (this.options.find((t) => t.name === provider.detail.info.name || t.id === provider.detail.info.uuid)) return;
@@ -60,15 +51,19 @@ class EvmConnector extends OmniConnector<EvmWallet, { provider: EvmProvider }> {
 
     window.dispatchEvent(new Event("eip6963:requestProvider"));
 
-    this.initWalletConnect().then((wc) => {
-      this.options.unshift({ id: "walletconnect", name: "WalletConnect", icon: WC_ICON, provider: {} as any, type: "external" });
-    });
+    this.initWalletConnect()
+      .then((wc) => {
+        this.options.unshift({ id: "walletconnect", name: "WalletConnect", icon: WC_ICON, provider: {} as any, type: "external" });
+      })
+      .catch(() => {});
 
-    this.wc?.then(async (wc) => {
-      const selected = await this.getConnectedWallet();
-      if (selected.id !== "walletconnect") return;
-      this.setupWalletConnect();
-    });
+    this.wc
+      ?.then(async (wc) => {
+        const selected = await this.getConnectedWallet();
+        if (selected.id !== "walletconnect") return;
+        this.setupWalletConnect();
+      })
+      .catch(() => {});
   }
 
   async setupWalletConnect(): Promise<EvmWallet> {
@@ -120,7 +115,7 @@ class EvmConnector extends OmniConnector<EvmWallet, { provider: EvmProvider }> {
         namespaces: {
           eip155: {
             methods: ["eth_sendTransaction", "eth_signTransaction", "eth_sign", "personal_sign", "eth_signTypedData"],
-            chains: chains.map((chain) => `eip155:${chain}`),
+            chains: Object.values(Network).map((chain) => `eip155:${chain}`),
             events: ["chainChanged", "accountsChanged"],
             rpcMap: {},
           },

package/src/evm/index.ts

@@ -0,0 +1,7 @@
+import EvmConnector from "./connector";
+import { HotConnector } from "../HotConnector";
+
+export { default as EvmConnector } from "./connector";
+export { default as EvmWallet } from "./wallet";
+
+export default () => async (wibe3: HotConnector) => new EvmConnector(wibe3);

package/src/{hot-wallet/evm.ts → evm/injected.ts}

@@ -1,4 +1,4 @@
-import { isInjected, requestHot } from "./hot";
+import { isInjected, requestHot } from "../hot-wallet/iframe";
 
 class HotEvmProvider {
   _events = new Map<string, Set<any>>();

package/src/evm/wallet.ts

@@ -1,11 +1,12 @@
 import { base64, base58, hex } from "@scure/base";
-import { BrowserProvider, ethers, JsonRpcProvider, JsonRpcSigner, TransactionRequest } from "ethers";
+import { BrowserProvider, ethers, JsonRpcProvider, TransactionRequest } from "ethers";
+import { JsonRpcSigner } from "ethers";
 
 import { OmniConnector } from "../OmniConnector";
 import { OmniWallet } from "../OmniWallet";
-import { WalletType } from "../omni/config";
-import { ReviewFee } from "../omni/bridge";
-import { Token } from "../omni/token";
+import { WalletType } from "../core/chains";
+import { ReviewFee } from "../core/bridge";
+import { Token } from "../core/token";
 import { erc20abi } from "./abi";
 
 export interface EvmProvider {
@@ -110,8 +111,12 @@ class EvmWallet extends OmniWallet {
 
   async sendTransaction(chain: number, request: TransactionRequest): Promise<string> {
     if (!this.provider.request) throw "not impl";
+    const provider = new BrowserProvider(this.provider as any);
+    const signer = new JsonRpcSigner(provider, this.address);
+
     await this.provider.request({ method: "wallet_switchEthereumChain", params: [{ chainId: `0x${chain.toString(16)}` }] });
-    return await this.provider.request({ method: "eth_sendTransaction", params: [request] });
+    const tx = await signer.sendTransaction(request);
+    return tx.hash;
   }
 
   async transfer(args: { token: Token; receiver: string; amount: bigint; comment?: string; gasFee?: ReviewFee }): Promise<string> {

package/src/exchange.ts

@@ -2,18 +2,15 @@ import { GetExecutionStatusResponse, OneClickService, ApiError, OpenAPI, QuoteRe
 import { utils } from "@hot-labs/omni-sdk";
 import { hex } from "@scure/base";
 
-import CosmosWallet from "./cosmos/wallet";
-import StellarWallet from "./stellar/wallet";
-import NearWallet from "./near/wallet";
-import EvmWallet from "./evm/wallet";
+import { Network, OmniToken, WalletType } from "./core/chains";
+import { ReviewFee } from "./core/bridge";
+import { Recipient } from "./core/recipient";
+import { tokens } from "./core/tokens";
+import { Token } from "./core/token";
 
+import StellarWallet from "./stellar/wallet";
 import { HotConnector } from "./HotConnector";
-import { Network, OmniToken, WalletType } from "./omni/config";
-import { bridge, ReviewFee } from "./omni/bridge";
-import { Recipient } from "./omni/recipient";
 import { OmniWallet } from "./OmniWallet";
-import { tokens } from "./omni/tokens";
-import { Token } from "./omni/token";
 
 OpenAPI.BASE = "https://1click.chaindefuser.com";
 OpenAPI.TOKEN = "";
@@ -78,11 +75,11 @@ export class Exchange {
     const { sender, token, amount, recipient, onMessage } = args;
     onMessage("Sending deposit transaction");
 
-    if (token.type === WalletType.COSMOS && sender instanceof CosmosWallet) {
-      const cosmosBridge = await bridge.cosmos();
+    if (token.type === WalletType.COSMOS && this.wibe3.isCosmosWallet(sender)) {
+      const cosmosBridge = await this.wibe3.hotBridge.cosmos();
       const hash = await cosmosBridge.deposit({
         sendTransaction: async (tx) => sender.sendTransaction(tx),
-        senderPublicKey: hex.decode(sender.publicKey),
+        senderPublicKey: hex.decode(sender.publicKey!),
         intentAccount: recipient.omniAddress,
         sender: sender.address,
         token: token.address,
@@ -91,15 +88,15 @@ export class Exchange {
       });
 
       onMessage("Waiting for deposit");
-      const deposit = await bridge.waitPendingDeposit(token.chain, hash, recipient.omniAddress);
+      const deposit = await this.wibe3.hotBridge.waitPendingDeposit(token.chain, hash, recipient.omniAddress);
       onMessage("Finishing deposit");
-      await bridge.finishDeposit(deposit);
+      await this.wibe3.hotBridge.finishDeposit(deposit);
       onMessage("Deposit finished");
       return;
     }
 
-    if (token.type === WalletType.EVM && sender instanceof EvmWallet) {
-      const hash = await bridge.evm.deposit({
+    if (token.type === WalletType.EVM && this.wibe3.isEvmWallet(sender)) {
+      const hash = await this.wibe3.hotBridge.evm.deposit({
         sendTransaction: async (tx) => sender.sendTransaction(token.chain, tx),
         intentAccount: recipient.omniAddress,
         sender: sender.address,
@@ -110,15 +107,15 @@ export class Exchange {
 
       if (!hash) throw new Error("Failed to deposit");
       onMessage("Waiting for deposit");
-      const deposit = await bridge.waitPendingDeposit(token.chain, hash, recipient.omniAddress);
+      const deposit = await this.wibe3.hotBridge.waitPendingDeposit(token.chain, hash, recipient.omniAddress);
       onMessage("Finishing deposit");
-      await bridge.finishDeposit(deposit);
+      await this.wibe3.hotBridge.finishDeposit(deposit);
       onMessage("Deposit finished");
       return;
     }
 
-    if (token.type === WalletType.NEAR && sender instanceof NearWallet) {
-      return await bridge.near.deposit({
+    if (token.type === WalletType.NEAR && this.wibe3.isNearWallet(sender)) {
+      return await this.wibe3.hotBridge.near.deposit({
         sendTransaction: async (tx: any) => sender.sendTransaction(tx),
         intentAccount: recipient.omniAddress,
         sender: sender.address,
@@ -134,11 +131,11 @@ export class Exchange {
     const { sender, token, amount, recipient } = args;
 
     const receipientWallet = this.wibe3.wallets.find((w) => w.address === recipient.address);
-    if (receipientWallet instanceof NearWallet && token.type === WalletType.NEAR) {
+    if (this.wibe3.isNearWallet(receipientWallet) && token.type === WalletType.NEAR) {
       await receipientWallet.registerToken(token.originalAddress);
     }
 
-    await bridge.withdrawToken({
+    await this.wibe3.hotBridge.withdrawToken({
       signIntents: async (intents) => sender.signIntents(intents),
       intentAccount: sender.omniAddress,
       receiver: recipient.address,
@@ -152,7 +149,7 @@ export class Exchange {
   async withdrawFee(request: BridgeRequest) {
     if (request.sender === "qr") throw new Error("Sender is QR");
     if (request.to.chain === Network.Near || request.to.chain === Network.Hot) return 0n;
-    const gaslessFee = await bridge.getGaslessWithdrawFee({
+    const gaslessFee = await this.wibe3.hotBridge.getGaslessWithdrawFee({
       receiver: request.recipient.address,
       token: request.to.address,
       chain: request.to.chain,
@@ -162,7 +159,7 @@ export class Exchange {
     if (request.to.address === "native") return 0n;
 
     // if withdraw token is not native, we need to swap a bit of it to native to cover the withdraw fee
-    const swap = await bridge.buildSwapExectOutIntent({
+    const swap = await this.wibe3.hotBridge.buildSwapExectOutIntent({
       intentFrom: utils.toOmniIntent(request.to.chain, request.to.address),
       intentTo: utils.toOmniIntent(request.to.chain, "native"),
       amountOut: gaslessFee.gasPrice,
@@ -186,7 +183,7 @@ export class Exchange {
     const noFee = from.symbol === to.symbol;
 
     if (sender !== "qr" && directChains.includes(from.chain) && to.chain === Network.Hot && from.omniAddress === to.omniAddress) {
-      const fee = await bridge.getDepositFee({
+      const fee = await this.wibe3.hotBridge.getDepositFee({
         intentAccount: sender.omniAddress,
         sender: sender.address,
         token: from.address,

package/src/{GoogleConnector.ts → hot-wallet/google.ts}

@@ -1,18 +1,22 @@
 import { WalletManifest, SignAndSendTransactionParams, SignAndSendTransactionsParams, SignMessageParams } from "@hot-labs/near-connect";
 import { Transaction } from "@stellar/stellar-base";
 import { action, makeObservable } from "mobx";
+import uuid4 from "uuid4";
 
-import { requestWebWallet } from "./hot-wallet/wallet";
-import { ConnectorType, OmniConnector } from "./OmniConnector";
-import { OmniWallet } from "./OmniWallet";
-import { WalletType } from "./omni/config";
+import { ConnectorType, OmniConnector } from "../OmniConnector";
+import { OmniWallet } from "../OmniWallet";
+import { WalletType } from "../core/chains";
 
-import EvmWallet from "./evm/wallet";
-import NearWallet from "./near/wallet";
-import SolanaWallet from "./solana/wallet";
-import TonWallet from "./ton/wallet";
-import StellarWallet from "./stellar/wallet";
-import { HotConnector } from "./HotConnector";
+import EvmWallet from "../evm/wallet";
+import NearWallet from "../near/wallet";
+import SolanaWallet from "../solana/wallet";
+import TonWallet from "../ton/wallet";
+import StellarWallet from "../stellar/wallet";
+import { HotConnector } from "../HotConnector";
+
+export interface GoogleConnectorOptions {
+  webWallet?: string;
+}
 
 class GoogleConnector extends OmniConnector<OmniWallet> {
   walletTypes = [WalletType.EVM, WalletType.STELLAR, WalletType.TON, WalletType.NEAR, WalletType.SOLANA];
@@ -20,21 +24,20 @@ class GoogleConnector extends OmniConnector<OmniWallet> {
   type = ConnectorType.SOCIAL;
   name = "Google Wallet";
   id = "google";
+  webWallet: string;
 
-  constructor(wibe3: HotConnector) {
+  constructor(wibe3: HotConnector, options?: GoogleConnectorOptions) {
     super(wibe3);
 
-    makeObservable(this, {
-      connectWallet: action,
-    });
-
+    this.webWallet = options?.webWallet ?? "https://wallet.google.com";
+    makeObservable(this, { connectWallet: action });
     this.getStorage().then((accounts: any) => {
       accounts.forEach((account: any) => this.connectWallet(account));
     });
   }
 
   connectWallet(account: { type: number; address: string; publicKey: string }) {
-    const request = requestWebWallet(account.type, account.address);
+    const request = this.requestWebWallet(account.type, account.address);
 
     if (account.type === WalletType.EVM) {
       this.setWallet(
@@ -87,7 +90,7 @@ class GoogleConnector extends OmniConnector<OmniWallet> {
   }
 
   async connect() {
-    const accounts = await requestWebWallet()("connect:google", {});
+    const accounts = await this.requestWebWallet()("connect:google", {});
     accounts.forEach((account: { type: number; address: string; publicKey: string }) => this.connectWallet(account));
     this.setStorage(accounts);
     return this.wallets[0];
@@ -97,6 +100,46 @@ class GoogleConnector extends OmniConnector<OmniWallet> {
     this.removeAllWallets();
     this.removeStorage();
   }
+
+  requestWebWallet = (chain?: number, address?: string) => (method: string, request: any) => {
+    const width = 480;
+    const height = 640;
+    const x = (window.screen.width - width) / 2;
+    const y = (window.screen.height - height) / 2;
+    const popup = window.open(`${this.wibe3.settings.webWallet}`, "_blank", `popup=1,width=${width},height=${height},top=${y},left=${x}`);
+
+    return new Promise<any>(async (resolve, reject) => {
+      const interval = setInterval(() => {
+        if (!popup?.closed) return;
+        clearInterval(interval);
+        reject(new Error("User rejected"));
+      }, 100);
+
+      const id = uuid4();
+      const handler = (event: MessageEvent) => {
+        if (event.origin !== this.wibe3.settings.webWallet) return;
+
+        if (event.data === "hot:ready") {
+          popup?.postMessage({ chain, address, method, request, id }, "*");
+          return;
+        }
+
+        if (event.data.id !== id) return;
+        if (event.data.success === false) {
+          clearInterval(interval);
+          reject(new Error(event.data.payload));
+          window.removeEventListener("message", handler);
+        }
+
+        window.removeEventListener("message", handler);
+        resolve(event.data.payload);
+        clearInterval(interval);
+        popup?.close();
+      };
+
+      window.addEventListener("message", handler);
+    });
+  };
 }
 
 export default GoogleConnector;

package/src/hot-wallet/{hot.ts → iframe.ts}

@@ -1,11 +1,4 @@
-const ancestorOrigins = new Set([
-  "http://localhost:1234",
-  "https://my.herewallet.app",
-  "https://tgapp-dev.herewallet.app",
-  "https://tgapp.herewallet.app",
-  "https://beta.herewallet.app",
-  "https://app.hot-labs.org",
-]);
+const ancestorOrigins = new Set(["http://localhost:1234", "https://my.herewallet.app", "https://tgapp-dev.herewallet.app", "https://tgapp.herewallet.app", "https://beta.herewallet.app", "https://app.hot-labs.org"]);
 
 export const isInjected = () => {
   if (typeof window === "undefined") return false;

package/src/hot-wallet/index.ts

@@ -1,4 +1,6 @@
-import "./evm";
-import "./solana";
-import "./ton";
-import "./solana";
+import GoogleConnector, { GoogleConnectorOptions } from "./google";
+import { HotConnector } from "../HotConnector";
+
+export { GoogleConnector, GoogleConnectorOptions };
+
+export default (options?: GoogleConnectorOptions) => async (wibe3: HotConnector) => new GoogleConnector(wibe3, options);

package/src/index.ts

@@ -1,30 +1,7 @@
-export { Network, OmniToken, WalletType } from "./omni/config";
-export { formatter } from "./omni/utils";
-export { EventEmitter } from "./events";
-
 export { OmniWallet } from "./OmniWallet";
 export { OmniConnector } from "./OmniConnector";
-export { Intents } from "./omni/Intents";
-export { Token } from "./omni/token";
-export { TGAS } from "./omni/nearRpc";
-
-export { default as EvmConnector } from "./evm/connector";
-export { default as SolanaConnector } from "./solana/connector";
-export { default as StellarConnector } from "./stellar/connector";
-export { default as TonConnector } from "./ton/connector";
-export { default as NearConnector } from "./near/connector";
-export { default as CosmosConnector } from "./cosmos/connector";
-
-export { default as EvmWallet } from "./evm/wallet";
-export { default as SolanaWallet } from "./solana/wallet";
-export { default as StellarWallet } from "./stellar/wallet";
-export { default as TonWallet } from "./ton/wallet";
-export { default as NearWallet } from "./near/wallet";
-export { default as CosmosWallet } from "./cosmos/wallet";
-
-export { near, evm, solana, stellar, ton, google } from "./HotConnector";
 export { HotConnector } from "./HotConnector";
 
-import "./hot-wallet";
-
 export { Bridge as BridgeWidget } from "./ui/payment/Bridge";
+
+export * from "./core";