@hot-labs/kit 1.0.55 → 1.0.57

package/src/solana/injected/index.ts

@@ -1,6 +1,6 @@
 import { Transaction, VersionedTransaction, PublicKey } from "@solana/web3.js";
 
-import { isInjected, requestHot } from "../../hot-wallet/iframe";
+import HOT from "../../hot-wallet/iframe";
 import { registerWallet } from "./register";
 import { GhostWallet } from "./solana-wallet";
 
@@ -25,17 +25,17 @@ const hotSolana = {
   publicKey: null as PublicKey | null,
 
   async connect(options: any) {
-    const { publicKey } = await requestHot("solana:connect", options);
+    const { publicKey } = await HOT.request("solana:connect", options);
     hotSolana.publicKey = new PublicKey(publicKey);
     return { publicKey: hotSolana.publicKey };
   },
 
   async disconnect() {
-    return await requestHot("solana:disconnect", {});
+    return await HOT.request("solana:disconnect", {});
   },
 
   async signAllTransactions(transactions: any[]) {
-    const result = await requestHot("solana:signAllTransactions", {
+    const result = await HOT.request("solana:signAllTransactions", {
       transactions: transactions.map((t) => t.serialize().toString("base64")),
     });
 
@@ -43,7 +43,7 @@ const hotSolana = {
   },
 
   async signTransaction(transaction: any) {
-    const result = await requestHot("solana:signAllTransactions", {
+    const result = await HOT.request("solana:signAllTransactions", {
       transactions: [transaction.serialize().toString("base64")],
     });
 
@@ -51,7 +51,7 @@ const hotSolana = {
   },
 
   async signAndSendTransaction(transaction: any, options: any) {
-    const result = await requestHot("solana:signAndSendTransaction", {
+    const result = await HOT.request("solana:signAndSendTransaction", {
       transaction: transaction.serialize().toString("base64"),
       options,
     });
@@ -61,11 +61,10 @@ const hotSolana = {
 
   async signIn(input: any) {
     throw "Not supported";
-    return await requestHot("solana:signIn", input);
   },
 
   async signMessage(message: string) {
-    const result = await requestHot("solana:signMessage", { message: Buffer.from(message).toString("base64") });
+    const result = await HOT.request("solana:signMessage", { message: Buffer.from(message).toString("base64") });
     return { signature: Buffer.from(result.signature, "base64") };
   },
 
@@ -84,15 +83,13 @@ HOT.subscribe("solana:accountChanged", (publicKey: string | null) => {
 });
 */
 
-if (isInjected()) {
-  registerWallet(new GhostWallet(hotSolana));
+registerWallet(new GhostWallet(hotSolana));
 
-  // New wallets no longer need to register wallet globals - and can
-  // ignore the code below. However if you have legacy apps relying on globals,
-  // this is the safest way to attach the reference to the window, guarding against errors.
-  try {
-    Object.defineProperty(window, "hotSolana", { value: hotSolana });
-  } catch (error) {
-    //
-  }
+// New wallets no longer need to register wallet globals - and can
+// ignore the code below. However if you have legacy apps relying on globals,
+// this is the safest way to attach the reference to the window, guarding against errors.
+try {
+  Object.defineProperty(window, "hotSolana", { value: hotSolana });
+} catch (error) {
+  //
 }

package/src/stellar/connector.ts

@@ -1,68 +1,81 @@
-import { sep43Modules, HotWalletModule, StellarWalletsKit, WalletNetwork, ISupportedWallet } from "@creit.tech/stellar-wallets-kit";
 import { Transaction } from "@stellar/stellar-base";
 
+import HOT from "../hot-wallet/iframe";
 import { WalletType } from "../core/chains";
 import { HotConnector } from "../HotConnector";
 import { ConnectorType, OmniConnector } from "../OmniConnector";
-import { isInjected } from "../hot-wallet/iframe";
 import { OmniWallet } from "../OmniWallet";
-import StellarWallet from "./wallet";
 
-class StellarConnector extends OmniConnector<StellarWallet, ISupportedWallet> {
-  stellarKit: StellarWalletsKit;
+import { FreighterModule } from "./freigher";
+import { HotWalletModule } from "./hotWallet";
+import StellarWallet from "./wallet";
 
+class StellarConnector extends OmniConnector<StellarWallet> {
   icon = "https://storage.herewallet.app/upload/1469894e53ca248ac6adceb2194e6950a13a52d972beb378a20bce7815ba01a4.png";
   walletTypes = [WalletType.STELLAR, WalletType.OMNI];
   type = ConnectorType.WALLET;
   name = "Stellar Wallet";
   id = "stellar";
 
-  constructor(wibe3: HotConnector, stellarKit?: StellarWalletsKit) {
-    super(wibe3);
+  modules = {
+    hotWallet: new HotWalletModule(),
+    freighter: new FreighterModule(),
+  };
 
-    this.stellarKit = stellarKit || new StellarWalletsKit({ network: WalletNetwork.PUBLIC, modules: isInjected() ? [new HotWalletModule()] : sep43Modules() });
-    this.stellarKit.getSupportedWallets().then((wallets) => {
-      const hot = wallets.find((w) => w.id === "hot-wallet");
-      this.options = wallets.filter((w) => w.id !== "hot-wallet").map((w) => ({ ...w, name: w.name, icon: w.icon, download: w.url, type: "external" as const, id: w.id }));
-      if (hot) this.options.unshift({ ...hot, name: hot.name, icon: hot.icon, download: hot.url, type: "external" as const, id: hot.id });
-    });
+  constructor(wibe3: HotConnector) {
+    super(wibe3);
 
-    this.getConnectedWallet().then((data) => {
-      if (!data || !this.stellarKit) throw "No wallet";
+    this.options = Object.values(this.modules).map((module) => ({
+      type: "external" as const,
+      name: module.productName,
+      icon: module.productIcon,
+      download: module.productUrl,
+      id: module.productId,
+    }));
 
-      this.stellarKit.setWallet(data.id!);
-      const signMessage = async (message: string) => this.stellarKit.signMessage(message);
-      const signTransaction = async (transaction: Transaction) => this.stellarKit.signTransaction(transaction.toXDR());
-      this.setWallet(new StellarWallet(this, { address: data.address!, signMessage, signTransaction }));
+    this.getConnectedWallet().then(async ({ id, address }) => {
+      if (!id || !address) return;
+      const wallet = this.getWallet(id);
+      const isAvailable = await wallet?.isAvailable();
+      if (isAvailable && wallet) this.selectWallet(address, wallet);
     });
   }
 
+  getWallet(id: string): FreighterModule | HotWalletModule | null {
+    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 (isInjected()) {
-      this.stellarKit.setWallet("hot-wallet");
-      const { address } = await this.stellarKit.getAddress();
-      return { type: "wallet", id: "hot-wallet", address };
+    if (HOT.isInjected) {
+      const { address } = await this.modules.hotWallet.getAddress();
+      return { type: "wallet", id: this.modules.hotWallet.productId, address };
     }
 
     return await this.getStorage();
   }
 
+  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 }));
+  }
+
   async connect(id: string) {
-    this.stellarKit.setWallet(id);
-    const { address } = await this.stellarKit.getAddress();
-    const signMessage = async (message: string) => this.stellarKit.signMessage(message);
-    const signTransaction = async (transaction: Transaction) => this.stellarKit.signTransaction(transaction.toXDR());
+    const wallet = this.getWallet(id);
+    if (!wallet) throw new Error("Wallet not found");
+
+    const { address } = await wallet.getAddress();
     this.setStorage({ type: "wallet", id, address });
-    return this.setWallet(new StellarWallet(this, { address, signMessage, signTransaction }));
+    return this.selectWallet(address, wallet);
   }
 
   async disconnect() {
     super.disconnect();
-    this.stellarKit.disconnect();
+    this.removeStorage();
   }
 }
 

package/src/stellar/freigher.ts

@@ -0,0 +1,119 @@
+import { isConnected, requestAccess, getAddress, signTransaction, signAuthEntry, signMessage, getNetwork } from "@stellar/freighter-api";
+
+declare global {
+  interface Window {
+    stellar?: {
+      provider: string;
+      platform: string;
+    };
+  }
+}
+
+function parseError(e: any) {
+  return {
+    code: e?.error?.code || e?.code || -1,
+    message: e?.error?.message || e?.message || (typeof e === "string" && e) || "Unhandled error from the wallet",
+    ext: e?.error?.ext || e?.ext,
+  };
+}
+
+const FREIGHTER_ID = "freighter";
+export class FreighterModule {
+  productId = FREIGHTER_ID;
+  productName = "Freighter";
+  productUrl = "https://freighter.app";
+  productIcon = "https://stellar.creit.tech/wallet-icons/freighter.png";
+
+  async runChecks() {
+    if (!(await this.isAvailable())) {
+      throw new Error("Freighter is not connected");
+    }
+  }
+
+  async isAvailable() {
+    if (window.stellar?.provider === "freighter" && window.stellar?.platform === "mobile") return false;
+    return isConnected()
+      .then(({ isConnected: isConnected2, error }) => !error && isConnected2)
+      .catch(() => false);
+  }
+
+  async getAddress(params?: { skipRequestAccess?: boolean }): Promise<{ address: string }> {
+    return this.runChecks()
+      .then(async () => {
+        if (params?.skipRequestAccess) return true;
+        return requestAccess();
+      })
+      .then(() => getAddress())
+      .then(({ address, error }) => {
+        if (error) throw error;
+        if (!address)
+          throw {
+            code: -3,
+            message: "Getting the address is not allowed, please request access first.",
+          };
+        return { address };
+      })
+      .catch((e) => {
+        throw parseError(e);
+      });
+  }
+  async signTransaction(xdr: string, opts?: { address?: string; networkPassphrase?: string }): Promise<{ signedTxXdr: string; signerAddress?: string }> {
+    return this.runChecks()
+      .then(async () => {
+        const { signedTxXdr, signerAddress, error } = await signTransaction(xdr, {
+          address: opts?.address,
+          networkPassphrase: opts?.networkPassphrase,
+        });
+        if (error) throw error;
+        return { signedTxXdr, signerAddress };
+      })
+      .catch((e) => {
+        throw parseError(e);
+      });
+  }
+
+  async signAuthEntry(authEntry: string, opts?: { address?: string; networkPassphrase?: string }): Promise<{ signedAuthEntry: string; signerAddress?: string }> {
+    return this.runChecks()
+      .then(async () => {
+        const { signedAuthEntry, signerAddress, error } = await signAuthEntry(authEntry, {
+          address: opts?.address,
+          networkPassphrase: opts?.networkPassphrase,
+        });
+        if (error || !signedAuthEntry) throw error;
+        return { signedAuthEntry: Buffer.from(signedAuthEntry).toString("base64"), signerAddress };
+      })
+      .catch((e) => {
+        throw parseError(e);
+      });
+  }
+
+  async signMessage(message: string, opts?: { address?: string; networkPassphrase?: string }): Promise<{ signedMessage: string; signerAddress?: string }> {
+    return this.runChecks()
+      .then(async () => {
+        const { signedMessage, signerAddress, error } = await signMessage(message, {
+          address: opts?.address,
+          networkPassphrase: opts?.networkPassphrase,
+        });
+        if (error || !signedMessage) throw error;
+        return {
+          signedMessage: typeof signedMessage === "string" ? signedMessage : Buffer.from(signedMessage).toString("base64"),
+          signerAddress,
+        };
+      })
+      .catch((e) => {
+        throw parseError(e);
+      });
+  }
+
+  async getNetwork(): Promise<{ network: string; networkPassphrase: string }> {
+    return this.runChecks()
+      .then(async () => {
+        const { network, networkPassphrase, error } = await getNetwork();
+        if (error) throw error;
+        return { network, networkPassphrase };
+      })
+      .catch((e) => {
+        throw parseError(e);
+      });
+  }
+}

package/src/stellar/{injected.ts → hotWallet.ts}

@@ -1,13 +1,9 @@
-import { type ModuleInterface, ModuleType, WalletNetwork } from "@creit.tech/stellar-wallets-kit";
-import { requestHot } from "../hot-wallet/iframe";
+import { Networks } from "@stellar/stellar-sdk";
+import HOT from "../hot-wallet/iframe";
 
 export const HOTWALLET_ID: string = "hot-wallet";
 
-/**
- * **IMPORTANT**: This module requires that you have a "global" and a "Buffer" polyfill in your app, if not provided then this module will break your app.
- */
-export class HotWalletModule implements ModuleInterface {
-  moduleType: ModuleType = ModuleType.HOT_WALLET;
+export class HotWalletModule {
   productId: string = HOTWALLET_ID;
   productName: string = "HOT Wallet";
   productUrl: string = "https://hot-labs.org/wallet";
@@ -18,22 +14,22 @@ export class HotWalletModule implements ModuleInterface {
   }
 
   async getAddress(): Promise<{ address: string }> {
-    return await requestHot("stellar:getAddress", {});
+    return await HOT.request("stellar:getAddress", {});
   }
 
   async signTransaction(xdr: string, opts?: { address?: string }): Promise<{ signedTxXdr: string; signerAddress?: string }> {
-    return await requestHot("stellar:signTransaction", { xdr, accountToSign: opts?.address });
+    return await HOT.request("stellar:signTransaction", { xdr, accountToSign: opts?.address });
   }
 
   async signAuthEntry(authEntry: string, opts?: { address?: string }): Promise<{ signedAuthEntry: string; signerAddress?: string }> {
-    return await requestHot("stellar:signAuthEntry", { authEntry, accountToSign: opts?.address });
+    return await HOT.request("stellar:signAuthEntry", { authEntry, accountToSign: opts?.address });
   }
 
   async signMessage(message: string, opts?: { address?: string }): Promise<{ signedMessage: string; signerAddress?: string }> {
-    return await requestHot("stellar:signMessage", { message, accountToSign: opts?.address });
+    return await HOT.request("stellar:signMessage", { message, accountToSign: opts?.address });
   }
 
   async getNetwork(): Promise<{ network: string; networkPassphrase: string }> {
-    return { network: "mainnet", networkPassphrase: WalletNetwork.PUBLIC };
+    return { network: "mainnet", networkPassphrase: Networks.PUBLIC };
   }
 }

package/src/ton/connector.ts

@@ -1,10 +1,10 @@
-import { TonConnectUI, TonConnect } from "@tonconnect/ui";
+import { TonConnectUI, TonConnect, Feature } from "@tonconnect/ui";
 import { runInAction } from "mobx";
 
 import { WalletType } from "../core/chains";
 import { HotConnector } from "../HotConnector";
 import { ConnectorType, OmniConnector } from "../OmniConnector";
-import { isInjected } from "../hot-wallet/iframe";
+import HOT from "../hot-wallet/iframe";
 import TonWallet from "./wallet";
 
 export interface TonConnectorOptions {
@@ -30,6 +30,8 @@ const hotWallet = {
   ],
 };
 
+const isSignDataFeature = (feature: Feature) => typeof feature === "object" && feature.name === "SignData" && feature.types.includes("text");
+
 class TonConnector extends OmniConnector<TonWallet> {
   type = ConnectorType.WALLET;
   walletTypes = [WalletType.TON, WalletType.OMNI];
@@ -78,13 +80,15 @@ class TonConnector extends OmniConnector<TonWallet> {
     tonConnect.connector.restoreConnection();
     tonConnect.getWallets().then((wallets) => {
       runInAction(() => {
-        this.options = wallets.map((w) => ({
-          name: w.name,
-          icon: w.imageUrl,
-          id: w.appName,
-          download: w.aboutUrl,
-          type: "external" as const,
-        }));
+        this.options = wallets
+          .filter((t) => t.features?.some(isSignDataFeature))
+          .map((w) => ({
+            name: w.name,
+            icon: w.imageUrl,
+            id: w.appName,
+            download: w.aboutUrl,
+            type: "external" as const,
+          }));
       });
     });
 
@@ -94,7 +98,7 @@ class TonConnector extends OmniConnector<TonWallet> {
       tcRoot.style.position = "fixed";
     }
 
-    if (isInjected()) {
+    if (HOT.isInjected) {
       tonConnect.getWallets().then((wallets) => {
         const wallet = wallets.find((w) => w.appName === "hot");
         if (wallet) tonConnect.connector.connect(wallet, { tonProof: "wibe3" });

package/src/ton/injected.ts

@@ -1,6 +1,6 @@
-import { isInjected, requestHot } from "../hot-wallet/iframe";
+import HOT from "../hot-wallet/iframe";
 
-if (isInjected()) {
+if (HOT.isInjected) {
   // @ts-expect-error: hotWallet is not defined
   window.hotWallet = {
     tonconnect: {
@@ -33,19 +33,19 @@ if (isInjected()) {
       isWalletBrowser: true,
 
       connect: (_: number, request: any) => {
-        return requestHot("ton:connect", request);
+        return HOT.request("ton:connect", request);
       },
 
       restoreConnection: () => {
-        return requestHot("ton:restoreConnection", {});
+        return HOT.request("ton:restoreConnection", {});
       },
 
       disconnect: () => {
-        return requestHot("ton:disconnect", {});
+        return HOT.request("ton:disconnect", {});
       },
 
       send: async (request: any) => {
-        return requestHot("ton:send", request);
+        return HOT.request("ton:send", request);
       },
 
       listen: () => {

package/src/ui/Popup.tsx

@@ -65,9 +65,13 @@ const Popup = ({ widget, children, header, onClose, style, mobileFullscreen }: P
           )}
           <ModalBody style={{ overflowX: "hidden", ...style }}>{children}</ModalBody>
           <Footer>
-            <img src="https://tgapp.herewallet.app/images/hot/hot-icon.png" alt="HOT Connector" />
-            <p>HOT Connector</p>
-            <GetWalletLink href="https://download.hot-labs.org/kit" target="_blank">
+            <GetWalletLink href="https://hot-labs.org" rel="noreferrer" target="_blank" style={{ marginLeft: 0, display: "flex", alignItems: "center", gap: 4 }}>
+              <p>Secured by</p>
+              <img src="https://tgapp.herewallet.app/images/hot/hot-icon.png" alt="HOT Labs" />
+              <p>HOT</p>
+            </GetWalletLink>
+
+            <GetWalletLink href="https://download.hot-labs.org/kit" rel="noreferrer" target="_blank">
               Don't have a wallet?
             </GetWalletLink>
           </Footer>

package/src/ui/payment/Bridge.tsx

@@ -165,8 +165,11 @@ export const Bridge = observer(({ hot, widget, setup, onClose, onProcess, onSele
 
   const process = async (review: BridgeReview) => {
     try {
-      setProcessing({ status: "processing", message: "Signing transaction", review });
-      const result = await hot.exchange.makeSwap(review, { log: (message: string) => setProcessing({ status: "processing", message, review }) });
+      const log = (message: string) => setProcessing({ status: "processing", message, review });
+      hot.hotBridge.logger = { log, warn: console.warn };
+      log("Signing transaction");
+
+      const result = await hot.exchange.makeSwap(review, { log });
       setProcessing({ status: "success", message: "Transaction signed", review: result });
       if (setup?.autoClose) onClose();
       return result;

package/src/ui/payment/Profile.tsx

@@ -111,7 +111,7 @@ export const Profile = observer(({ hot, onClose }: { hot: HotConnector; onClose:
                 </div>
 
                 <div style={{ marginLeft: "auto", padding: "8px 12px", borderRadius: 16, background: "#1a1a1a", color: "#fff" }}>
-                  <p style={{ color: "#d6d6d6" }}>{withdrawal.loading ? <Loader /> : "Complete"}</p>
+                  <p style={{ color: "#d6d6d6" }}>{withdrawal.loading ? <Loader /> : "Withdraw"}</p>
                 </div>
               </PopupOption>
             );

package/src/ui/styles.ts

@@ -169,17 +169,18 @@ export const Footer = styled.div`
 `;
 
 export const GetWalletLink = styled.a`
-  color: rgba(255, 255, 255, 0.5);
+  color: #fff;
   text-align: center;
   font-size: 16px;
   font-style: normal;
   font-weight: 500;
   margin-left: auto;
   text-decoration: none;
-  transition: color 0.2s ease-in-out;
+  transition: opacity 0.2s ease-in-out;
+  opacity: 0.8;
 
   &:hover {
-    color: rgba(255, 255, 255, 1);
+    opacity: 1;
   }
 `;
 

package/build/stellar/injected.js

@@ -1,32 +0,0 @@
-import { ModuleType, WalletNetwork } from "@creit.tech/stellar-wallets-kit";
-import { requestHot } from "../hot-wallet/iframe";
-export const HOTWALLET_ID = "hot-wallet";
-/**
- * **IMPORTANT**: This module requires that you have a "global" and a "Buffer" polyfill in your app, if not provided then this module will break your app.
- */
-export class HotWalletModule {
-    moduleType = ModuleType.HOT_WALLET;
-    productId = HOTWALLET_ID;
-    productName = "HOT Wallet";
-    productUrl = "https://hot-labs.org/wallet";
-    productIcon = "https://storage.herewallet.app/logo.png";
-    async isAvailable() {
-        return true;
-    }
-    async getAddress() {
-        return await requestHot("stellar:getAddress", {});
-    }
-    async signTransaction(xdr, opts) {
-        return await requestHot("stellar:signTransaction", { xdr, accountToSign: opts?.address });
-    }
-    async signAuthEntry(authEntry, opts) {
-        return await requestHot("stellar:signAuthEntry", { authEntry, accountToSign: opts?.address });
-    }
-    async signMessage(message, opts) {
-        return await requestHot("stellar:signMessage", { message, accountToSign: opts?.address });
-    }
-    async getNetwork() {
-        return { network: "mainnet", networkPassphrase: WalletNetwork.PUBLIC };
-    }
-}
-//# sourceMappingURL=injected.js.map

package/build/stellar/injected.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"injected.js","sourceRoot":"","sources":["../../src/stellar/injected.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,UAAU,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAClG,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,MAAM,CAAC,MAAM,YAAY,GAAW,YAAY,CAAC;AAEjD;;GAEG;AACH,MAAM,OAAO,eAAe;IAC1B,UAAU,GAAe,UAAU,CAAC,UAAU,CAAC;IAC/C,SAAS,GAAW,YAAY,CAAC;IACjC,WAAW,GAAW,YAAY,CAAC;IACnC,UAAU,GAAW,6BAA6B,CAAC;IACnD,WAAW,GAAW,yCAAyC,CAAC;IAEhE,KAAK,CAAC,WAAW;QACf,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,UAAU;QACd,OAAO,MAAM,UAAU,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,GAAW,EAAE,IAA2B;QAC5D,OAAO,MAAM,UAAU,CAAC,yBAAyB,EAAE,EAAE,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAC5F,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,SAAiB,EAAE,IAA2B;QAChE,OAAO,MAAM,UAAU,CAAC,uBAAuB,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAChG,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAe,EAAE,IAA2B;QAC5D,OAAO,MAAM,UAAU,CAAC,qBAAqB,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAC5F,CAAC;IAED,KAAK,CAAC,UAAU;QACd,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,aAAa,CAAC,MAAM,EAAE,CAAC;IACzE,CAAC;CACF"}