@hot-labs/kit 1.4.15 → 1.4.16

package/src/core/exchange.ts

@@ -2,7 +2,7 @@ import { GetExecutionStatusResponse, OneClickService, ApiError, QuoteRequest, Qu
 import { utils } from "@hot-labs/omni-sdk";
 import { hex } from "@scure/base";
 
-import { Network, OmniToken, WalletType } from "./chains";
+import { chains, Network, OmniToken, WalletType } from "./chains";
 import { createHotBridge, ReviewFee } from "./bridge";
 import { OmniWallet } from "./OmniWallet";
 import { Recipient } from "./recipient";
@@ -36,19 +36,20 @@ export type BridgeReview = {
   qoute: QuoteResponse["quote"] | "withdraw" | "deposit";
   status: "pending" | "success" | "failed";
   statusMessage: string | null;
-  sender: OmniWallet | "qr";
-  recipient: OmniWallet | Recipient;
+  sender?: OmniWallet | "qr";
+  refund?: OmniWallet;
+  recipient?: OmniWallet | Recipient;
   logger?: ILogger;
   from: Token;
   to: Token;
 };
 
 export interface BridgeRequest {
-  refund: OmniWallet;
-  sender: OmniWallet | "qr";
+  refund?: OmniWallet;
+  sender?: OmniWallet | "qr";
   type?: "exactIn" | "exactOut";
   logger?: ILogger;
-  recipient: Recipient;
+  recipient?: Recipient;
   slippage: number;
   amount: bigint;
   from: Token;
@@ -155,6 +156,7 @@ export class Exchange {
   }
 
   async withdrawFee(request: BridgeRequest) {
+    if (request.recipient == null) return 0n;
     if (request.sender === "qr") throw new Error("Sender is QR");
     if (request.to.chain === Network.Near || request.to.chain === Network.Omni) return 0n;
     const gaslessFee = await this.bridge.getGaslessWithdrawFee({
@@ -195,13 +197,16 @@ export class Exchange {
     const noFee = from.symbol === to.symbol || (from.symbol.toLowerCase().includes("usd") && to.symbol.toLowerCase().includes("usd"));
 
     if (sender !== "qr" && this.isDirectDeposit(from, to)) {
-      const fee = await this.bridge.getDepositFee({
-        intentAccount: sender.omniAddress,
-        sender: sender.address,
-        token: from.address,
-        chain: from.chain,
-        amount: amount,
-      });
+      let fee: ReviewFee | null = null;
+      if (sender != null) {
+        fee = await this.bridge.getDepositFee({
+          intentAccount: sender.omniAddress,
+          sender: sender.address,
+          token: from.address,
+          chain: from.chain,
+          amount: amount,
+        });
+      }
 
       return {
         from: from,
@@ -209,6 +214,7 @@ export class Exchange {
         minAmountOut: amount,
         sender: sender,
         recipient,
+        refund: refund,
         amountIn: amount,
         amountOut: amount,
         slippage: slippage,
@@ -236,18 +242,19 @@ export class Exchange {
         statusMessage: null,
         status: "pending",
         qoute: "withdraw",
+        refund: refund,
         logger,
       };
     }
 
-    const refundParams = { refundType: QuoteRequest.refundType.ORIGIN_CHAIN, refundTo: refund.address };
-    if (refund.type !== from.type) {
+    const refundParams = { refundType: QuoteRequest.refundType.ORIGIN_CHAIN, refundTo: refund?.address || chains.get(from.chain)?.testAddress };
+    if (refund?.type !== from.type && refund != null) {
       if (!refund.omniAddress) throw "Setup refund address";
       refundParams.refundType = QuoteRequest.refundType.INTENTS;
       refundParams.refundTo = refund.omniAddress;
     }
 
-    if (recipient.type === WalletType.STELLAR) {
+    if (recipient?.type === WalletType.STELLAR) {
       const isTokenActivated = await StellarWallet.isTokenActivated(recipient.address, request.to.address);
       if (!isTokenActivated && !(recipient instanceof StellarWallet)) throw "Token not activated for recipient";
     }
@@ -269,7 +276,7 @@ export class Exchange {
         depositType: from.chain === Network.Omni ? QuoteRequest.depositType.INTENTS : QuoteRequest.depositType.ORIGIN_CHAIN,
         depositMode: from.chain === Network.Stellar ? QuoteRequest.depositMode.MEMO : QuoteRequest.depositMode.SIMPLE,
         recipientType: to.chain === Network.Omni ? QuoteRequest.recipientType.INTENTS : QuoteRequest.recipientType.DESTINATION_CHAIN,
-        recipient: to.chain === Network.Omni ? recipient.omniAddress : recipient.address,
+        recipient: (to.chain === Network.Omni ? recipient?.omniAddress : recipient?.address) || chains.get(to.chain)?.testAddress,
         appFees: noFee ? [] : [{ recipient: "intents.tg", fee: 25 }],
         amount: request.amount.toString(),
         referral: "intents.tg",
@@ -293,7 +300,7 @@ export class Exchange {
     }
 
     let fee: ReviewFee | null = null;
-    if (request.from.chain !== Network.Omni && sender !== "qr") {
+    if (request.from.chain !== Network.Omni && sender !== "qr" && sender != null) {
       const amount = BigInt(qoute.quote.amountIn);
       const depositAddress = qoute.quote.depositAddress!;
       fee = await sender.transferFee(request.from, depositAddress, amount).catch(() => null);
@@ -310,6 +317,7 @@ export class Exchange {
       statusMessage: null,
       qoute: qoute.quote,
       status: "pending",
+      refund: refund,
       sender: sender,
       fee: fee,
       logger,
@@ -317,7 +325,10 @@ export class Exchange {
   }
 
   async makeSwap(review: BridgeReview): Promise<{ review: BridgeReview; processing?: () => Promise<BridgeReview> }> {
-    const { sender, recipient, logger } = review;
+    const { sender, recipient, logger, refund } = review;
+    if (sender == null) throw new Error("Sender is required");
+    if (recipient == null) throw new Error("Recipient is required");
+    if (refund == null) throw new Error("Refund is required");
 
     if (review.qoute === "withdraw") {
       if (sender === "qr") throw new Error("Sender is QR");

package/src/stellar/wallet.ts

@@ -53,12 +53,17 @@ class StellarWallet extends OmniWallet {
   }
 
   async fetchBalances(chain: number): Promise<Record<string, bigint>> {
+    console.log("fetchBalances", chain);
     if (chain === Network.Omni) return await super.fetchBalances(chain);
     try {
-      return await super.fetchBalances(chain);
-    } catch {
+      const balances = await super.fetchBalances(chain);
+      console.log("balances", balances);
+      return balances;
+    } catch (e) {
+      console.log("error", e);
       const data = await fetch(`https://horizon.stellar.org/accounts/${this.address}`).then((res) => res.json());
-      const balances = data.balances?.map((ft: { asset_type: string; sponsor?: string | null; asset_code: string; asset_issuer: string; balance: string }) => {
+      console.log("data", data);
+      const balances: [string, bigint][] = data.balances?.map((ft: { asset_type: string; sponsor?: string | null; asset_code: string; asset_issuer: string; balance: string }) => {
         const asset = ft.asset_type === "native" ? Asset.native() : new Asset(ft.asset_code, ft.asset_issuer);
         const contractId = ft.asset_type === "native" ? "native" : asset.contractId(Networks.PUBLIC);
 
@@ -73,7 +78,7 @@ class StellarWallet extends OmniWallet {
         return [contractId, BigInt(formatter.parseAmount(ft.balance, 7))];
       });
 
-      Object.entries(balances).forEach(([address, balance]) => this.setBalance(`${chain}:${address}`, BigInt(balance as string)));
+      balances.forEach(([address, balance]) => this.setBalance(`${chain}:${address}`, balance));
       return Object.fromEntries(balances);
     }
   }

package/src/ui/bridge/Bridge.tsx

@@ -142,6 +142,17 @@ export const Bridge = observer(({ hot, widget, setup, onClose, onProcess, onSele
     setIsReviewing(false);
   };
 
+  const openTooltip = (id: string) => {
+    const tooltip = document.getElementById(id);
+    if (!tooltip) return;
+    tooltip.style.transform = "translateY(0)";
+    tooltip.style.opacity = "1";
+    setTimeout(() => {
+      tooltip.style.transform = "translateY(8px)";
+      tooltip.style.opacity = "0";
+    }, 3000);
+  };
+
   const reviewSwap = useCallback(() => {
     reviewId.current = uuid4();
     const currentReviewId = reviewId.current;
@@ -151,9 +162,6 @@ export const Bridge = observer(({ hot, widget, setup, onClose, onProcess, onSele
 
     const refund = sender !== "qr" ? sender : hot.priorityWallet;
     if (valueInTokens <= 0) return throwError("Enter amount");
-    if (!sender) return throwError("Set sender");
-    if (!recipient) return throwError("Set recipient");
-    if (!refund) return throwError("Connect any wallet");
 
     const debounceTimer = setTimeout(async () => {
       try {
@@ -162,6 +170,12 @@ export const Bridge = observer(({ hot, widget, setup, onClose, onProcess, onSele
         const recipientWallet = hot.wallets.find((w) => w.address === recipient?.address && w.type === recipient?.type) || recipient;
         const review = await hot.exchange.reviewSwap({ recipient: recipientWallet, slippage: 0.005, sender, refund, amount, type, from, to });
         if (currentReviewId !== reviewId.current) return;
+
+        if (amount > 0) {
+          if (!sender) setTimeout(() => openTooltip("sender-tooltip"), 100);
+          if (!recipient) openTooltip("recipient-tooltip");
+        }
+
         setIsReviewing(false);
         setIsError(null);
         setReview(review);
@@ -283,8 +297,8 @@ export const Bridge = observer(({ hot, widget, setup, onClose, onProcess, onSele
   }
 
   const button = () => {
-    if (sender == null) return <ActionButton disabled>Set sender</ActionButton>;
-    if (recipient == null) return <ActionButton disabled>Set recipient</ActionButton>;
+    if (sender == null) return <ActionButton disabled>Confirm</ActionButton>;
+    if (recipient == null) return <ActionButton disabled>Confirm</ActionButton>;
     if (sender !== "qr" && +from.float(hot.balance(sender, from)).toFixed(FIXED) < +amountFrom.toFixed(FIXED)) return <ActionButton disabled>Insufficient balance</ActionButton>;
     return (
       <ActionButton style={{ width: "100%", marginTop: 40 }} disabled={isReviewing || isError != null} onClick={handleConfirm}>
@@ -307,6 +321,7 @@ export const Bridge = observer(({ hot, widget, setup, onClose, onProcess, onSele
 
             <div style={{ display: "flex", alignItems: "center", gap: 8 }}>
               <PSmall>Sender:</PSmall>
+
               <BadgeButton
                 onClick={() => {
                   if (from.type === WalletType.OMNI) openSelectSender({ hot, type: from.type, onSelect: (sender) => setSender(sender) });
@@ -314,6 +329,9 @@ export const Bridge = observer(({ hot, widget, setup, onClose, onProcess, onSele
                 }}
               >
                 <PSmall>{sender == null ? "Select" : sender !== "qr" ? formatter.truncateAddress(sender.address, 8) : "QR"}</PSmall>
+                <Tooltip id="sender-tooltip">
+                  <PSmall>Select sender wallet</PSmall>
+                </Tooltip>
               </BadgeButton>
             </div>
           </CardHeader>
@@ -433,6 +451,9 @@ export const Bridge = observer(({ hot, widget, setup, onClose, onProcess, onSele
               <PSmall>Recipient:</PSmall>
               <BadgeButton onClick={() => openSelectRecipient({ hot, chain: to.chain, onSelect: (recipient) => setRecipient(recipient) })}>
                 <PSmall>{recipient == null ? "Select" : formatter.truncateAddress(recipient.address, 8)}</PSmall>
+                <Tooltip id="recipient-tooltip">
+                  <PSmall>Select recipient wallet</PSmall>
+                </Tooltip>
               </BadgeButton>
             </div>
           </CardHeader>
@@ -495,6 +516,41 @@ const TokenPreview = ({ style, token, onSelect }: { style?: React.CSSProperties;
   );
 };
 
+const Tooltip = styled.div`
+  transition: 0.2s transform, 0.2s opacity;
+  transform: translateY(8px);
+  opacity: 0;
+  position: absolute;
+  top: -48px;
+  right: 0;
+  z-index: 100000000;
+  border-radius: 16px;
+  background: var(--surface-white, #fff);
+  padding: 4px 12px;
+  justify-content: center;
+  pointer-events: none;
+  align-items: center;
+  gap: 4px;
+
+  p {
+    white-space: nowrap;
+    color: #000;
+  }
+
+  &::after {
+    content: "";
+    position: absolute;
+    top: 100%;
+    right: 8px;
+    transform: translateX(-50%);
+    width: 0;
+    height: 0;
+    border-left: 8px solid transparent;
+    border-right: 8px solid transparent;
+    border-top: 8px solid #fff;
+  }
+`;
+
 const BadgeButton = styled.button`
   display: flex;
   border-radius: 8px;
@@ -502,6 +558,7 @@ const BadgeButton = styled.button`
   padding: 4px 8px;
   background: transparent;
   transition: 0.2s border-color;
+  position: relative;
   cursor: pointer;
   outline: none;
   gap: 4px;

package/src/ui/bridge/SelectRecipient.tsx

@@ -25,10 +25,7 @@ interface SelectRecipientProps {
 }
 
 export const SelectRecipient = observer(({ recipient, hot, chain, onSelect, onClose }: SelectRecipientProps) => {
-  const connectors = hot.connectors.filter((t) => t.walletTypes.includes(type) && t.type !== ConnectorType.SOCIAL);
   const [customAddress, setCustomAddress] = useState<string>(recipient?.address || "");
-
-  const isError = !Recipient.isValidAddress(chain, customAddress) && customAddress.length > 0;
   const type = chains.get(chain)?.type;
 
   if (!type)
@@ -38,6 +35,9 @@ export const SelectRecipient = observer(({ recipient, hot, chain, onSelect, onCl
       </Popup>
     );
 
+  const connectors = hot.connectors.filter((t) => t.walletTypes.includes(type) && t.type !== ConnectorType.SOCIAL);
+  const isError = !Recipient.isValidAddress(chain, customAddress) && customAddress.length > 0;
+
   const selectCustom = async () => {
     const recipient = await Recipient.fromAddress(type, customAddress);
     onSelect(recipient);