@hot-labs/kit 1.0.57 → 1.1.0-beta.2

package/src/exchange.ts

@@ -300,7 +300,7 @@ export class Exchange {
     };
   }
 
-  async makeSwap(review: BridgeReview, pending: { log: (message: string) => void }) {
+  async makeSwap(review: BridgeReview, pending: { log: (message: string) => void }): Promise<{ review: BridgeReview; processing?: () => Promise<BridgeReview> }> {
     const { sender, recipient } = review;
 
     if (review.qoute === "withdraw") {
@@ -309,7 +309,7 @@ export class Exchange {
       const recipientWallet = this.wibe3.wallets.find((w) => w.address === recipient.address);
       if (recipientWallet) this.wibe3.fetchToken(review.to, recipientWallet);
       this.wibe3.fetchToken(review.from, sender);
-      return review;
+      return { review };
     }
 
     if (review.qoute === "deposit") {
@@ -319,7 +319,7 @@ export class Exchange {
 
       const recipientWallet = this.wibe3.wallets.find((w) => w.address === recipient.address);
       if (recipientWallet) this.wibe3.fetchToken(review.to, recipientWallet);
-      return review;
+      return { review };
     }
 
     if (sender !== "qr") {
@@ -335,7 +335,8 @@ export class Exchange {
       const depositAddress = review.qoute.depositAddress!;
       let hash = "";
       if (review.from.chain === Network.Hot) {
-        hash = await sender.intents
+        hash = await this.wibe3
+          .intentsBuilder(sender)
           .transfer({
             amount: review.amountIn,
             token: review.from.address as OmniToken,
@@ -347,31 +348,30 @@ export class Exchange {
           receiver: depositAddress,
           amount: review.amountIn,
           comment: review.qoute.depositMemo,
-          token: review.from,
           gasFee: review.fee ?? undefined,
+          token: review.from,
         });
       }
 
-      pending.log("Submitting tx");
       this.wibe3.fetchToken(review.from, sender);
-      await OneClickService.submitDepositTx({ txHash: hash, depositAddress }).catch(() => {});
-    }
-
-    if (sender !== "qr") {
-      wait(1000).then(() => this.wibe3.fetchToken(review.to, sender));
+      OneClickService.submitDepositTx({ txHash: hash, depositAddress }).catch(() => {});
     }
 
-    pending.log("Processing...");
-    const recipientWallet = this.wibe3.wallets.find((w) => w.address === recipient.address);
-    if (!recipientWallet) return await this.processing(review);
+    return {
+      review,
+      processing: async () => {
+        const recipientWallet = this.wibe3.wallets.find((w) => w.address === recipient.address);
+        if (!recipientWallet) return await this.processing(review);
 
-    const beforeBalance = await this.wibe3.fetchToken(review.to, recipientWallet).catch(() => null);
-    if (!beforeBalance) return await this.processing(review);
+        const beforeBalance = await this.wibe3.fetchToken(review.to, recipientWallet).catch(() => null);
+        if (!beforeBalance) return await this.processing(review);
 
-    return await Promise.race([
-      this.waitBalance(review.to, recipientWallet, beforeBalance, review),
-      this.processing(review), //
-    ]);
+        return await Promise.race([
+          this.waitBalance(review.to, recipientWallet, beforeBalance, review),
+          this.processing(review), //
+        ]);
+      },
+    };
   }
 
   async waitBalance(to: Token, wallet: OmniWallet, beforeBalance: bigint, review: BridgeReview): Promise<BridgeReview> {

package/src/hot-wallet/google.ts

@@ -50,12 +50,19 @@ class GoogleConnector extends OmniConnector<OmniWallet> {
     if (account.type === WalletType.STELLAR) {
       const signMessage = async (message: string) => request("stellar:signMessage", { message });
       const signTransaction = async (transaction: Transaction) => request("stellar:signTransaction", { transaction: transaction.toXDR() });
-      this.wallets.push(new StellarWallet(this, { address: account.address, signMessage, signTransaction }));
+      this.wallets.push(
+        new StellarWallet({
+          rpc: this.wibe3.hotBridge.stellar,
+          address: account.address,
+          signMessage,
+          signTransaction,
+        })
+      );
     }
 
     if (account.type === WalletType.TON) {
       this.setWallet(
-        new TonWallet(this, {
+        new TonWallet({
           sendTransaction: (params) => request("ton:sendTransaction", params),
           signData: (params) => request("ton:signData", params),
           account: { address: account.address, publicKey: account.publicKey },
@@ -65,21 +72,21 @@ class GoogleConnector extends OmniConnector<OmniWallet> {
 
     if (account.type === WalletType.NEAR) {
       this.setWallet(
-        new NearWallet(this, account.address, account.publicKey, {
+        new NearWallet(account.address, account.publicKey, {
           signAndSendTransaction: (params: SignAndSendTransactionParams) => request("near:signAndSendTransaction", params),
           signAndSendTransactions: (params: SignAndSendTransactionsParams) => request("near:signAndSendTransactions", params),
           signMessage: (params: SignMessageParams) => request("near:signMessage", params),
           getAccounts: async () => [{ accountId: account.address, publicKey: account.publicKey }],
           signIn: () => request("near:signIn", {}),
-          signOut: async () => {},
           manifest: {} as unknown as WalletManifest,
+          signOut: async () => {},
         }) as NearWallet
       );
     }
 
     if (account.type === WalletType.SOLANA) {
       this.setWallet(
-        new SolanaWallet(this, {
+        new SolanaWallet({
           sendTransaction: async (transaction: unknown, _: unknown, options?: unknown) => await request("solana:sendTransaction", { transaction, options }),
           signMessage: async (message: string) => await request("solana:signMessage", { message }),
           disconnect: async () => {},

package/src/index.ts

@@ -1,3 +1,5 @@
+import "@lottiefiles/dotlottie-wc";
+
 export { OmniWallet } from "./OmniWallet";
 export { OmniConnector } from "./OmniConnector";
 export { HotConnector } from "./HotConnector";

package/src/near/connector.ts

@@ -28,7 +28,7 @@ class Connector extends OmniConnector<NearWallet> {
     this.connector.on("wallet:signOut", () => this.removeWallet());
     this.connector.getConnectedWallet().then(async ({ wallet }) => {
       const [account] = await wallet.getAccounts();
-      if (account) this.setWallet(new NearWallet(this, account.accountId, account.publicKey, wallet));
+      if (account) this.setWallet(new NearWallet(account.accountId, account.publicKey, wallet));
     });
 
     this.connector.whenManifestLoaded.then(() => {
@@ -49,7 +49,7 @@ class Connector extends OmniConnector<NearWallet> {
     if (!wallet) throw new Error("Wallet not found");
     const [account] = await wallet.getAccounts();
     if (!account) throw new Error("No account found");
-    return this.setWallet(new NearWallet(this, account.accountId, account.publicKey, wallet));
+    return this.setWallet(new NearWallet(account.accountId, account.publicKey, wallet));
   }
 
   async disconnect() {

package/src/{core/nearRpc.ts → near/rpc.ts}

@@ -1,6 +1,8 @@
 import { JsonRpcProvider } from "@near-js/providers";
 import { getErrorTypeFromErrorMessage, parseRpcError } from "@near-js/utils";
 import { TypedError, FinalExecutionOutcome } from "@near-js/types";
+import { api } from "../core/api";
+import { Network } from "../core";
 
 let _nextId = 123;
 
@@ -22,22 +24,13 @@ const wait = (timeout: number) => {
   return new Promise<void>((resolve) => setTimeout(resolve, timeout));
 };
 
-const c1 = Math.random() > 0.5;
-export const rpcProviders = [
-  c1 ? "https://c1.rpc.fastnear.com" : "https://c2.rpc.fastnear.com",
-  c1 ? "https://c2.rpc.fastnear.com" : "https://c1.rpc.fastnear.com",
-  "https://relmn.aurora.dev",
-  "https://nearrpc.aurora.dev",
-  "https://archival-rpc.mainnet.near.org",
-];
-
 export class NearRpc extends JsonRpcProvider {
   public providers: string[];
   public currentProviderIndex = 0;
   public startTimeout;
 
-  constructor(providers = rpcProviders, private timeout = 30_000, private triesCountForEveryProvider = 3, private incrementTimout = true) {
-    super({ url: "" });
+  constructor(providers = [api.getRpcUrl(Network.Near)], private timeout = 30_000, private triesCountForEveryProvider = 3, private incrementTimout = true) {
+    super({ url: api.getRpcUrl(Network.Near) });
     this.currentProviderIndex = 0;
     this.providers = providers;
     this.startTimeout = timeout;

package/src/near/wallet.ts

@@ -1,30 +1,25 @@
 import { NearWalletBase, SignMessageParams, SignedMessage, SignAndSendTransactionParams } from "@hot-labs/near-connect";
 import { base64, base58 } from "@scure/base";
 
-import { OmniConnector } from "../OmniConnector";
 import { OmniWallet } from "../OmniWallet";
 import { WalletType } from "../core/chains";
 import { ReviewFee } from "../core/bridge";
-import { rpc, TGAS } from "../core/nearRpc";
+import { rpc, TGAS } from "./rpc";
 import { Token } from "../core/token";
 import { Commitment } from "../core";
 
 export default class NearWallet extends OmniWallet {
+  readonly icon = "https://storage.herewallet.app/upload/73a44e583769f11112b0eff1f2dd2a560c05eed5f6d92f0c03484fa047c31668.png";
   readonly type = WalletType.NEAR;
 
-  constructor(readonly connector: OmniConnector, readonly address: string, readonly publicKey?: string, readonly wallet?: NearWalletBase) {
-    super(connector);
+  constructor(readonly address: string, readonly publicKey?: string, readonly wallet?: NearWalletBase) {
+    super();
   }
 
   get omniAddress() {
     return this.address;
   }
 
-  async disconnect() {
-    await this.wallet?.signOut();
-    super.disconnect();
-  }
-
   async fetchBalances(_: number, whitelist: string[]): Promise<Record<string, bigint>> {
     const balances = await Promise.all(
       whitelist.map(async (token) => {

package/src/solana/{protocol.ts → WalletStandard.ts}

@@ -1,7 +1,5 @@
 import type { Connection, Transaction, VersionedTransaction } from "@solana/web3.js";
-import { SolanaSignAndSendTransactionMethod, SolanaSignMessageMethod, SolanaSignTransactionMethod } from "@solana/wallet-standard-features";
 import type { Wallet } from "@wallet-standard/base";
-import { base58 } from "@scure/base";
 
 export interface ISolanaProtocolWallet {
   address: string;
@@ -41,7 +39,7 @@ class SolanaProtocolWallet implements ISolanaProtocolWallet {
   async sendTransaction(transaction: Transaction | VersionedTransaction, connection: Connection, options?: any): Promise<string> {
     const account = await this.getAccount();
     const features = this.wallet.features as any;
-    const signTx = features["solana:signTransaction"]?.signTransaction as SolanaSignTransactionMethod;
+    const signTx = features["solana:signTransaction"]?.signTransaction;
     const [signed] = await signTx({ account, chain: account.chains[0], transaction: transaction.serialize() });
     const signedTx = signed.signedTransaction as Transaction | VersionedTransaction | Uint8Array;
     const raw = signedTx instanceof Uint8Array ? signedTx : (signedTx as any).serialize();
@@ -52,7 +50,7 @@ class SolanaProtocolWallet implements ISolanaProtocolWallet {
   async signMessage(message: string) {
     const account = await this.getAccount();
     const features = this.wallet.features as any;
-    const signMessageFeature = features["solana:signMessage"]?.signMessage as SolanaSignMessageMethod;
+    const signMessageFeature = features["solana:signMessage"]?.signMessage;
 
     if (!signMessageFeature) throw new Error("Wallet does not support solana:signMessage");
     const [result] = await signMessageFeature({ account, message: new TextEncoder().encode(message) });

package/src/solana/connector.ts

@@ -9,8 +9,8 @@ import { OmniWallet } from "../OmniWallet";
 import { WalletType } from "../core/chains";
 import HOT from "../hot-wallet/iframe";
 
-import SolanaProtocolWallet from "./protocol";
-import { getWallets } from "./wallets";
+import SolanaProtocolWallet from "./WalletStandard";
+import { getWallets } from "./walletStandartList";
 import SolanaWallet from "./wallet";
 
 const wallets = getWallets();
@@ -36,7 +36,7 @@ class SolanaConnector extends OmniConnector<SolanaWallet, { wallet: Wallet }> {
         const wallet = this.options.find((w) => w.id === id);
         if (!wallet) return;
         const protocolWallet = await SolanaProtocolWallet.connect(wallet.wallet, { silent: true });
-        this.setWallet(new SolanaWallet(this, protocolWallet));
+        this.setWallet(new SolanaWallet(protocolWallet));
       } catch {
         this.removeStorage();
       }
@@ -59,7 +59,7 @@ class SolanaConnector extends OmniConnector<SolanaWallet, { wallet: Wallet }> {
         const connected = await this.getConnectedWallet();
         if (connected !== wallet.name) return;
         const protocolWallet = await SolanaProtocolWallet.connect(wallet, { silent: true });
-        this.setWallet(new SolanaWallet(this, protocolWallet));
+        this.setWallet(new SolanaWallet(protocolWallet));
       } catch {
         this.removeStorage();
       }
@@ -88,7 +88,7 @@ class SolanaConnector extends OmniConnector<SolanaWallet, { wallet: Wallet }> {
 
     this.setStorage({ type: "walletconnect" });
     return this.setWallet(
-      new SolanaWallet(this, {
+      new SolanaWallet({
         address: account,
         sendTransaction: async (tx: Transaction | VersionedTransaction, connection: Connection, options?: any) => {
           const transaction = Buffer.from(tx.serialize()).toString("base64");
@@ -112,8 +112,9 @@ class SolanaConnector extends OmniConnector<SolanaWallet, { wallet: Wallet }> {
     );
   }
 
-  async createWallet(address: string): Promise<OmniWallet> {
-    return new SolanaWallet(this, { address });
+  async disconnect() {
+    this.wallets.forEach((w) => w.wallet.disconnect?.());
+    super.disconnect();
   }
 
   async getConnectedWallet() {
@@ -142,7 +143,7 @@ class SolanaConnector extends OmniConnector<SolanaWallet, { wallet: Wallet }> {
     try {
       this.setStorage({ type: "wallet", id });
       const protocolWallet = await SolanaProtocolWallet.connect(wallet.wallet, { silent: false });
-      return this.setWallet(new SolanaWallet(this, protocolWallet));
+      return this.setWallet(new SolanaWallet(protocolWallet));
     } catch (e) {
       this.removeStorage();
       throw e;

package/src/solana/injected/solana-wallet.ts

@@ -110,7 +110,7 @@ export class GhostWallet implements Wallet {
     this._connected();
   }
 
-  _on: StandardEventsOnMethod = (event, listener) => {
+  _on: StandardEventsOnMethod = (event: StandardEventsNames, listener: StandardEventsListeners[StandardEventsNames]) => {
     this._listeners[event]?.push(listener) || (this._listeners[event] = [listener]);
     return (): void => this._off(event, listener);
   };
@@ -152,7 +152,7 @@ export class GhostWallet implements Wallet {
     }
   };
 
-  _connect: StandardConnectMethod = async ({ silent } = {}) => {
+  _connect: StandardConnectMethod = async ({ silent }: { silent?: boolean } = {}) => {
     if (!this._account) await this._ghost.connect(silent ? { onlyIfTrusted: true } : undefined);
     this._connected();
     return { accounts: this.accounts };
@@ -162,7 +162,7 @@ export class GhostWallet implements Wallet {
     await this._ghost.disconnect();
   };
 
-  _signAndSendTransaction: SolanaSignAndSendTransactionMethod = async (...inputs) => {
+  _signAndSendTransaction: SolanaSignAndSendTransactionMethod = async (...inputs: any[]) => {
     if (!this._account) throw new Error("not connected");
 
     const outputs: SolanaSignAndSendTransactionOutput[] = [];
@@ -189,7 +189,7 @@ export class GhostWallet implements Wallet {
     return outputs;
   };
 
-  _signTransaction: SolanaSignTransactionMethod = async (...inputs) => {
+  _signTransaction: SolanaSignTransactionMethod = async (...inputs: any[]) => {
     if (!this._account) throw new Error("not connected");
 
     const outputs: SolanaSignTransactionOutput[] = [];
@@ -243,7 +243,7 @@ export class GhostWallet implements Wallet {
     return outputs;
   };
 
-  _signMessage: SolanaSignMessageMethod = async (...inputs) => {
+  _signMessage: SolanaSignMessageMethod = async (...inputs: any[]) => {
     if (!this._account) throw new Error("not connected");
 
     const outputs: SolanaSignMessageOutput[] = [];
@@ -264,7 +264,7 @@ export class GhostWallet implements Wallet {
     return outputs;
   };
 
-  _signIn: SolanaSignInMethod = async (...inputs) => {
+  _signIn: SolanaSignInMethod = async (...inputs: any[]) => {
     const outputs: SolanaSignInOutput[] = [];
 
     if (inputs.length > 1) {

package/src/solana/wallet.ts

@@ -23,13 +23,14 @@ import { ReviewFee } from "../core/bridge";
 import { Commitment } from "../core";
 import { api } from "../core/api";
 
-import { ISolanaProtocolWallet } from "./protocol";
+import { ISolanaProtocolWallet } from "./WalletStandard";
 
 class SolanaWallet extends OmniWallet {
+  readonly icon = "https://storage.herewallet.app/upload/8700f33153ad813e133e5bf9b791b5ecbeea66edca6b8d17aeccb8048eb29ef7.png";
   readonly type = WalletType.SOLANA;
 
-  constructor(readonly connector: OmniConnector, readonly wallet: ISolanaProtocolWallet) {
-    super(connector);
+  constructor(readonly wallet: ISolanaProtocolWallet) {
+    super();
   }
 
   getConnection() {
@@ -63,11 +64,6 @@ class SolanaWallet extends OmniWallet {
     return BigInt(meta.value.amount);
   }
 
-  async disconnect() {
-    await this.wallet.disconnect?.();
-    super.disconnect();
-  }
-
   async buildTranferInstructions(token: Token, amount: bigint, receiver: string, fee: ReviewFee) {
     const destination = new PublicKey(receiver);
     const owner = new PublicKey(this.address);

package/src/stellar/connector.ts

@@ -4,7 +4,6 @@ import HOT from "../hot-wallet/iframe";
 import { WalletType } from "../core/chains";
 import { HotConnector } from "../HotConnector";
 import { ConnectorType, OmniConnector } from "../OmniConnector";
-import { OmniWallet } from "../OmniWallet";
 
 import { FreighterModule } from "./freigher";
 import { HotWalletModule } from "./hotWallet";
@@ -45,10 +44,6 @@ class StellarConnector extends OmniConnector<StellarWallet> {
     return Object.values(this.modules).find((module) => module.productId === id) || null;
   }
 
-  async createWallet(address: string): Promise<OmniWallet> {
-    return new StellarWallet(this, { address });
-  }
-
   async getConnectedWallet() {
     if (HOT.isInjected) {
       const { address } = await this.modules.hotWallet.getAddress();
@@ -61,7 +56,7 @@ class StellarConnector extends OmniConnector<StellarWallet> {
   async selectWallet(address: string, wallet: HotWalletModule | FreighterModule) {
     const signMessage = async (message: string) => wallet.signMessage(message);
     const signTransaction = async (transaction: Transaction) => wallet.signTransaction(transaction.toXDR());
-    return this.setWallet(new StellarWallet(this, { address, signMessage, signTransaction }));
+    return this.setWallet(new StellarWallet({ address, rpc: this.wibe3.hotBridge.stellar, signMessage, signTransaction }));
   }
 
   async connect(id: string) {

package/src/stellar/wallet.ts

@@ -4,7 +4,6 @@ import { rpc } from "@stellar/stellar-sdk";
 
 import { WalletType } from "../core/chains";
 import { OmniWallet } from "../OmniWallet";
-import { OmniConnector } from "../OmniConnector";
 import { ReviewFee } from "../core/bridge";
 import { formatter } from "../core/utils";
 import { Network } from "../core/chains";
@@ -12,9 +11,13 @@ import { Token } from "../core/token";
 import { Commitment } from "../core";
 
 interface ProtocolWallet {
+  address: string;
   signTransaction?: (transaction: Transaction) => Promise<{ signedTxXdr: string }>;
   signMessage?: (message: string) => Promise<{ signedMessage: string }>;
-  address: string;
+  rpc: {
+    callSoroban: (callback: (s: any) => Promise<any>) => Promise<any>;
+    callHorizon: (callback: (h: any) => Promise<any>) => Promise<any>;
+  };
 }
 
 export const ACCOUNT_FOR_SIMULATE = "GAAZI4TCR3TY5OJHCTJC2A4QSY6CJWJH5IAJTGKIN2ER7LBNVKOCCWN7";
@@ -28,14 +31,11 @@ export enum ASSET_CONTRACT_METHOD {
 }
 
 class StellarWallet extends OmniWallet {
+  readonly icon = "https://storage.herewallet.app/upload/1469894e53ca248ac6adceb2194e6950a13a52d972beb378a20bce7815ba01a4.png";
   readonly type = WalletType.STELLAR;
 
-  constructor(readonly connector: OmniConnector, readonly wallet: ProtocolWallet) {
-    super(connector);
-  }
-
-  get rpc() {
-    return this.connector.wibe3.hotBridge.stellar;
+  constructor(readonly wallet: ProtocolWallet) {
+    super();
   }
 
   get address() {
@@ -86,8 +86,8 @@ class StellarWallet extends OmniWallet {
     const asset = await this.getAssetFromContractId(token);
     const sendAmount = formatter.formatAmount(amount, 7);
 
-    const account = await this.connector.wibe3.hotBridge.stellar.callSoroban((s) => s.getAccount(this.address));
-    const baseFee = await this.connector.wibe3.hotBridge.stellar.callHorizon((h) => h.fetchBaseFee()).catch(() => +BASE_FEE);
+    const account = await this.wallet.rpc.callSoroban((s) => s.getAccount(this.address));
+    const baseFee = await this.wallet.rpc.callHorizon((h) => h.fetchBaseFee()).catch(() => +BASE_FEE);
     const builder = new TransactionBuilder(account, {
       memo: memo ? Memo.text(memo) : undefined,
       networkPassphrase: Networks.PUBLIC,
@@ -106,13 +106,13 @@ class StellarWallet extends OmniWallet {
         )
       );
 
-      const tx = await this.rpc.callSoroban((s) => s.prepareTransaction(builder.build() as any));
+      const tx = await this.wallet.rpc.callSoroban((s) => s.prepareTransaction(builder.build() as any));
       const fee = BigInt(Math.floor(baseFee * tx.operations.length));
       return { fee: new ReviewFee({ baseFee: fee, priorityFee: 0n, gasLimit: 1n, chain: Network.Stellar }), tx: tx as unknown as Transaction };
     }
 
     let needXlm = 0;
-    const receiverAccount = await this.rpc.callHorizon((h) => h.loadAccount(receiver)).catch(() => null);
+    const receiverAccount = await this.wallet.rpc.callHorizon((h) => h.loadAccount(receiver)).catch(() => null);
     const claimableBalance = Operation.createClaimableBalance({ amount: amount.toString(), claimants: [new Claimant(receiver)], asset });
 
     if (receiverAccount == null) {
@@ -154,7 +154,7 @@ class StellarWallet extends OmniWallet {
     if (!this.wallet.signTransaction) throw "not impl";
     const result = await this.wallet.signTransaction(transaction);
     const txObject = new Transaction(result.signedTxXdr, Networks.PUBLIC);
-    const { hash } = await this.rpc.callHorizon((t) => t.submitTransaction(txObject as any));
+    const { hash } = await this.wallet.rpc.callHorizon((t) => t.submitTransaction(txObject as any));
     return hash;
   }
 
@@ -197,7 +197,7 @@ class StellarWallet extends OmniWallet {
   async changeTrustline(address: string) {
     if (address === "native") return;
     const asset = await this.getAssetFromContractId(address);
-    const account = await this.rpc.callHorizon((h) => h.loadAccount(this.address));
+    const account = await this.wallet.rpc.callHorizon((h) => h.loadAccount(this.address));
     const trustlineOp = Operation.changeTrust({ asset: asset, source: this.address });
     const trustlineTx = new TransactionBuilder(account, { fee: BASE_FEE, networkPassphrase: Networks.PUBLIC }) //
       .addOperation(trustlineOp)
@@ -215,7 +215,7 @@ class StellarWallet extends OmniWallet {
     }
 
     const tx = await this.buildSmartContactTx(ACCOUNT_FOR_SIMULATE, id, ASSET_CONTRACT_METHOD.NAME);
-    const result = (await this.rpc.callSoroban((s) => s.simulateTransaction(tx as any))) as unknown as rpc.Api.SimulateTransactionSuccessResponse;
+    const result = (await this.wallet.rpc.callSoroban((s) => s.simulateTransaction(tx as any))) as unknown as rpc.Api.SimulateTransactionSuccessResponse;
 
     const value = result?.result?.retval?.value();
     if (!value) throw "Asset not found";
@@ -227,7 +227,7 @@ class StellarWallet extends OmniWallet {
   }
 
   async buildSmartContactTx(publicKey: string, contactId: string, method: string, ...args: any[]) {
-    const account = await this.rpc.callSoroban((s) => s.getAccount(publicKey));
+    const account = await this.wallet.rpc.callSoroban((s) => s.getAccount(publicKey));
     const contract = new Contract(contactId);
     const builtTx = new TransactionBuilder(account, { fee: BASE_FEE, networkPassphrase: Networks.PUBLIC });
 
@@ -244,7 +244,7 @@ class StellarWallet extends OmniWallet {
       Address.fromString(contract).toScVal()
     );
 
-    const result = (await this.rpc.callSoroban((s) => s.simulateTransaction(tx as any))) as unknown as rpc.Api.SimulateTransactionSuccessResponse;
+    const result = (await this.wallet.rpc.callSoroban((s) => s.simulateTransaction(tx as any))) as unknown as rpc.Api.SimulateTransactionSuccessResponse;
     if (result) return BigInt(this.i128ToInt(result.result?.retval.value() as xdr.Int128Parts));
     return 0n;
   }

package/src/ton/connector.ts

@@ -69,7 +69,7 @@ class TonConnector extends OmniConnector<TonWallet> {
     tonConnect.onStatusChange(async (wallet) => {
       if (!wallet) return this.removeWallet();
       this.setWallet(
-        new TonWallet(this, {
+        new TonWallet({
           sendTransaction: (params) => tonConnect.sendTransaction(params),
           signData: (params) => tonConnect.signData(params),
           account: wallet.account,
@@ -108,10 +108,6 @@ class TonConnector extends OmniConnector<TonWallet> {
     return tonConnect;
   }
 
-  async createWallet(address: string) {
-    return new TonWallet(this, { account: { address } });
-  }
-
   async connect(id: string) {
     const connector = await this.tonConnect;
     connector.openSingleWalletModal(id);

package/src/ton/wallet.ts

@@ -6,7 +6,6 @@ import { base58, base64, hex } from "@scure/base";
 
 import { OmniWallet } from "../OmniWallet";
 import { WalletType } from "../core/chains";
-import { OmniConnector } from "../OmniConnector";
 import { ReviewFee } from "../core/bridge";
 import { Token } from "../core/token";
 
@@ -19,10 +18,11 @@ interface ProtocolWallet {
 }
 
 class TonWallet extends OmniWallet {
+  readonly icon = "https://storage.herewallet.app/upload/3ffa61e237f8e38d390abd60200db8edff3ec2b20aad0cc0a8c7a8ba9c318124.png";
   readonly type = WalletType.TON;
 
-  constructor(readonly connector: OmniConnector, readonly wallet: ProtocolWallet) {
-    super(connector);
+  constructor(readonly wallet: ProtocolWallet) {
+    super();
   }
 
   get address() {

package/src/tron/connector.ts

@@ -0,0 +1,89 @@
+import { WalletType } from "../core/chains";
+import { ConnectorType, OmniConnector } from "../OmniConnector";
+import { HotConnector } from "../HotConnector";
+import TronWallet from "./wallet";
+
+declare global {
+  interface Window {
+    tronLink?: {
+      ready?: boolean;
+      request?: (args: { method: string; params?: any }) => Promise<any>;
+      tronWeb?: {
+        defaultAddress?: { base58?: string; hex?: string };
+        address?: { toHex?: (address: string) => string };
+        contract?: () => { at: (address: string) => Promise<any> };
+        trx?: {
+          getBalance?: (address: string) => Promise<number | string>;
+          sendTransaction?: (to: string, amount: number | string) => Promise<any>;
+          signMessageV2?: (message: string) => Promise<string>;
+          signMessage?: (message: string) => Promise<string>;
+        };
+      };
+    };
+  }
+}
+
+const TRONLINK = {
+  id: "tronlink",
+  name: "Tron Link",
+  type: window?.tronLink ? ("extension" as const) : ("external" as const),
+  icon: "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tron/info/logo.png",
+  download: "https://www.tronlink.org/",
+};
+
+class TronConnector extends OmniConnector<TronWallet> {
+  type = ConnectorType.WALLET;
+  walletTypes = [WalletType.Tron, WalletType.OMNI];
+  icon = "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tron/info/logo.png";
+  name = "TRON Wallet";
+  options = [TRONLINK];
+  id = "tron";
+
+  constructor(wibe3: HotConnector) {
+    super(wibe3);
+
+    this.syncFromProvider().catch(() => this.removeStorage());
+    window.addEventListener("message", () => {
+      this.syncFromProvider().catch(() => {});
+    });
+  }
+
+  private async syncFromProvider() {
+    const stored = (await this.getStorage().catch(() => ({} as any))) as { type?: string; id?: string; address?: string };
+    if (stored.type !== "wallet" || stored.id !== TRONLINK.id) return;
+
+    const tronWeb = window?.tronLink?.tronWeb;
+    const address = tronWeb?.defaultAddress?.base58;
+    if (!window?.tronLink?.ready || !address) return;
+
+    const current = this.wallets[0]?.address;
+    if (current === address) return;
+
+    if (this.wallets.length > 0) this.removeWallet();
+    await this.setStorage({ type: "wallet", id: TRONLINK.id, address });
+    this.setWallet(new TronWallet(this, address, tronWeb as any));
+  }
+
+  async connect(id: string = TRONLINK.id) {
+    if (id !== TRONLINK.id) throw new Error("Wallet not found");
+
+    try {
+      if (this.wallets.length > 0) this.removeWallet();
+
+      const res = await window?.tronLink?.request?.({ method: "tron_requestAccounts" });
+      if (res?.code !== 200) throw new Error("Failed to connect to TronLink");
+      if (!window?.tronLink?.tronWeb) throw new Error("TronLink not found");
+
+      const address = window?.tronLink?.tronWeb?.defaultAddress?.base58;
+      if (!address) throw new Error("No account found");
+
+      await this.setStorage({ type: "wallet", id: TRONLINK.id, address });
+      return this.setWallet(new TronWallet(this, address, window.tronLink.tronWeb));
+    } catch (e) {
+      await this.removeStorage();
+      throw e;
+    }
+  }
+}
+
+export default TronConnector;