@hot-labs/kit 1.1.0-beta.3 → 1.1.0-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hot-labs/kit",
-  "version": "1.1.0-beta.3",
+  "version": "1.1.0-beta.5",
   "description": "HOT Labs Kit is chain agnostic connector with omni payments",
   "license": "ISC",
   "author": "",

package/src/OmniConnector.ts

@@ -19,6 +19,7 @@ export interface OmniConnectorOption {
   icon: string;
   id: string;
   download?: string;
+  deeplink?: string;
   type: "extension" | "external";
 }
 

package/src/core/Intents.ts

@@ -21,14 +21,20 @@ export class Intents {
     return new Intents();
   }
 
-  hashes: string[] = [];
-  intents: Intent[] = [];
-  signer?: OmniWallet;
-  nonce?: Uint8Array;
-  deadline?: Date;
-
+  signedHashes: string[] = [];
   commitments: Commitment[] = [];
   need = new Map<OmniToken, bigint>();
+  signer?: OmniWallet;
+
+  unsignedCommitment: {
+    intents: Intent[];
+    nonce?: Uint8Array;
+    deadline?: Date;
+  } = {
+    intents: [],
+    nonce: undefined,
+    deadline: undefined,
+  };
 
   addNeed(token: OmniToken, amount: bigint) {
     if (!this.need.has(token)) this.need.set(token, 0n);
@@ -38,7 +44,7 @@ export class Intents {
 
   authCall(args: { contractId: string; msg: string; attachNear: bigint; tgas: number }) {
     this.addNeed(OmniToken.NEAR, args.attachNear);
-    this.intents.push({
+    this.unsignedCommitment.intents.push({
       min_gas: (BigInt(args.tgas) * TGAS).toString(),
       attached_deposit: args.attachNear.toString(),
       contract_id: args.contractId,
@@ -49,6 +55,18 @@ export class Intents {
     return this;
   }
 
+  /**
+   * Use this method to pay for a merchant's item created in pay.hot-labs.org
+   */
+  merchantPayment({ merchantId, token, itemId, email, amount, memo }: { token: OmniToken; merchantId: string; itemId: string; amount: number | bigint; memo: string; email: string }) {
+    return this.transfer({
+      msg: JSON.stringify({ merchant_id: merchantId, item_id: itemId, memo: memo }),
+      recipient: "pay.fi.tg",
+      amount,
+      token,
+    }).yieldExecute({ email });
+  }
+
   transfer(args: { recipient: string; token: OmniToken; amount: number | bigint; memo?: string; msg?: string; tgas?: number }) {
     const omniToken = tokens.get(args.token);
     const amount = (typeof args.amount === "number" ? omniToken.int(args.amount) : args.amount).toString();
@@ -62,7 +80,7 @@ export class Intents {
     };
 
     this.addNeed(args.token, BigInt(amount));
-    this.intents.push(intent);
+    this.unsignedCommitment.intents.push(intent);
     return this;
   }
 
@@ -84,7 +102,7 @@ export class Intents {
       msg: args.msg,
     };
 
-    this.intents.push(intent);
+    this.unsignedCommitment.intents.push(intent);
     return this;
   }
 
@@ -107,7 +125,7 @@ export class Intents {
       }
     }
 
-    this.intents.push(intent);
+    this.unsignedCommitment.intents.push(intent);
     return this;
   }
 
@@ -144,7 +162,7 @@ export class Intents {
         this.addNeed(token, BigInt(rawIntent.amounts[i]));
       }
 
-      this.intents.push({
+      this.unsignedCommitment.intents.push({
         intent: "mt_withdraw",
         amounts: rawIntent.amounts,
         receiver_id: rawIntent.receiver_id,
@@ -199,12 +217,12 @@ export class Intents {
   }
 
   addPublicKey(publicKey: string) {
-    this.intents.push({ intent: "add_public_key", public_key: publicKey });
+    this.unsignedCommitment.intents.push({ intent: "add_public_key", public_key: publicKey });
     return this;
   }
 
   removePublicKey(publicKey: string) {
-    this.intents.push({ intent: "remove_public_key", public_key: publicKey });
+    this.unsignedCommitment.intents.push({ intent: "remove_public_key", public_key: publicKey });
     return this;
   }
 
@@ -217,7 +235,7 @@ export class Intents {
     if (standart === "nep245") {
       const mtContract = tokenParts[0];
       const tokenId = tokenParts.slice(1).join(":");
-      this.intents.push({
+      this.unsignedCommitment.intents.push({
         intent: "mt_withdraw",
         amounts: [amount],
         receiver_id: args.receiver,
@@ -231,7 +249,7 @@ export class Intents {
     }
 
     if (standart === "nep141") {
-      this.intents.push({
+      this.unsignedCommitment.intents.push({
         intent: "ft_withdraw",
         receiver_id: args.receiver,
         token: tokenParts.join(":"),
@@ -243,7 +261,7 @@ export class Intents {
     }
 
     if (standart === "nep171") {
-      this.intents.push({
+      this.unsignedCommitment.intents.push({
         intent: "nft_withdraw",
         receiver_id: args.receiver,
         token_id: tokenParts.join(":"),
@@ -258,7 +276,7 @@ export class Intents {
   }
 
   attachHashes(hashes: string[]) {
-    this.hashes.push(...hashes);
+    this.signedHashes.push(...hashes);
     return this;
   }
 
@@ -268,22 +286,22 @@ export class Intents {
   }
 
   attachDeadline(deadline: Date) {
-    this.deadline = deadline;
+    this.unsignedCommitment.deadline = deadline;
     return this;
   }
 
   attachNonce(nonce: Uint8Array) {
-    this.nonce = nonce;
+    this.unsignedCommitment.nonce = nonce;
     return this;
   }
 
   attachTimeout(seconds: number) {
-    this.deadline = new Date(Date.now() + seconds * 1000);
+    this.unsignedCommitment.deadline = new Date(Date.now() + seconds * 1000);
     return this;
   }
 
   attachSeed(seed: string) {
-    this.nonce = new Uint8Array(sha256(new TextEncoder().encode(seed))).slice(0, 32);
+    this.unsignedCommitment.nonce = new Uint8Array(sha256(new TextEncoder().encode(seed))).slice(0, 32);
     return this;
   }
 
@@ -296,10 +314,10 @@ export class Intents {
     const intAmount = typeof amount === "number" ? tokens.get(token).int(amount) : amount;
 
     // this.addNeed(token, -intAmount); Do we need to add the need here?
-    const tokenDiff = this.intents.find((intent) => intent.intent === "token_diff");
+    const tokenDiff = this.unsignedCommitment.intents.find((intent) => intent.intent === "token_diff");
 
     if (tokenDiff) tokenDiff.diff[token.toString()] = intAmount.toString();
-    else this.intents.push({ intent: "token_diff", diff: { [token.toString()]: intAmount.toString() } });
+    else this.unsignedCommitment.intents.push({ intent: "token_diff", diff: { [token.toString()]: intAmount.toString() } });
     return this;
   }
 
@@ -307,10 +325,10 @@ export class Intents {
     const intAmount = typeof amount === "number" ? tokens.get(token).int(amount) : amount;
 
     this.addNeed(token as OmniToken, intAmount);
-    const tokenDiff = this.intents.find((intent) => intent.intent === "token_diff");
+    const tokenDiff = this.unsignedCommitment.intents.find((intent) => intent.intent === "token_diff");
 
     if (tokenDiff) tokenDiff.diff[token.toString()] = (-intAmount).toString();
-    else this.intents.push({ intent: "token_diff", diff: { [token.toString()]: (-intAmount).toString() } });
+    else this.unsignedCommitment.intents.push({ intent: "token_diff", diff: { [token.toString()]: (-intAmount).toString() } });
     return this;
   }
 
@@ -320,9 +338,13 @@ export class Intents {
     if (!signer.omniAddress) throw new Error("No omni address");
 
     const commitments: Commitment[] = [];
-    for (const intent of this.intents) {
-      const signed = await signer.signIntents([intent], { deadline: this.deadline ? +this.deadline : undefined, nonce: this.nonce });
-      commitments.push(signed);
+    for (const intent of this.unsignedCommitment.intents) {
+      commitments.push(
+        await signer.signIntents([intent], {
+          deadline: this.unsignedCommitment.deadline ? +this.unsignedCommitment.deadline : undefined,
+          nonce: this.unsignedCommitment.nonce,
+        })
+      );
     }
 
     return commitments;
@@ -332,37 +354,61 @@ export class Intents {
     const signer = this.signer;
     if (!signer) throw new Error("No signer attached");
     if (!signer.omniAddress) throw new Error("No omni address");
-    return await signer.signIntents(this.intents, {
-      deadline: this.deadline ? +this.deadline : undefined,
-      nonce: this.nonce,
+    const commitment = await signer.signIntents(this.unsignedCommitment.intents, {
+      deadline: this.unsignedCommitment.deadline ? +this.unsignedCommitment.deadline : undefined,
+      nonce: this.unsignedCommitment.nonce,
     });
+
+    this.unsignedCommitment = { intents: [] };
+    this.commitments.push(commitment);
+    return this;
   }
 
   async simulate() {
-    if (!this.signer) throw new Error("No signer attached");
-    const signed = await this.sign();
-    return await Intents.simulateIntents([signed]);
+    if (this.commitments.length === 0) throw new Error("No commitments attached");
+    return await Intents.simulateIntents(this.commitments);
   }
 
-  async execute() {
+  async yieldExecute(payload?: Record<string, any>) {
     if (!this.wibe3) throw new Error("No wibe3 attached");
-    return openPayment(this.wibe3, this);
+    const { depositQoute, processing } = await openPayment(this.wibe3, this);
+    const depositAddress = depositQoute === "direct" ? undefined : typeof depositQoute?.qoute === "object" ? depositQoute?.qoute?.depositAddress : undefined;
+
+    if (depositAddress) {
+      const { near_trx } = await api.yieldIntentCall({ depositAddress, commitment: this.commitments[0], payload });
+      return near_trx;
+    }
+
+    await processing?.();
+    return this.execute();
+  }
+
+  async depositAndExecute() {
+    if (!this.wibe3) throw new Error("No wibe3 attached");
+    const { processing } = await openPayment(this.wibe3, this);
+    await processing?.();
+    return this.execute();
   }
 
-  async executeBatch(params = { checkTokens: true, chunkSize: this.intents.length, onSuccess: (bucket: number, hash: string) => {} }) {
-    if (!this.signer) throw new Error("No signer attached");
-    const batches = formatter.chunk(this.intents, params.chunkSize);
+  async execute() {
+    const task = Intents.publish(this.commitments, this.signedHashes);
+    this.commitments = [];
+    this.signedHashes = [];
+
+    const hash = await task;
+    await rpc.waitTransactionResult(hash, "intents.near");
+    return hash;
+  }
+
+  async executeBatch(params = { checkTokens: true, chunkSize: this.unsignedCommitment.intents.length, onSuccess: (bucket: number, hash: string) => {} }) {
+    if (this.commitments.length === 0) throw new Error("No commitments attached");
+    const batches = formatter.chunk(this.unsignedCommitment.intents, params.chunkSize);
     let index = 0;
 
     const hashes: string[] = [];
     for (const batch of batches) {
-      const signed = await this.signer.signIntents(batch, {
-        deadline: this.deadline ? +this.deadline : undefined,
-        nonce: this.nonce,
-      });
-
-      const hash = await Intents.publish([...this.commitments, signed], this.hashes);
-      await rpc.waitTransactionResult(hash, "intents.near");
+      this.unsignedCommitment.intents = batch;
+      const hash = await this.sign().then(() => this.execute());
       params.onSuccess(index++, hash);
       hashes.push(hash);
     }

package/src/core/api.ts

@@ -8,6 +8,16 @@ export class ApiError extends Error {
   }
 }
 
+export interface PaymentStatus {
+  payment_id: string;
+  timestamp: number;
+  amount: string;
+  token_id: string;
+  sender_id: string;
+  near_trx: string;
+  status: string;
+}
+
 export interface TokenType {
   icon: string;
   symbol: string;
@@ -69,16 +79,29 @@ export class Api {
     return result.balances?.[chain] || [];
   }
 
-  async pendingPayment(commitment: Commitment, depositAddress: string) {
+  async yieldIntentCall(args: { commitment: Commitment; depositAddress?: string; payload?: Record<string, any> }) {
     return await this.request(`/api/v1/wibe3/yield_intent_call`, {
-      body: JSON.stringify({ commitment, deposit_address: depositAddress }),
       method: "POST",
+      body: JSON.stringify({
+        commitment: args.commitment,
+        deposit_address: args.depositAddress,
+        ...args.payload,
+      }),
     });
   }
 
+  async paymentStatus(memo: string): Promise<PaymentStatus> {
+    const result = await this.request(`/partners/processed_payments?memo=${memo}`, { method: "GET" });
+    return result.payments[0];
+  }
+
+  async getPayments(merchantId: string): Promise<PaymentStatus[]> {
+    const result = await this.request(`/partners/processed_payments?merchant_id=${merchantId}`, { method: "GET" });
+    return result.payments;
+  }
+
   async publishIntents(signed: Record<string, any>[], hashes: string[]) {
     const result = await this.request(`/api/v1/wibe3/solver-bus`, {
-      headers: { "Content-Type": "application/json" },
       method: "POST",
       body: JSON.stringify({
         params: [{ signed_datas: signed, quote_hashes: hashes }],
@@ -93,7 +116,6 @@ export class Api {
 
   async getIntentsStatus(intentHash: string) {
     const result = await this.request(`/api/v1/wibe3/solver-bus`, {
-      headers: { "Content-Type": "application/json" },
       method: "POST",
       body: JSON.stringify({
         params: [{ intent_hash: intentHash }],

package/src/cosmos/connector.ts

@@ -6,7 +6,7 @@ import { hex } from "@scure/base";
 
 import { api } from "../core/api";
 import { chains, WalletType } from "../core/chains";
-import { ConnectorType, OmniConnector, WC_ICON } from "../OmniConnector";
+import { ConnectorType, OmniConnector, OmniConnectorOption, WC_ICON } from "../OmniConnector";
 import { HotConnector } from "../HotConnector";
 import { OmniWallet } from "../OmniWallet";
 
@@ -20,9 +20,9 @@ declare global {
   }
 }
 
-const wallets = {
+const wallets: Record<string, OmniConnectorOption> = {
   keplr: {
-    name: "Keplr",
+    name: "Keplr Wallet",
     icon: "https://cdn.prod.website-files.com/667dc891bc7b863b5397495b/68a4ca95f93a9ab64dc67ab4_keplr-symbol.svg",
     download: "https://www.keplr.app/get",
     deeplink: "keplrwallet://wcV2?",
@@ -30,13 +30,21 @@ const wallets = {
     id: "keplr",
   },
   leap: {
-    name: "Leap",
+    name: "Leap Wallet",
     icon: "https://framerusercontent.com/images/AbGYvbwnLekBbsdf5g7PI5PpSg.png?scale-down-to=512",
     download: "https://www.leapwallet.io/download",
     deeplink: "leapcosmos://wcV2?",
     type: "extension",
     id: "leap",
   },
+  gonkaWallet: {
+    name: "Gonka Wallet",
+    icon: "https://gonka-wallet.startonus.com/images/logo.png",
+    download: "https://t.me/gonka_wallet",
+    deeplink: "https://gonka-wallet.startonus.com/wc?wc=",
+    type: "external",
+    id: "gonkaWallet",
+  },
 };
 
 export default class CosmosConnector extends OmniConnector<CosmosWallet> {
@@ -50,28 +58,12 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
   constructor(wibe3: HotConnector) {
     super(wibe3);
 
-    this.options = [
-      {
-        name: "Keplr",
-        download: "https://www.keplr.app/get",
-        icon: "https://cdn.prod.website-files.com/667dc891bc7b863b5397495b/68a4ca95f93a9ab64dc67ab4_keplr-symbol.svg",
-        type: "keplr" in window ? "extension" : "external",
-        id: "keplr",
-      },
-      {
-        name: "leap" in window ? "Leap" : "Leap Mobile",
-        download: "https://www.leapwallet.io/download",
-        icon: "https://framerusercontent.com/images/AbGYvbwnLekBbsdf5g7PI5PpSg.png?scale-down-to=512",
-        type: "leap" in window ? "extension" : "external",
-        id: "leap",
-      },
-    ];
-
+    this.options = Object.values(wallets);
     Keplr.getKeplr().then((keplr) => {
       const option = this.options.find((option) => option.id === "keplr")!;
       runInAction(() => {
         option.type = keplr ? "extension" : "external";
-        option.name = keplr ? "Keplr" : "Keplr Mobile";
+        option.name = keplr ? "Keplr Wallet" : "Keplr Mobile";
       });
     });
 
@@ -113,7 +105,7 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
     return chains.getByType(WalletType.COSMOS).map((t) => t.key);
   }
 
-  async setupWalletConnect(id?: "keplr" | "leap"): Promise<CosmosWallet> {
+  async setupWalletConnect(id?: "keplr" | "leap" | "gonkaWallet"): Promise<CosmosWallet> {
     const wc = await this.wc;
     if (!wc) throw new Error("WalletConnect not found");
 
@@ -183,7 +175,7 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
     );
   }
 
-  async connectKeplr(type: "keplr" | "leap", extension?: Keplr): Promise<OmniWallet | { qrcode: string; deeplink?: string; task: Promise<OmniWallet> }> {
+  async connectKeplr(type: "keplr" | "leap" | "gonkaWallet", extension?: Keplr): Promise<OmniWallet | { qrcode: string; deeplink?: string; task: Promise<OmniWallet> }> {
     if (!extension) {
       return await this.connectWalletConnect({
         onConnect: () => this.setupWalletConnect(type),
@@ -232,6 +224,10 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
       });
     }
 
+    if (id === "gonkaWallet") {
+      return await this.connectKeplr("gonkaWallet");
+    }
+
     if (id === "keplr") {
       const keplr = await Keplr.getKeplr();
       return await this.connectKeplr("keplr", keplr);

package/src/cosmos/wallet.ts

@@ -2,7 +2,6 @@ import { StargateClient } from "@cosmjs/stargate";
 import { OmniWallet } from "../OmniWallet";
 import { chains, WalletType } from "../core/chains";
 import { ReviewFee } from "../core/bridge";
-import CosmosConnector from "./connector";
 import { Commitment } from "../core";
 
 interface ProtocolWallet {

package/src/exchange.ts

@@ -334,14 +334,11 @@ export class Exchange {
 
       const depositAddress = review.qoute.depositAddress!;
       let hash = "";
+
       if (review.from.chain === Network.Hot) {
         hash = await this.wibe3
           .intentsBuilder(sender)
-          .transfer({
-            amount: review.amountIn,
-            token: review.from.address as OmniToken,
-            recipient: depositAddress,
-          })
+          .transfer({ amount: review.amountIn, token: review.from.address as OmniToken, recipient: depositAddress })
           .execute();
       } else {
         hash = await sender.transfer({

package/src/solana/wallet.ts

@@ -14,7 +14,6 @@ import {
 } from "@solana/spl-token";
 
 import { Network, WalletType } from "../core/chains";
-import { OmniConnector } from "../OmniConnector";
 import { OmniWallet } from "../OmniWallet";
 
 import { Token } from "../core/token";
@@ -148,7 +147,7 @@ class SolanaWallet extends OmniWallet {
   }
 
   async getPriorityFeeEstimate(params: any): Promise<any> {
-    const response = await fetch(api.baseUrl + "/api/v1/wibe3/helius/staked", {
+    const response = await fetch(api.baseUrl + "/api/v1/evm/helius/staked", {
       body: JSON.stringify({ jsonrpc: "2.0", id: "helius-sdk", method: "getPriorityFeeEstimate", params: [params] }),
       headers: { "Content-Type": "application/json" },
       method: "POST",

package/src/ui/Popup.tsx

@@ -22,7 +22,7 @@ interface PopupProps {
   widget?: boolean;
   children: React.ReactNode;
   header?: React.ReactNode;
-  onClose: () => void;
+  onClose?: () => void;
   style?: React.CSSProperties;
   mobileFullscreen?: boolean;
 }
@@ -57,9 +57,12 @@ const Popup = ({ widget, children, header, onClose, style, mobileFullscreen }: P
         <ModalContent ref={contentRef} $mobileFullscreen={mobileFullscreen} style={{ opacity: 0, transform: "translateY(20px)", transition: "all 0.2s ease-in-out" }}>
           {header && (
             <ModalHeader>
-              <button onClick={onClose} style={{ position: "absolute", right: 16, top: 16 }}>
-                <CloseIcon />
-              </button>
+              {onClose != null && (
+                <button onClick={onClose} style={{ position: "absolute", right: 16, top: 16 }}>
+                  <CloseIcon />
+                </button>
+              )}
+
               {header}
             </ModalHeader>
           )}