@hot-labs/kit 1.5.3 → 1.6.0

package/.github/workflows/release.yml

@@ -57,7 +57,7 @@ jobs:
         id: zip
         shell: bash
         run: |
-          ZIP_NAME="wibe3-${{ steps.pkg.outputs.version }}.zip"
+          ZIP_NAME="kit-${{ steps.pkg.outputs.version }}.zip"
           git archive -o "$ZIP_NAME" HEAD .
           echo "zip=$ZIP_NAME" >> $GITHUB_OUTPUT
 

package/README.md

@@ -18,7 +18,7 @@ Also supported: Passkey accounts and Google Auth via HOT MPC Network
 
 ## Installation: Setup Vite Node polyfills and React plugins
 
-Wibe3 require you to install node polyfills and react to work, for vite you need to complete the following extra steps:
+kit require you to install node polyfills and react to work, for vite you need to complete the following extra steps:
 
 `npm install vite-plugin-node-polyfills @vitejs/plugin-react`
 
@@ -37,10 +37,10 @@ export default defineConfig({
 ## Getting started
 
 ```ts
-import { HotConnector } from "@hot-labs/kit";
+import { HotKit } from "@hot-labs/kit";
 import { defaultConnectors } from "@hot-labs/kit/defaults";
 
-const connector = new HotConnector({
+const kit = new HotKit({
   connectors: defaultConnectors,
   apiKey: "Get on https://pay.hot-labs.org/admin/api-keys for free",
 
@@ -56,8 +56,8 @@ const connector = new HotConnector({
   },
 });
 
-connector.onConnect(({ wallet }) => {});
-connector.onDisconnect(({ wallet }) => {});
+kit.onConnect(({ wallet }) => {});
+kit.onDisconnect(({ wallet }) => {});
 ```
 
 ## Server side usage

package/build/HotBridgeWithdrawal.d.ts

@@ -0,0 +1,10 @@
+import { WithdrawArgsWithPending } from "@hot-labs/omni-sdk";
+import type { HotKit } from "./HotKit";
+import { ActivityController } from "./core/pendings";
+export declare class HotBridgeWithdrawal extends ActivityController {
+    readonly args: WithdrawArgsWithPending;
+    readonly kit: HotKit;
+    actionText: string;
+    constructor(args: WithdrawArgsWithPending, kit: HotKit);
+    action(): Promise<void>;
+}

package/build/HotBridgeWithdrawal.js

@@ -0,0 +1,80 @@
+import { runInAction } from "mobx";
+import { hex } from "@scure/base";
+import { chains, Network, WalletType } from "./core/chains";
+import { ActivityController } from "./core/pendings";
+import { tokens } from "./core/tokens";
+export class HotBridgeWithdrawal extends ActivityController {
+    args;
+    kit;
+    actionText = "Withdraw";
+    constructor(args, kit) {
+        super();
+        this.args = args;
+        this.kit = kit;
+        this.preview = tokens.get(this.args.token, this.args.chain);
+        this.title = `${this.preview.float(this.args.amount)} ${this.preview.symbol}`;
+        this.subtitle = new Date(this.args.timestamp).toLocaleString();
+    }
+    async action() {
+        try {
+            if (this.status === "pending")
+                return;
+            runInAction(() => (this.status = "pending"));
+            if (this.args.chain === Network.Stellar) {
+                if (!this.kit.stellar)
+                    throw new Error("Stellar wallet not connected");
+                await this.kit.exchange.bridge.stellar.withdraw({
+                    sendTransaction: (tx) => this.kit.stellar.sendTransaction(tx),
+                    sender: this.kit.stellar.address,
+                    ...this.args,
+                });
+            }
+            if (this.args.chain === Network.Solana) {
+                if (!this.kit.solana)
+                    throw new Error("Solana wallet not connected");
+                const solana = await this.kit.exchange.bridge.solana();
+                await solana.withdraw({
+                    sendTransaction: (tx) => this.kit.solana.sendTransaction(tx),
+                    sender: this.kit.solana.address,
+                    ...this.args,
+                });
+            }
+            if (this.args.chain === Network.Ton || this.args.chain === Network.OmniTon) {
+                if (!this.kit.ton)
+                    throw new Error("Ton wallet not connected");
+                await this.kit.exchange.bridge.ton.withdraw({
+                    sendTransaction: (tx) => this.kit.ton.sendTransaction(tx),
+                    refundAddress: this.kit.ton.address,
+                    ...this.args,
+                });
+            }
+            if (chains.get(this.args.chain).type === WalletType.EVM) {
+                if (!this.kit.evm)
+                    throw new Error("EVM wallet not connected");
+                await this.kit.exchange.bridge.evm.withdraw({
+                    sendTransaction: (tx) => this.kit.evm.sendTransaction(tx),
+                    ...this.args,
+                });
+            }
+            if (this.args.chain === Network.Gonka) {
+                if (!this.kit.cosmos)
+                    throw new Error("Gonka wallet not connected");
+                const cosmos = await this.kit.exchange.bridge.cosmos();
+                await cosmos.withdraw({
+                    sendTransaction: (tx) => this.kit.cosmos.sendTransaction(tx),
+                    senderPublicKey: hex.decode(this.kit.cosmos.publicKey),
+                    sender: this.kit.cosmos.address,
+                    ...this.args,
+                });
+            }
+            await this.kit.exchange.bridge.clearPendingWithdrawals([this.args]).catch(() => { });
+        }
+        finally {
+            runInAction(() => (this.status = "success"));
+            const wallet = this.kit.wallets.find((w) => w.type === chains.get(this.args.chain).type);
+            if (wallet)
+                this.kit.activity.fetchPendingWithdrawalsByChain(this.args.chain, wallet);
+        }
+    }
+}
+//# sourceMappingURL=HotBridgeWithdrawal.js.map

package/build/HotBridgeWithdrawal.js.map

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

package/build/{HotConnector.d.ts → HotKit.d.ts}

@@ -12,14 +12,16 @@ import type SolanaWallet from "./solana/wallet";
 import type StellarWallet from "./stellar/wallet";
 import type TonWallet from "./ton/wallet";
 import type TronWallet from "./tron/wallet";
-import { OmniConnector } from "./core/OmniConnector";
+import * as Router from "./ui/router";
+import { ToastManager } from "./ui/toast";
 import { DataStorage } from "./storage";
+import { OmniConnector } from "./core/OmniConnector";
 import { Activity } from "./activity";
-interface HotConnectorOptions {
+interface HotKitOptions {
     apiKey: string;
     storage?: DataStorage;
     chains?: Record<number, ChainConfig>;
-    connectors?: (((wibe3: HotConnector) => Promise<OmniConnector>) | null | undefined)[];
+    connectors?: (((kit: HotKit) => Promise<OmniConnector>) | null | undefined)[];
     walletConnect?: {
         projectId?: string;
         metadata?: {
@@ -30,11 +32,13 @@ interface HotConnectorOptions {
         };
     };
 }
-export declare class HotConnector {
+export declare class HotKit {
     storage: DataStorage;
     connectors: OmniConnector[];
     telemetry: Telemetry;
     exchange: Exchange;
+    toast: ToastManager;
+    router: typeof Router;
     activity: Activity;
     version: string;
     private events;
@@ -48,7 +52,7 @@ export declare class HotConnector {
             icons: string[];
         };
     };
-    constructor(options?: HotConnectorOptions);
+    constructor(options?: HotKitOptions);
     setOmniChainBranding(branding: {
         name: string;
         icon: string;

package/build/{HotConnector.js → HotKit.js}

@@ -11,15 +11,18 @@ import { tokens } from "./core/tokens";
 import { api } from "./core/api";
 import { rpc } from "./near/rpc";
 import { defaultConnectors } from "./defaults";
-import { openBridge, openConnector, openProfile, openWalletPicker } from "./ui/router";
-import { ConnectorType } from "./core/OmniConnector";
+import * as Router from "./ui/router";
+import { ToastManager } from "./ui/toast";
 import { LocalStorage } from "./storage";
+import { ConnectorType } from "./core/OmniConnector";
 import { Activity } from "./activity";
-export class HotConnector {
+export class HotKit {
     storage;
     connectors = [];
     telemetry;
     exchange;
+    toast = new ToastManager();
+    router = Router;
     activity;
     version = packageJson.version;
     events = new EventEmitter();
@@ -44,7 +47,7 @@ export class HotConnector {
         this.storage = options?.storage ?? new LocalStorage();
         this.telemetry = new Telemetry(this);
         this.activity = new Activity(this);
-        this.exchange = new Exchange();
+        this.exchange = new Exchange(this);
         const connectors = [];
         const configConnectors = options?.connectors || defaultConnectors;
         const tasks = configConnectors.map(async (initConnector, index) => {
@@ -245,7 +248,7 @@ export class HotConnector {
                 const bBalance = omniToken.float(this.balance(b, omniToken));
                 return bBalance - aBalance;
             })[0];
-        return openBridge(this, {
+        return this.router.openBridge(this, {
             mobileFullscreen: true,
             recipient: recipient,
             to: originalToken,
@@ -260,7 +263,7 @@ export class HotConnector {
         const orig = tokensList.find((t) => t.chain === omni.originalChain && t.address === omni.originalAddress);
         const sender = this.wallets.find((t) => t.type === orig.type);
         const recipient = Recipient.fromWallet(this.wallets.find((w) => !!w.omniAddress));
-        return openBridge(this, {
+        return this.router.openBridge(this, {
             mobileFullscreen: true,
             sender: sender,
             type: "exactOut",
@@ -272,18 +275,18 @@ export class HotConnector {
         });
     }
     async openBridge() {
-        await openBridge(this);
+        await this.router.openBridge(this);
     }
     async openProfile() {
-        openProfile(this);
+        this.router.openProfile(this);
     }
     async connect(type) {
         if (!type)
-            return await openConnector(this);
+            return await this.router.openConnector(this);
         const connector = this.connectors.find((t) => t.type === ConnectorType.WALLET && t.walletTypes.includes(type));
         if (!connector)
             throw new Error("Connector not found");
-        return await openWalletPicker(connector);
+        return await this.router.openWalletPicker(connector);
     }
     async disconnect(wallet) {
         const connector = this.connectors.find((t) => {
@@ -296,4 +299,4 @@ export class HotConnector {
         await connector.disconnect();
     }
 }
-//# sourceMappingURL=HotConnector.js.map
+//# sourceMappingURL=HotKit.js.map

package/build/HotKit.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"HotKit.js","sourceRoot":"","sources":["../src/HotKit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAEhD,OAAO,WAAW,MAAM,iBAAiB,CAAC;AAE1C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAe,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAS/C,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,OAAO,EAAe,YAAY,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,EAAE,aAAa,EAAiB,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAkBtC,MAAM,OAAO,MAAM;IACV,OAAO,CAAc;IACrB,UAAU,GAAoB,EAAE,CAAC;IACjC,SAAS,CAAY;IACrB,QAAQ,CAAW;IACnB,KAAK,GAAG,IAAI,YAAY,EAAE,CAAC;IAC3B,MAAM,GAAG,MAAM,CAAC;IAEhB,QAAQ,CAAW;IACnB,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC;IAE7B,MAAM,GAAG,IAAI,YAAY,EAI7B,CAAC;IAEE,QAAQ,GAIX,EAAE,SAAS,EAAE,0BAA0B,EAAE,CAAC;IAE9C,YAAY,OAAuB;QACjC,cAAc,CAAC,IAAI,EAAE;YACnB,cAAc,EAAE,QAAQ;YACxB,aAAa,EAAE,QAAQ;YACvB,OAAO,EAAE,QAAQ;YACjB,MAAM,EAAE,QAAQ;YAEhB,IAAI,EAAE,QAAQ;YACd,GAAG,EAAE,QAAQ;YACb,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE,QAAQ;YACjB,GAAG,EAAE,QAAQ;YACb,MAAM,EAAE,QAAQ;SACjB,CAAC,CAAC;QAEH,GAAG,CAAC,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,EAAE,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,SAAS,GAAG,OAAO,EAAE,aAAa,EAAE,SAAS,IAAI,SAAS,CAAC;QACzE,IAAI,CAAC,QAAQ,CAAC,QAAQ,GAAG,OAAO,EAAE,aAAa,EAAE,QAAQ,IAAI,SAAS,CAAC;QACvE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QAEhF,IAAI,CAAC,OAAO,GAAG,OAAO,EAAE,OAAO,IAAI,IAAI,YAAY,EAAE,CAAC;QACtD,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,CAAC,QAAQ,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,QAAQ,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEnC,MAAM,UAAU,GAAoB,EAAE,CAAC;QACvC,MAAM,gBAAgB,GAAG,OAAO,EAAE,UAAU,IAAI,iBAAiB,CAAC;QAClE,MAAM,KAAK,GAAG,gBAAgB,CAAC,GAAG,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE;YAChE,IAAI,CAAC,aAAa;gBAAE,OAAO;YAC3B,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,CAAC;YAC5C,SAAS,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;YAC7E,SAAS,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;YAC9E,SAAS,CAAC,gBAAgB,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC,CAAC;YACtF,UAAU,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;QAChC,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YACjC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC5B,CAAC,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;YACrE,CAAC,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;YACtE,CAAC,CAAC,gBAAgB,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC,CAAC;QAChF,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE;YACzB,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC3C,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,iBAAiB,EAAE,CAAC;IAC7B,CAAC;IAED,oBAAoB,CAAC,QAAwC;QAC3D,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;QAC9C,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAChD,CAAC;IAED,kBAAkB,CAAC,IAAgB;QACjC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,aAAa,CAAC,MAAM,IAAI,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC;IAC9G,CAAC;IAED,IAAI,CAAC,KAAgB;QACnB,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;IAED,IAAI,MAAM;QACR,OAAO,MAAM,CAAC,IAAI,CAAC;IACrB,CAAC;IAED,IAAI,cAAc;QAChB,IAAI,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,CAAC,IAAI,CAAC;QAChC,IAAI,IAAI,CAAC,GAAG;YAAE,OAAO,IAAI,CAAC,GAAG,CAAC;QAC9B,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC;QACpC,IAAI,IAAI,CAAC,GAAG;YAAE,OAAO,IAAI,CAAC,GAAG,CAAC;QAC9B,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC,OAAO,CAAC;QACtC,IAAI,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,CAAC,IAAI,CAAC;IAClC,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,OAAO;aAChB,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAClB,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;QAC/F,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,EAAE,CAAC;aAC/B,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACb,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC;YACxD,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC;YACxD,OAAO,QAAQ,GAAG,QAAQ,CAAC;QAC7B,CAAC,CAAC,CAAC;IACP,CAAC;IAED,IAAI,OAAO;QACT,OAAO,GAAG,CAAC;IACb,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,CAAsB,CAAC;IACnF,CAAC;IAED,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,GAAG,CAAqB,CAAC;IACjF,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,MAAM,CAAwB,CAAC;IACvF,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,OAAO,CAAyB,CAAC;IACzF,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,CAAsB,CAAC;IACnF,CAAC;IAED,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,GAAG,CAAqB,CAAC;IACjF,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,MAAM,CAAwB,CAAC;IACvF,CAAC;IAED,cAAc,CAAC,MAAmB;QAChC,OAAO,MAAM,EAAE,IAAI,KAAK,UAAU,CAAC,MAAM,CAAC;IAC5C,CAAC;IAED,WAAW,CAAC,MAAmB;QAC7B,OAAO,MAAM,EAAE,IAAI,KAAK,UAAU,CAAC,GAAG,CAAC;IACzC,CAAC;IAED,cAAc,CAAC,MAAmB;QAChC,OAAO,MAAM,EAAE,IAAI,KAAK,UAAU,CAAC,MAAM,CAAC;IAC5C,CAAC;IAED,eAAe,CAAC,MAAmB;QACjC,OAAO,MAAM,EAAE,IAAI,KAAK,UAAU,CAAC,OAAO,CAAC;IAC7C,CAAC;IAED,WAAW,CAAC,MAAmB;QAC7B,OAAO,MAAM,EAAE,IAAI,KAAK,UAAU,CAAC,GAAG,CAAC;IACzC,CAAC;IAED,YAAY,CAAC,MAAmB;QAC9B,OAAO,MAAM,EAAE,IAAI,KAAK,UAAU,CAAC,IAAI,CAAC;IAC1C,CAAC;IAED,gBAAgB,CAAC,KAAa;QAC5B,OAAO,MAAM,CAAC,IAAI;aACf,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC;aAChC,MAAM,CAAC,CAAC,GAAW,EAAE,KAAY,EAAE,EAAE;YACpC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAW,EAAE,MAAM,EAAE,EAAE;gBACjD,IAAI,KAAK,CAAC,KAAK,KAAK,KAAK;oBAAE,OAAO,GAAG,CAAC;gBACtC,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAC5C,OAAO,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC;YAChD,CAAC,EAAE,GAAG,CAAC,CAAC;QACV,CAAC,EAAE,CAAC,CAAC,CAAC;IACV,CAAC;IAED,OAAO,CAAC,MAAmB,EAAE,KAAa;QACxC,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK;YAAE,OAAO,EAAE,CAAC;QACjC,OAAO,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC;IAED,gBAAgB,CAAC,KAAgB;QAC/B,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC/B,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;QAE5D,MAAM,mBAAmB,GAAG,CAAC,KAA4D,EAAE,EAAE;YAC3F,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACjD,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACnF,IAAI,SAAS,GAAG,MAAM,CAAC;YAEvB,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,MAAM;gBAAE,SAAS,GAAG,MAAM,GAAG,IAAI,CAAC,CAAC,sBAAsB;YAC7F,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;QAC1E,CAAC,CAAC;QAEF,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC,UAAU,CAAC,CAAC;QACnI,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC;QAE3H,MAAM,YAAY,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;YACnD,MAAM,OAAO,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;YACvC,OAAO,OAAO,CAAC,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;QAC3D,CAAC,EAAE,mBAAmB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE1C,OAAO;YACL,KAAK,EAAE,IAAI;YACX,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,EAAE,OAAO,IAAI,CAAC,CAAC;YAC3D,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,EAAE,SAAS,IAAI,CAAC,CAAC;SACpE,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,KAAY,EAAE,MAAkB;QAC/C,OAAO,MAAM,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAkB;QAClC,MAAM,UAAU,GAAG,CAAC,MAAM,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,CAAC,CAAC;QAElH,8BAA8B;QAC9B,MAAM,MAAM,GAA6B,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YACxE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC;gBAAE,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;YAC7C,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACrC,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAA8B,CAAC,CAAC;QAEnC,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;QACpG,MAAM,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;IAED,cAAc,CAAC,MAAmB;QAChC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;IAED,SAAS,CAAC,OAA4E;QACpF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QACvC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QAC3C,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;YACxC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QAC9C,CAAC,CAAC;IACJ,CAAC;IAED,YAAY,CAAC,OAA4E;QACvF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QACtC,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IACtD,CAAC;IAED,YAAY,CAAC,OAA4E;QACvF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QACvC,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IACvD,CAAC;IAED,gBAAgB,CAAC,OAA4E;QAC3F,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QAC3C,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,KAAgB,EAAE,MAAe,EAAE,QAAkC;QAClF,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,SAAS,EAAE,CAAC;QAC5C,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,CAAE,CAAC;QAC/D,MAAM,aAAa,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,aAAa,IAAI,CAAC,CAAC,OAAO,KAAK,SAAS,CAAC,eAAe,CAAE,CAAC;QAC9H,MAAM,SAAS,GAAG,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;QAEhG,MAAM,MAAM,GACV,QAAQ,EAAE,MAAM;YAChB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACzB,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;gBAC7D,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;gBAC7D,OAAO,QAAQ,GAAG,QAAQ,CAAC;YAC7B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAER,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE;YAClC,gBAAgB,EAAE,IAAI;YACtB,SAAS,EAAE,SAAS;YACpB,EAAE,EAAE,aAAa;YACjB,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,MAAM;YACd,MAAM,EAAE,MAAM;SACf,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,KAAgB,EAAE,MAAe;QAC7C,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,SAAS,EAAE,CAAC;QAC5C,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,CAAE,CAAC;QAC1D,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,aAAa,IAAI,CAAC,CAAC,OAAO,KAAK,IAAI,CAAC,eAAe,CAAE,CAAC;QAC3G,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAE,CAAC;QAC/D,MAAM,SAAS,GAAG,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;QAElF,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE;YAClC,gBAAgB,EAAE,IAAI;YACtB,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,UAAU;YAChB,cAAc,EAAE,CAAC,CAAC,MAAM;YACxB,SAAS,EAAE,SAAS;YACpB,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI;YACV,EAAE,EAAE,IAAI;SACT,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,WAAW;QACf,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAiB;QAC7B,IAAI,CAAC,IAAI;YAAE,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACxD,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,aAAa,CAAC,MAAM,IAAI,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/G,IAAI,CAAC,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACvD,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAA+B;QAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;YAC3C,IAAI,MAAM,YAAY,UAAU;gBAAE,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACpE,OAAO,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACvD,MAAM,SAAS,CAAC,UAAU,EAAE,CAAC;IAC/B,CAAC;CACF"}

package/build/activity.d.ts

@@ -1,18 +1,14 @@
-import { WithdrawArgsWithPending } from "@hot-labs/omni-sdk";
+import { BridgePending } from "./core/pendings";
 import { OmniWallet } from "./core/OmniWallet";
-import { HotConnector } from "./HotConnector";
+import type { HotKit } from "./HotKit";
+import { HotBridgeWithdrawal } from "./HotBridgeWithdrawal";
 export declare class Activity {
     private readonly kit;
-    withdrawals: Record<number, (WithdrawArgsWithPending & {
-        loading?: boolean;
-    })[]>;
-    constructor(kit: HotConnector);
-    get withdrawalsList(): (WithdrawArgsWithPending & {
-        loading?: boolean;
-    })[];
-    finishWithdrawal(withdrawal: WithdrawArgsWithPending & {
-        loading?: boolean;
-    }): Promise<void>;
+    withdrawals: Record<number, HotBridgeWithdrawal[]>;
+    bridgePending: BridgePending[];
+    constructor(kit: HotKit);
+    get activityList(): (BridgePending | HotBridgeWithdrawal)[];
+    addBridgePending(bridgePending: BridgePending): void;
     fetchPendingWithdrawalsByWallet(wallet: OmniWallet): Promise<void>;
     fetchPendingWithdrawalsByChain(chain: number, wallet: OmniWallet): Promise<void>;
 }

package/build/activity.js

@@ -1,77 +1,26 @@
-import { computed, makeObservable, observable, runInAction } from "mobx";
-import { hex } from "@scure/base";
-import { chains, Network, WalletType } from "./core";
+import { action, computed, makeObservable, observable, runInAction } from "mobx";
+import { chains, WalletType } from "./core/chains";
+import { HotBridgeWithdrawal } from "./HotBridgeWithdrawal";
 export class Activity {
     kit;
     withdrawals = {};
+    bridgePending = [];
     constructor(kit) {
         this.kit = kit;
-        makeObservable(this, { withdrawals: observable, withdrawalsList: computed });
+        makeObservable(this, {
+            withdrawals: observable,
+            bridgePending: observable,
+            activityList: computed,
+            addBridgePending: action,
+        });
         kit.onConnect(({ wallet }) => this.fetchPendingWithdrawalsByWallet(wallet));
     }
-    get withdrawalsList() {
-        return Object.values(this.withdrawals).flat();
+    get activityList() {
+        return [...this.bridgePending, ...Object.values(this.withdrawals).flat()];
     }
-    async finishWithdrawal(withdrawal) {
-        try {
-            if (withdrawal.loading)
-                return;
-            runInAction(() => (withdrawal.loading = true));
-            if (withdrawal.chain === Network.Stellar) {
-                if (!this.kit.stellar)
-                    throw new Error("Stellar wallet not connected");
-                await this.kit.exchange.bridge.stellar.withdraw({
-                    sendTransaction: (tx) => this.kit.stellar.sendTransaction(tx),
-                    sender: this.kit.stellar.address,
-                    ...withdrawal,
-                });
-            }
-            if (withdrawal.chain === Network.Solana) {
-                if (!this.kit.solana)
-                    throw new Error("Solana wallet not connected");
-                const solana = await this.kit.exchange.bridge.solana();
-                await solana.withdraw({
-                    sendTransaction: (tx) => this.kit.solana.sendTransaction(tx),
-                    sender: this.kit.solana.address,
-                    ...withdrawal,
-                });
-            }
-            if (withdrawal.chain === Network.Ton || withdrawal.chain === Network.OmniTon) {
-                if (!this.kit.ton)
-                    throw new Error("Ton wallet not connected");
-                await this.kit.exchange.bridge.ton.withdraw({
-                    sendTransaction: (tx) => this.kit.ton.sendTransaction(tx),
-                    refundAddress: this.kit.ton.address,
-                    ...withdrawal,
-                });
-            }
-            if (chains.get(withdrawal.chain).type === WalletType.EVM) {
-                if (!this.kit.evm)
-                    throw new Error("EVM wallet not connected");
-                await this.kit.exchange.bridge.evm.withdraw({
-                    sendTransaction: (tx) => this.kit.evm.sendTransaction(tx),
-                    ...withdrawal,
-                });
-            }
-            if (withdrawal.chain === Network.Gonka) {
-                if (!this.kit.cosmos)
-                    throw new Error("Gonka wallet not connected");
-                const cosmos = await this.kit.exchange.bridge.cosmos();
-                await cosmos.withdraw({
-                    sendTransaction: (tx) => this.kit.cosmos.sendTransaction(tx),
-                    senderPublicKey: hex.decode(this.kit.cosmos.publicKey),
-                    sender: this.kit.cosmos.address,
-                    ...withdrawal,
-                });
-            }
-            await this.kit.exchange.bridge.clearPendingWithdrawals([withdrawal]).catch(() => { });
-        }
-        finally {
-            runInAction(() => (withdrawal.loading = false));
-            const wallet = this.kit.wallets.find((w) => w.type === chains.get(withdrawal.chain).type);
-            if (wallet)
-                this.fetchPendingWithdrawalsByChain(withdrawal.chain, wallet);
-        }
+    addBridgePending(bridgePending) {
+        this.bridgePending.push(bridgePending);
+        // this.kit.storage.set(`activity:bridgePendings`, JSON.stringify(this.bridgePending.map((t) => t.serialize())));
     }
     async fetchPendingWithdrawalsByWallet(wallet) {
         if (wallet.type === WalletType.NEAR)
@@ -83,7 +32,7 @@ export class Activity {
     }
     async fetchPendingWithdrawalsByChain(chain, wallet) {
         const pendings = await this.kit.exchange.bridge.getPendingWithdrawalsWithStatus(chain, wallet.address);
-        runInAction(() => (this.withdrawals[chain] = pendings.filter((t) => !t.completed)));
+        runInAction(() => (this.withdrawals[chain] = pendings.filter((t) => !t.completed).map((t) => new HotBridgeWithdrawal(t, this.kit))));
     }
 }
 //# sourceMappingURL=activity.js.map

package/build/activity.js.map

@@ -1 +1 @@
-{"version":3,"file":"activity.js","sourceRoot":"","sources":["../src/activity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AACzE,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAElC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAIrD,MAAM,OAAO,QAAQ;IAGU;IAF7B,WAAW,GAAwE,EAAE,CAAC;IAEtF,YAA6B,GAAiB;QAAjB,QAAG,GAAH,GAAG,CAAc;QAC5C,cAAc,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE,eAAe,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC7E,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,+BAA+B,CAAC,MAAM,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,IAAI,eAAe;QACjB,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,UAA2D;QAChF,IAAI,CAAC;YACH,IAAI,UAAU,CAAC,OAAO;gBAAE,OAAO;YAC/B,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC;YAE/C,IAAI,UAAU,CAAC,KAAK,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC;gBACzC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO;oBAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;gBACvE,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;oBAC9C,eAAe,EAAE,CAAC,EAAO,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,OAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;oBACnE,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO;oBAChC,GAAG,UAAU;iBACd,CAAC,CAAC;YACL,CAAC;YAED,IAAI,UAAU,CAAC,KAAK,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC;gBACxC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM;oBAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;gBACrE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBACvD,MAAM,MAAM,CAAC,QAAQ,CAAC;oBACpB,eAAe,EAAE,CAAC,EAAO,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAO,CAAC,eAAe,CAAC,EAAE,CAAC;oBAClE,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO;oBAC/B,GAAG,UAAU;iBACd,CAAC,CAAC;YACL,CAAC;YAED,IAAI,UAAU,CAAC,KAAK,KAAK,OAAO,CAAC,GAAG,IAAI,UAAU,CAAC,KAAK,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC;gBAC7E,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG;oBAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;gBAC/D,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;oBAC1C,eAAe,EAAE,CAAC,EAAO,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAI,CAAC,eAAe,CAAC,EAAE,CAAC;oBAC/D,aAAa,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO;oBACnC,GAAG,UAAU;iBACd,CAAC,CAAC;YACL,CAAC;YAED,IAAI,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,GAAG,EAAE,CAAC;gBACzD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG;oBAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;gBAC/D,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;oBAC1C,eAAe,EAAE,CAAC,EAAO,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAI,CAAC,eAAe,CAAC,EAAE,CAAC;oBAC/D,GAAG,UAAU;iBACd,CAAC,CAAC;YACL,CAAC;YAED,IAAI,UAAU,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK,EAAE,CAAC;gBACvC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM;oBAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;gBACpE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBACvD,MAAM,MAAM,CAAC,QAAQ,CAAC;oBACpB,eAAe,EAAE,CAAC,EAAO,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAO,CAAC,eAAe,CAAC,EAAE,CAAC;oBAClE,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAU,CAAC;oBACvD,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO;oBAC/B,GAAG,UAAU;iBACd,CAAC,CAAC;YACL,CAAC;YAED,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACvF,CAAC;gBAAS,CAAC;YACT,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,UAAU,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC;YAChD,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;YAC1F,IAAI,MAAM;gBAAE,IAAI,CAAC,8BAA8B,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC5E,CAAC;IACH,CAAC;IAED,KAAK,CAAC,+BAA+B,CAAC,MAAkB;QACtD,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI;YAAE,OAAO;QAC5C,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,QAAQ;YAAE,OAAO;QAChD,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;QAC1G,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,8BAA8B,CAAC,KAAa,EAAE,MAAkB;QACpE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,+BAA+B,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QACvG,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACtF,CAAC;CACF"}
+{"version":3,"file":"activity.js","sourceRoot":"","sources":["../src/activity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAEjF,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAKnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,OAAO,QAAQ;IAIU;IAH7B,WAAW,GAA0C,EAAE,CAAC;IACxD,aAAa,GAAoB,EAAE,CAAC;IAEpC,YAA6B,GAAW;QAAX,QAAG,GAAH,GAAG,CAAQ;QACtC,cAAc,CAAC,IAAI,EAAE;YACnB,WAAW,EAAE,UAAU;YACvB,aAAa,EAAE,UAAU;YACzB,YAAY,EAAE,QAAQ;YACtB,gBAAgB,EAAE,MAAM;SACzB,CAAC,CAAC;QAEH,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,+BAA+B,CAAC,MAAM,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,IAAI,YAAY;QACd,OAAO,CAAC,GAAG,IAAI,CAAC,aAAa,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,gBAAgB,CAAC,aAA4B;QAC3C,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACvC,iHAAiH;IACnH,CAAC;IAED,KAAK,CAAC,+BAA+B,CAAC,MAAkB;QACtD,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI;YAAE,OAAO;QAC5C,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,QAAQ;YAAE,OAAO;QAChD,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;QAC1G,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,8BAA8B,CAAC,KAAa,EAAE,MAAkB;QACpE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,+BAA+B,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QACvG,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,mBAAmB,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACvI,CAAC;CACF"}

package/build/core/Intents.d.ts

@@ -1,12 +1,12 @@
-import type { HotConnector } from "../HotConnector";
+import type { HotKit } from "../HotKit";
 import type { OmniWallet } from "./OmniWallet";
 import type { Intent, Commitment } from "./types";
-import type { BridgeReview } from "./exchange";
+import { BridgePending } from "./pendings";
 import { OmniToken } from "./chains";
 export declare const TGAS = 1000000000000n;
 export declare class Intents {
-    readonly wibe3?: HotConnector | undefined;
-    constructor(wibe3?: HotConnector | undefined);
+    readonly kit?: HotKit | undefined;
+    constructor(kit?: HotKit | undefined);
     static builder(signer?: OmniWallet): Intents;
     signedHashes: string[];
     commitments: Commitment[];
@@ -76,14 +76,11 @@ export declare class Intents {
     sign(): Promise<Commitment>;
     simulate(): Promise<any>;
     setupSigner(): Promise<OmniWallet>;
-    openSignFlow({ title, allowedTokens, excludedTokens, onConfirm, }: {
+    openSignFlow({ title, allowedTokens, excludedTokens, onConfirm }: {
         title?: string;
         allowedTokens?: string[];
         excludedTokens?: string[];
-        onConfirm: (args: {
-            depositQoute?: BridgeReview;
-            processing?: () => Promise<BridgeReview>;
-        }) => Promise<void>;
+        onConfirm: (pending?: BridgePending) => Promise<void>;
     }): Promise<void>;
     depositAndExecute({ title, message, allowedTokens, excludedTokens, serverSideProcessing, payload, }?: {
         title?: string;

package/build/core/Intents.js

@@ -6,9 +6,9 @@ import { tokens } from "./tokens";
 import { api } from "./api";
 export const TGAS = 1000000000000n;
 export class Intents {
-    wibe3;
-    constructor(wibe3) {
-        this.wibe3 = wibe3;
+    kit;
+    constructor(kit) {
+        this.kit = kit;
     }
     static builder(signer) {
         return new Intents().attachWallet(signer);
@@ -53,7 +53,7 @@ export class Intents {
             amount,
             token,
         }).depositAndExecute({
-            title: `Pay ${this.wibe3?.omni(token).readable(amount)} ${this.wibe3?.omni(token).symbol}`,
+            title: `Pay ${this.kit?.omni(token).readable(amount)} ${this.kit?.omni(token).symbol}`,
             serverSideProcessing: true,
             payload: { email },
         });
@@ -335,38 +335,36 @@ export class Intents {
     async setupSigner() {
         if (typeof window === "undefined")
             throw "Setup signer is only available in browser";
-        if (!this.wibe3)
-            throw new Error("No wibe3 attached");
+        if (!this.kit)
+            throw new Error("No kit attached");
         if (this.signer)
             return this.signer;
-        if (this.wibe3.priorityWallet) {
-            this.signer = this.wibe3.priorityWallet;
+        if (this.kit.priorityWallet) {
+            this.signer = this.kit.priorityWallet;
             return this.signer;
         }
-        const { openConnectPrimaryWallet, openConnector } = await import("../ui/router");
-        if (this.wibe3.wallets.length > 0)
-            await openConnectPrimaryWallet(this.wibe3);
+        if (this.kit.wallets.length > 0)
+            await this.kit.router.openConnectPrimaryWallet(this.kit);
         else
-            await openConnector(this.wibe3);
-        if (this.wibe3.priorityWallet == undefined)
+            await this.kit.router.openConnector(this.kit);
+        if (this.kit.priorityWallet == undefined)
             throw new Error("No signer attached");
-        this.signer = this.wibe3.priorityWallet;
+        this.signer = this.kit.priorityWallet;
         return this.signer;
     }
-    async openSignFlow({ title, allowedTokens, excludedTokens, onConfirm, }) {
+    async openSignFlow({ title, allowedTokens, excludedTokens, onConfirm }) {
         if (typeof window === "undefined")
             throw "Open sign flow is only available in browser";
-        if (!this.wibe3)
-            throw "Attach wibe3";
+        if (!this.kit)
+            throw "Attach kit";
         if (!this.signer)
             throw "Attach signer";
         // TODO: Handle multiple payables
         const payableToken = tokens.get(Array.from(this.need.keys())[0]);
         const payableAmount = this.need.get(payableToken.omniAddress) || 0n;
-        const balance = await this.wibe3.fetchToken(payableToken, this.signer);
+        const balance = await this.kit.fetchToken(payableToken, this.signer);
         const prepaidAmount = formatter.bigIntMin(payableAmount, balance);
-        const { openPayment } = await import("../ui/router");
-        return await openPayment(this.wibe3, {
+        return await this.kit.router.openPayment(this.kit, {
             onConfirm,
             needAmount: payableAmount - prepaidAmount,
             allowedTokens,
@@ -387,16 +385,18 @@ export class Intents {
             title,
             allowedTokens,
             excludedTokens,
-            onConfirm: async ({ depositQoute, processing }) => {
+            onConfirm: async (pending) => {
+                if (pending)
+                    this.kit?.activity.addBridgePending(pending);
                 if (!serverSideProcessing)
                     return;
                 let depositAddress;
-                if (depositQoute?.qoute === "deposit")
-                    await processing?.();
-                else if (depositQoute?.qoute === "withdraw")
-                    await processing?.();
+                if (pending?.review?.qoute === "deposit")
+                    await pending?.processing?.();
+                else if (pending?.review?.qoute === "withdraw")
+                    await pending?.processing?.();
                 else
-                    depositAddress = depositQoute?.qoute?.depositAddress;
+                    depositAddress = pending?.review?.qoute?.depositAddress;
                 await api.yieldIntentCall({
                     depositAddress: depositAddress,
                     commitment: this.commitments[0],
@@ -406,12 +406,11 @@ export class Intents {
         });
         if (serverSideProcessing)
             return;
-        const { openToast } = await import("../ui/router");
-        const close = openToast(message || "Executing payment");
+        const close = this.kit?.toast.pending(message || "Executing payment");
         const payableToken = tokens.get(Array.from(this.need.keys())[0]);
         const payableAmount = this.need.get(payableToken.omniAddress) || 0n;
         await this.signer?.waitUntilOmniBalance({ [payableToken.omniAddress]: payableAmount });
-        await this.execute().finally(() => close());
+        await this.execute().finally(() => close?.dismiss());
     }
     async execute() {
         if (this.unsignedCommitment != null)