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

package/build/ui/router.js.map

@@ -1 +1 @@
-{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/ui/router.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/ui/router.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hot-labs/kit",
-  "version": "1.0.57",
+  "version": "1.1.0-beta.1",
   "description": "HOT Labs Kit is chain agnostic connector with omni payments",
   "license": "ISC",
   "author": "",
@@ -17,6 +17,7 @@
     "./solana": "./build/solana/index.js",
     "./stellar": "./build/stellar/index.js",
     "./ton": "./build/ton/index.js",
+    "./tron": "./build/tron/index.js",
     "./core": "./build/core/index.js"
   },
   "directories": {
@@ -31,28 +32,31 @@
     "@cosmjs/stargate": "^0.37.0",
     "@defuse-protocol/one-click-sdk-typescript": "^0.1.13",
     "@hot-labs/near-connect": "^0.8.1",
-    "@hot-labs/omni-sdk": "^2.24.5",
+    "@hot-labs/omni-sdk": "^2.24.6",
     "@keplr-wallet/proto-types": "^0.12.291",
     "@keplr-wallet/provider-extension": "^0.12.291",
-    "@metamask/sdk": "^0.34.0",
+    "@lottiefiles/dotlottie-wc": "^0.8.11",
     "@near-js/crypto": "^2.3.3",
     "@near-js/providers": "^2.5.1",
     "@near-js/utils": "^2.2.4",
     "@noble/hashes": "^2.0.1",
     "@scure/base": "^2.0.0",
     "@solana/spl-token": "^0.4.14",
+    "@solana/wallet-standard-features": "^1.3.0",
     "@stellar/freighter-api": "^6.0.1",
     "@ton-api/client": "^0.4.0",
     "@ton/core": "^0.62.0",
     "@ton/crypto": "^3.3.0",
     "@tonconnect/ui": "^2.2.0",
     "@wallet-standard/base": "^1.1.0",
+    "@wallet-standard/features": "^1.1.0",
     "@walletconnect/universal-provider": "^2.23.0",
     "ethers": "^6.15.0",
     "mobx": "^6.15.0",
     "mobx-react-lite": "^4.1.1",
     "qr-code-styling": "^1.9.2",
-    "styled-components": "^6.1.19"
+    "styled-components": "^6.1.19",
+    "uuid4": "^2.0.3"
   },
   "scripts": {
     "build": "rm -rf build && yarn tsc",

package/src/HotConnector.ts

@@ -8,10 +8,11 @@ import { OmniToken } from "./core/chains";
 import { formatter } from "./core/utils";
 import { Intents } from "./core/Intents";
 import { tokens } from "./core/tokens";
-import { rpc } from "./core/nearRpc";
+import { rpc } from "./near/rpc";
 import { Token } from "./core/token";
 import { api } from "./core/api";
 
+import { defaultConnectors } from "./defaults";
 import type CosmosWallet from "./cosmos/wallet";
 import type NearWallet from "./near/wallet";
 import type EvmWallet from "./evm/wallet";
@@ -19,7 +20,7 @@ import type SolanaWallet from "./solana/wallet";
 import type StellarWallet from "./stellar/wallet";
 import type TonWallet from "./ton/wallet";
 
-import { openBridge, openConnector, openPayment, openProfile, openWalletPicker } from "./ui/router";
+import { openBridge, openConnector, openProfile, openWalletPicker } from "./ui/router";
 import { ConnectorType, OmniConnector } from "./OmniConnector";
 import { OmniWallet } from "./OmniWallet";
 import { Exchange } from "./exchange";
@@ -49,8 +50,8 @@ export class HotConnector {
   public exchange: Exchange;
 
   private events = new EventEmitter<{
-    connect: { wallet: OmniWallet };
-    disconnect: { wallet: OmniWallet };
+    connect: { wallet: OmniWallet; connector: OmniConnector };
+    disconnect: { wallet: OmniWallet; connector: OmniConnector };
     tokensUpdate: { tokens: Token[] };
   }>();
 
@@ -87,7 +88,8 @@ export class HotConnector {
     this.activity = new Activity(this);
 
     const connectors: OmniConnector[] = [];
-    const tasks = options?.connectors?.map(async (initConnector, index) => {
+    const configConnectors = options?.connectors || defaultConnectors;
+    const tasks = configConnectors.map(async (initConnector, index) => {
       const connector = await initConnector(this);
       connector.onConnect((payload) => this.events.emit("connect", payload));
       connector.onDisconnect((payload) => this.events.emit("disconnect", payload));
@@ -294,36 +296,16 @@ export class HotConnector {
     });
   }
 
-  async requestToken(token: OmniToken, amount: bigint | number): Promise<{ wallet: OmniWallet; token: Token; amount: bigint }> {
-    if (!token) throw new Error("Token not found");
-
-    const tokensList = await tokens.getTokens();
-    const ftToken = tokensList.find((t) => t.address === token)!;
-    const amountInt = typeof amount === "number" ? ftToken.int(amount) : amount;
-    const [existed] = this.walletsTokens.filter((t) => t.token.id === ftToken.id);
-
-    if (existed?.balance >= amountInt) return { token: ftToken, wallet: existed.wallet, amount: amountInt };
-
-    const needed = amountInt - (existed?.balance ?? 0n);
-    const result = await openPayment(this, ftToken, needed, Recipient.fromWallet(existed?.wallet));
-
-    const recipientWallet = this.wallets.find((w) => w.address === result.recipient.address);
-    if (!recipientWallet) throw new Error("Recipient not found");
-    const exist = await this.fetchToken(ftToken, recipientWallet);
-
-    return {
-      token: result.to,
-      wallet: recipientWallet,
-      amount: formatter.bigIntMin(exist, amountInt),
-    };
+  intentsBuilder(wallet?: OmniWallet) {
+    return new Intents(this).attachWallet(wallet);
   }
 
-  onConnect(handler: (payload: { wallet: OmniWallet }) => void) {
+  onConnect(handler: (payload: { wallet: OmniWallet; connector: OmniConnector }) => void) {
     this.events.on("connect", handler);
     return () => this.events.off("connect", handler);
   }
 
-  onDisconnect(handler: (payload: { wallet: OmniWallet }) => void) {
+  onDisconnect(handler: (payload: { wallet: OmniWallet; connector: OmniConnector }) => void) {
     this.events.on("disconnect", handler);
     return () => this.events.off("disconnect", handler);
   }
@@ -384,4 +366,14 @@ export class HotConnector {
     if (!connector) throw new Error("Connector not found");
     return openWalletPicker(connector);
   }
+
+  async disconnect(wallet: WalletType | OmniWallet) {
+    const connector = this.connectors.find((t) => {
+      if (wallet instanceof OmniWallet) return t.wallets.includes(wallet);
+      return t.walletTypes.includes(wallet);
+    });
+
+    if (!connector) throw new Error("Connector not found");
+    await connector.disconnect();
+  }
 }

package/src/OmniConnector.ts

@@ -30,8 +30,8 @@ export abstract class OmniConnector<T extends OmniWallet = OmniWallet, O = {}> {
 
   private storage = new LocalStorage();
   protected events = new EventEmitter<{
-    connect: { wallet: T };
-    disconnect: { wallet: T };
+    connect: { wallet: T; connector: OmniConnector<T, O> };
+    disconnect: { wallet: T; connector: OmniConnector<T, O> };
   }>();
 
   protected wc: Promise<UniversalProvider> | null = null;
@@ -101,14 +101,14 @@ export abstract class OmniConnector<T extends OmniWallet = OmniWallet, O = {}> {
 
   protected setWallet(wallet: T) {
     runInAction(() => this.wallets.push(wallet));
-    this.events.emit("connect", { wallet });
+    this.events.emit("connect", { wallet, connector: this });
     return wallet;
   }
 
   protected removeWallet() {
     runInAction(() => {
       const wallet = this.wallets.pop();
-      if (wallet) this.events.emit("disconnect", { wallet });
+      if (wallet) this.events.emit("disconnect", { wallet, connector: this });
     });
   }
 
@@ -116,7 +116,7 @@ export abstract class OmniConnector<T extends OmniWallet = OmniWallet, O = {}> {
     runInAction(() => {
       const wallets = this.wallets;
       this.wallets = [];
-      wallets.forEach((wallet) => this.events.emit("disconnect", { wallet }));
+      wallets.forEach((wallet) => this.events.emit("disconnect", { wallet, connector: this }));
     });
   }
 
@@ -130,7 +130,7 @@ export abstract class OmniConnector<T extends OmniWallet = OmniWallet, O = {}> {
 
   async getStorage(): Promise<{ type?: string; id?: string; address?: string; publicKey?: string }> {
     const data = await this.storage.get(`wibe3:${this.id}`);
-    if (!data) throw new Error("No storage found");
+    if (!data) return {};
     return JSON.parse(data);
   }
 
@@ -138,19 +138,19 @@ export abstract class OmniConnector<T extends OmniWallet = OmniWallet, O = {}> {
     this.events.removeAllListeners();
   }
 
-  onConnect(handler: (payload: { wallet: T }) => void) {
+  onConnect(handler: (payload: { wallet: T; connector: OmniConnector<T, O> }) => void) {
     this.events.on("connect", handler);
     return () => this.events.off("connect", handler);
   }
 
-  onDisconnect(handler: (payload: { wallet: T }) => void) {
+  onDisconnect(handler: (payload: { wallet: T; connector: OmniConnector<T, O> }) => void) {
     this.events.on("disconnect", handler);
     return () => this.events.off("disconnect", handler);
   }
 
   async disconnect() {
     this.disconnectWalletConnect();
+    this.removeAllWallets();
     this.removeStorage();
-    this.removeWallet();
   }
 }

package/src/OmniWallet.ts

@@ -1,9 +1,7 @@
-import { sha256 } from "@noble/hashes/sha2.js";
 import { hex } from "@scure/base";
 
 import { openAuthPopup } from "./ui/connect/AuthPopup";
-import { OmniToken, WalletType } from "./core/chains";
-import { OmniConnector } from "./OmniConnector";
+import { WalletType } from "./core/chains";
 import { Intents } from "./core/Intents";
 import { ReviewFee } from "./core/bridge";
 import { Token } from "./core/token";
@@ -11,38 +9,44 @@ import { Commitment } from "./core";
 import { api } from "./core/api";
 
 export abstract class OmniWallet {
-  constructor(readonly connector: OmniConnector) {}
-
   abstract address: string;
   abstract publicKey?: string;
   abstract omniAddress: string;
   abstract type: WalletType;
+  abstract icon: string;
 
-  async disconnect() {
-    if (!this.connector) throw new Error("Connector not implemented");
-    await this.connector.disconnect();
+  async depositNfts(nftIds: string[], receiver: string) {
+    // TODO
   }
 
-  abstract transferFee(token: Token, receiver: string, amount: bigint): Promise<ReviewFee>;
-  abstract transfer(args: { token: Token; receiver: string; amount: bigint; comment?: string; gasFee?: ReviewFee }): Promise<string>;
-  abstract signIntents(intents: Record<string, any>[], options?: { nonce?: Uint8Array; deadline?: number }): Promise<Commitment>;
+  async withdrawNfts(nftIds: string[], receiver: string) {
+    // TODO
+  }
 
-  abstract fetchBalance(chain: number, address: string): Promise<bigint>;
-  abstract fetchBalances(chain?: number, whitelist?: string[]): Promise<Record<string, bigint>>;
+  async getDepositNftsFee(nfts: string[]) {
+    return new ReviewFee({ chain: -4 });
+  }
 
-  async executeIntents(intents: Record<string, any>[], hashes: string[] = []) {
-    const signed = await this.signIntents(intents);
-    return await Intents.publishSignedIntents([signed], hashes);
+  async transferNft(nftId: string, receiver: string) {
+    // TODO
   }
 
-  get icon() {
-    return this.connector?.icon;
+  async getTranferNftFee(nftId: string, receiver: string) {
+    return new ReviewFee({ chain: -4 });
   }
 
-  get intents() {
-    return new Intents(this.connector.wibe3).attachWallet(this);
+  async getNfts(onLoad: (nfts: string[]) => void) {
+    // TODO
   }
 
+  abstract transferFee(token: Token, receiver: string, amount: bigint): Promise<ReviewFee>;
+  abstract transfer(args: { token: Token; receiver: string; amount: bigint; comment?: string; gasFee?: ReviewFee }): Promise<string>;
+
+  abstract fetchBalance(chain: number, address: string): Promise<bigint>;
+  abstract fetchBalances(chain?: number, whitelist?: string[]): Promise<Record<string, bigint>>;
+
+  abstract signIntents(intents: Record<string, any>[], options?: { nonce?: Uint8Array; deadline?: number }): Promise<Commitment>;
+
   async auth(intents?: Record<string, any>[]): Promise<string> {
     return openAuthPopup(this, async () => {
       const seed = hex.encode(new Uint8Array(window.crypto.getRandomValues(new Uint8Array(32))));
@@ -53,11 +57,6 @@ export abstract class OmniWallet {
     });
   }
 
-  async pay({ token, amount, recipient, paymentId }: { token: OmniToken; amount: number; recipient: string; paymentId: string }) {
-    const nonce = new Uint8Array(sha256(new TextEncoder().encode(paymentId))).slice(0, 32);
-    return this.intents.attachNonce(nonce).transfer({ recipient, token, amount }).execute();
-  }
-
   async waitUntilBalance(need: Record<string, bigint>, receiver: string, attempts = 0) {
     if (attempts > 120) throw "Balance is not enough";
     const assets = Object.keys(need) as string[];