@hot-labs/kit 1.0.40 → 1.0.41

package/src/OmniConnector.ts

@@ -1,12 +1,12 @@
 import { makeObservable, observable, runInAction } from "mobx";
 import UniversalProvider, { NamespaceConfig } from "@walletconnect/universal-provider";
 
-import { EventEmitter } from "./events";
+import { EventEmitter } from "./core/events";
 import { LocalStorage } from "./storage";
 import { HotConnector } from "./HotConnector";
 
 import { OmniWallet } from "./OmniWallet";
-import { WalletType } from "./omni/config";
+import { WalletType } from "./core/config";
 import { openWCRequest } from "./ui/router";
 
 export enum ConnectorType {
@@ -22,11 +22,6 @@ export interface OmniConnectorOption {
   type: "extension" | "external";
 }
 
-export interface OmniConnectorOptions {
-  projectId?: string;
-  metadata?: { name: string; description: string; url: string; icons: string[] };
-}
-
 export const WC_ICON = "https://raw.githubusercontent.com/WalletConnect/walletconnect-assets/refs/heads/master/Icon/Blue%20(Default)/Icon.svg";
 
 export abstract class OmniConnector<T extends OmniWallet = OmniWallet, O = {}> {
@@ -41,7 +36,7 @@ export abstract class OmniConnector<T extends OmniWallet = OmniWallet, O = {}> {
 
   protected wc: Promise<UniversalProvider> | null = null;
 
-  constructor(readonly wibe3: HotConnector, readonly settings?: OmniConnectorOptions) {
+  constructor(readonly wibe3: HotConnector) {
     makeObservable(this, {
       wallets: observable,
       options: observable,
@@ -49,12 +44,12 @@ export abstract class OmniConnector<T extends OmniWallet = OmniWallet, O = {}> {
   }
 
   async initWalletConnect() {
-    if (!this.settings?.projectId) throw new Error("Project ID is required");
+    if (!this.wibe3.settings?.projectId) throw new Error("Project ID is required");
     if (this.wc) return this.wc;
     this.wc = UniversalProvider.init({
       relayUrl: "wss://relay.walletconnect.org",
-      projectId: this.settings?.projectId,
-      metadata: this.settings?.metadata,
+      projectId: this.wibe3.settings?.projectId,
+      metadata: this.wibe3.settings?.metadata,
       customStoragePrefix: `wibe3:${this.id}`,
       name: this.name,
     });

package/src/OmniWallet.ts

@@ -1,11 +1,11 @@
 import { sha256 } from "@noble/hashes/sha2.js";
 
 import { openAuthPopup } from "./ui/connect/AuthPopup";
-import { OmniToken, WalletType } from "./omni/config";
+import { OmniToken, WalletType } from "./core/config";
 import { OmniConnector } from "./OmniConnector";
-import { Intents } from "./omni/Intents";
-import { ReviewFee } from "./omni/bridge";
-import { Token } from "./omni/token";
+import { Intents } from "./core/Intents";
+import { ReviewFee } from "./core/bridge";
+import { Token } from "./core/token";
 
 export interface AuthCommitment {
   tradingAddress: string;

package/src/{omni → core}/bridge.ts

@@ -6,6 +6,7 @@ export { ReviewFee };
 export const bridge = new HotBridge({
   api: ["https://dev.herewallet.app"],
   solanaRpc: ["https://api0.herewallet.app/api/v1/solana/rpc/1001"],
+  mpcApi: ["https://apt-hebdomadally-ariana.ngrok-free.dev"],
 
   publishIntents: async (signed: Record<string, any>[], hashes: string[] = []) => {
     const hash = await Intents.publishSignedIntents(signed, hashes);

package/src/{omni → core}/config.ts

@@ -97,7 +97,11 @@ export enum Network {
 }
 
 export const chainsMap: Record<number, { id: string; name: string; logo?: string }> = {
-  [Network.Juno]: { id: "juno-1", name: "Juno", logo: "https://storage.herewallet.app/ft/4444118:ujuno.png" },
+  [Network.Juno]: {
+    id: "juno-1",
+    name: "Juno",
+    logo: "https://storage.herewallet.app/ft/4444118:ujuno.png",
+  },
   [Network.Gonka]: { id: "gonka-mainnet", name: "Gonka", logo: "https://storage.herewallet.app/ft/4444119:ngonka.png" },
   [Network.Monad]: { id: "monad", name: "Monad", logo: "https://storage.herewallet.app/upload/8f6bdf0d04494dc7157704cf3a7e623aeba7188120d93535d3b9330fa82fc200.JPG" },
   [Network.Near]: { id: "near", name: "NEAR", logo: "https://storage.herewallet.app/ft/1010:native.png" },

package/src/{omni → core}/index.ts

@@ -5,4 +5,5 @@ export { tokens } from "./tokens";
 export { bridge } from "./bridge";
 export { Recipient } from "./recipient";
 export { formatter } from "./utils";
+export { rpc as nearRpc, TGAS } from "./nearRpc";
 export * from "./types";

package/src/cosmos/connector.ts

@@ -3,15 +3,15 @@ import { TxRaw } from "@keplr-wallet/proto-types/cosmos/tx/v1beta1/tx";
 import { StargateClient } from "@cosmjs/stargate";
 import { hex } from "@scure/base";
 
-import { WalletType } from "../omni/config";
+import { WalletType } from "../core/config";
 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 {
+export interface CosmosConnectorOptions {
   cosmosChains?: Record<string, { chain: string; rpc: string; denom: string; prefix: string }>;
 }
 
@@ -52,7 +52,7 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
   id = "cosmos";
 
   constructor(wibe3: HotConnector, options?: CosmosConnectorOptions) {
-    super(wibe3, options);
+    super(wibe3);
 
     this.options = [
       {
@@ -84,19 +84,21 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
       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) {

package/src/cosmos/index.ts

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

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 { chainsMap, WalletType } from "../core/config";
+import { ReviewFee } from "../core/bridge";
 import CosmosConnector from "./connector";
 
 interface ProtocolWallet {

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/config";
+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/config";
+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

@@ -8,12 +8,12 @@ import NearWallet from "./near/wallet";
 import EvmWallet from "./evm/wallet";
 
 import { HotConnector } from "./HotConnector";
-import { Network, OmniToken, WalletType } from "./omni/config";
-import { bridge, ReviewFee } from "./omni/bridge";
-import { Recipient } from "./omni/recipient";
+import { Network, OmniToken, WalletType } from "./core/config";
+import { bridge, ReviewFee } from "./core/bridge";
+import { Recipient } from "./core/recipient";
 import { OmniWallet } from "./OmniWallet";
-import { tokens } from "./omni/tokens";
-import { Token } from "./omni/token";
+import { tokens } from "./core/tokens";
+import { Token } from "./core/token";
 
 OpenAPI.BASE = "https://1click.chaindefuser.com";
 OpenAPI.TOKEN = "";

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/config";
 
-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";

package/src/near/connector.ts

@@ -1,22 +1,11 @@
 import { NearConnector } from "@hot-labs/near-connect";
 import { runInAction } from "mobx";
 
-import { WalletType } from "../omni/config";
+import { WalletType } from "../core/config";
 import { ConnectorType, OmniConnector } from "../OmniConnector";
 import { HotConnector } from "../HotConnector";
 import NearWallet from "./wallet";
 
-export interface NearConnectorOptions {
-  connector?: NearConnector;
-  projectId?: string;
-  metadata?: {
-    name: string;
-    description: string;
-    url: string;
-    icons: string[];
-  };
-}
-
 class Connector extends OmniConnector<NearWallet> {
   connector: NearConnector;
   type = ConnectorType.WALLET;
@@ -25,14 +14,14 @@ class Connector extends OmniConnector<NearWallet> {
   name = "NEAR Wallet";
   id = "near";
 
-  constructor(readonly wibe3: HotConnector, options?: NearConnectorOptions) {
+  constructor(readonly wibe3: HotConnector, connector?: NearConnector) {
     super(wibe3);
 
     this.connector =
-      options?.connector ||
+      connector ||
       new NearConnector({
         network: "mainnet",
-        walletConnect: options?.projectId ? { projectId: options.projectId, metadata: options.metadata } : undefined,
+        walletConnect: this.wibe3.settings?.projectId ? { projectId: this.wibe3.settings.projectId, metadata: this.wibe3.settings.metadata } : undefined,
       });
 
     this.connector.on("wallet:signOut", () => this.removeWallet());

package/src/near/index.ts

@@ -0,0 +1,9 @@
+import { NearConnector as NearConnectorBase } from "@hot-labs/near-connect";
+
+import { HotConnector } from "../HotConnector";
+import NearConnector from "./connector";
+import NearWallet from "./wallet";
+
+export { NearConnector, NearWallet };
+
+export default (base?: NearConnectorBase) => async (wibe3: HotConnector) => new NearConnector(wibe3, base);

package/src/near/wallet.ts

@@ -4,10 +4,10 @@ import { Action } from "@near-js/transactions";
 
 import { OmniConnector } from "../OmniConnector";
 import { OmniWallet } from "../OmniWallet";
-import { WalletType } from "../omni/config";
-import { ReviewFee } from "../omni/bridge";
-import { rpc, TGAS } from "../omni/nearRpc";
-import { Token } from "../omni/token";
+import { WalletType } from "../core/config";
+import { ReviewFee } from "../core/bridge";
+import { rpc, TGAS } from "../core/nearRpc";
+import { Token } from "../core/token";
 
 export default class NearWallet extends OmniWallet {
   readonly type = WalletType.NEAR;

package/src/solana/connector.ts

@@ -3,11 +3,11 @@ import { Transaction, PublicKey, VersionedTransaction, Connection } from "@solan
 import { base58 } from "@scure/base";
 import { runInAction } from "mobx";
 
-import { ConnectorType, OmniConnector, OmniConnectorOptions, WC_ICON } from "../OmniConnector";
+import { ConnectorType, OmniConnector, WC_ICON } from "../OmniConnector";
 import { HotConnector } from "../HotConnector";
 import { OmniWallet } from "../OmniWallet";
-import { isInjected } from "../hot-wallet/hot";
-import { WalletType } from "../omni/config";
+import { isInjected } from "../hot-wallet/iframe";
+import { WalletType } from "../core/config";
 
 import SolanaProtocolWallet from "./protocol";
 import { getWallets } from "./wallets";
@@ -23,8 +23,8 @@ class SolanaConnector extends OmniConnector<SolanaWallet, { wallet: Wallet }> {
   name = "Solana Wallet";
   id = "solana";
 
-  constructor(wibe3: HotConnector, readonly args?: OmniConnectorOptions) {
-    super(wibe3, args);
+  constructor(wibe3: HotConnector) {
+    super(wibe3);
 
     wallets.get().forEach((t) => {
       if (this.options.find((w) => w.name === t.name)) return;
@@ -69,12 +69,14 @@ class SolanaConnector extends OmniConnector<SolanaWallet, { wallet: Wallet }> {
       this.options = this.options.filter((w) => w.id !== wallet.name);
     });
 
-    this.initWalletConnect().then(async (wc) => {
-      this.options.unshift({ type: "external", download: "https://www.walletconnect.com/get", wallet: {} as Wallet, name: "WalletConnect", id: "walletconnect", icon: WC_ICON });
-      const selected = await this.getConnectedWallet();
-      if (selected.type !== "walletconnect") return;
-      this.setupWalletConnect();
-    });
+    this.initWalletConnect()
+      .then(async (wc) => {
+        this.options.unshift({ type: "external", download: "https://www.walletconnect.com/get", wallet: {} as Wallet, name: "WalletConnect", id: "walletconnect", icon: WC_ICON });
+        const selected = await this.getConnectedWallet();
+        if (selected.type !== "walletconnect") return;
+        this.setupWalletConnect();
+      })
+      .catch(() => {});
   }
 
   async setupWalletConnect(): Promise<SolanaWallet> {

package/src/solana/index.ts

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

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

@@ -1,6 +1,6 @@
 import { Transaction, VersionedTransaction, PublicKey } from "@solana/web3.js";
 
-import { isInjected, requestHot } from "../hot";
+import { isInjected, requestHot } from "../../hot-wallet/iframe";
 import { registerWallet } from "./register";
 import { GhostWallet } from "./solana-wallet";