@hot-labs/kit 1.4.21 → 1.4.24

package/src/HotConnector.ts

@@ -22,6 +22,7 @@ import type EvmWallet from "./evm/wallet";
 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 { openBridge, openConnector, openProfile, openWalletPicker } from "./ui/router";
 import { ConnectorType, OmniConnector } from "./core/OmniConnector";
@@ -140,6 +141,7 @@ export class HotConnector {
     if (this.solana) return this.solana;
     if (this.ton) return this.ton;
     if (this.stellar) return this.stellar;
+    if (this.tron) return this.tron;
   }
 
   get wallets(): OmniWallet[] {
@@ -179,6 +181,10 @@ export class HotConnector {
     return this.wallets.find((w) => w.type === WalletType.STELLAR) as StellarWallet | null;
   }
 
+  get tron(): TronWallet | null {
+    return this.wallets.find((w) => w.type === WalletType.Tron) as TronWallet | null;
+  }
+
   get ton(): TonWallet | null {
     return this.wallets.find((w) => w.type === WalletType.TON) as TonWallet | null;
   }
@@ -342,10 +348,10 @@ export class HotConnector {
   }
 
   async connect(type?: WalletType) {
-    if (!type) return openConnector(this);
+    if (!type) return await 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 openWalletPicker(connector);
+    return await openWalletPicker(connector);
   }
 
   async disconnect(wallet: WalletType | OmniWallet) {

package/src/core/token.ts

@@ -68,7 +68,7 @@ export class Token {
   }
 
   get originalChainIcon() {
-    if (this.originalChain === Network.Juno) return "https://legacy.cosmos.network/presskit/cosmos-brandmark-dynamic-dark.svg";
+    if (this.originalChain === Network.Juno) return "https://cryptologos.cc/logos/cosmos-atom-logo.svg";
     return `https://storage.herewallet.app/ft/${this.originalChain}:native.png`;
   }
 

package/src/cosmos/connector.ts

@@ -100,7 +100,7 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
   }
 
   get icon() {
-    return chains.getByKey(this.chainId)?.logo || "https://legacy.cosmos.network/presskit/cosmos-brandmark-dynamic-dark.svg";
+    return chains.getByKey(this.chainId)?.logo || "";
   }
 
   get name() {

package/src/cosmos/wallet.ts

@@ -23,13 +23,16 @@ interface ProtocolWallet {
 }
 
 export default class CosmosWallet extends OmniWallet {
-  readonly icon = "https://legacy.cosmos.network/presskit/cosmos-brandmark-dynamic-dark.svg";
   readonly type = WalletType.COSMOS;
 
   constructor(readonly wallet: ProtocolWallet) {
     super();
   }
 
+  get icon() {
+    return chains.getByKey(this.wallet.chainId)?.logo || "";
+  }
+
   get address() {
     return this.wallet.account.address;
   }

package/src/hot-wallet/google.ts

@@ -32,6 +32,7 @@ class GoogleConnector extends OmniConnector<OmniWallet> {
     this.webWallet = options?.webWallet ?? "https://app.hot-labs.org";
     makeObservable(this, { connectWallet: action });
     this.getStorage().then((accounts: any) => {
+      if (!Array.isArray(accounts)) return;
       accounts.forEach((account: any) => this.connectWallet(account));
     });
   }

package/src/near/standalone.ts

@@ -21,8 +21,6 @@ export const createNearWallet = async (privateKeyBuf: Buffer, address?: string)
   const addr = address || hex.encode(publicKeyBuffer);
   const publicKey = `ed25519:${base58.encode(publicKeyBuffer)}`;
 
-  console.log({ publicKey });
-
   return new NearWallet(addr, publicKey, {
     manifest: {} as unknown as WalletManifest,
     signAndSendTransaction: async (params: SignAndSendTransactionParams) => {

package/src/solana/WalletStandard.ts

@@ -1,3 +1,4 @@
+import { base58 } from "@scure/base";
 import type { Connection, Transaction, VersionedTransaction } from "@solana/web3.js";
 import type { Wallet } from "@wallet-standard/base";
 
@@ -9,12 +10,15 @@ export interface ISolanaProtocolWallet {
 }
 
 class SolanaProtocolWallet implements ISolanaProtocolWallet {
-  constructor(readonly wallet: Wallet, readonly address: string) {}
+  readonly address: string;
+  constructor(readonly wallet: Wallet, readonly publicKey: Uint8Array) {
+    this.address = base58.encode(publicKey);
+  }
 
   static async connect(wallet: Wallet, { silent = false }: { silent?: boolean } = {}): Promise<ISolanaProtocolWallet> {
-    const a = new SolanaProtocolWallet(wallet, "");
+    const a = new SolanaProtocolWallet(wallet, new Uint8Array(32));
     const account = await a.getAccount({ silent });
-    return new SolanaProtocolWallet(wallet, account.address);
+    return new SolanaProtocolWallet(wallet, new Uint8Array(account.publicKey));
   }
 
   async getAccount({ silent = false }: { silent?: boolean } = {}) {
@@ -28,6 +32,7 @@ class SolanaProtocolWallet implements ISolanaProtocolWallet {
     }
 
     if (!accounts.length) throw new Error("No account found");
+    if (!accounts[0].publicKey) throw new Error("No account found");
     return accounts[0];
   }
 

package/src/solana/connector.ts

@@ -98,6 +98,7 @@ class SolanaConnector extends OmniConnector<SolanaWallet, { wallet: Wallet }> {
     return this.setWallet(
       new SolanaWallet({
         address: account,
+        disconnect: () => this.disconnectWalletConnect(),
         sendTransaction: async (tx: Transaction | VersionedTransaction, connection: Connection, options?: any) => {
           const transaction = Buffer.from(tx.serialize()).toString("base64");
           const { signature } = await this.requestWalletConnect<{ signature: string }>({
@@ -114,8 +115,6 @@ class SolanaConnector extends OmniConnector<SolanaWallet, { wallet: Wallet }> {
           });
           return base58.decode(signature);
         },
-
-        disconnect: () => this.disconnectWalletConnect(),
       })
     );
   }

package/src/ui/profile/Profile.tsx

@@ -8,6 +8,7 @@ import ExchangeIcon from "../icons/exchange";
 import { ImageView } from "../uikit/image";
 import { Loader } from "../uikit/loader";
 
+import { OmniWallet } from "../../core/OmniWallet";
 import { ConnectorType } from "../../core/OmniConnector";
 import { formatter } from "../../core/utils";
 import { OmniToken } from "../../core/chains";
@@ -19,7 +20,7 @@ import { TokenCard, TokenIcon } from "../bridge/TokenCard";
 import { PopupOption } from "../styles";
 import Popup from "../Popup";
 
-export const Profile = observer(({ hot, onClose }: { hot: HotConnector; onClose: () => void }) => {
+export const Profile = observer(({ hot, onClose }: { hot: HotConnector; onClose: (wallet?: OmniWallet) => void }) => {
   let totalBalance = 0;
 
   const tokensList = hot.walletsTokens
@@ -68,7 +69,14 @@ export const Profile = observer(({ hot, onClose }: { hot: HotConnector; onClose:
         )}
 
         {hot.wallets.length < hot.connectors.length && (
-          <WalletCard style={{ paddingRight: 12 }} onClick={() => openConnector(hot)}>
+          <WalletCard
+            style={{ paddingRight: 12 }}
+            onClick={() =>
+              openConnector(hot)
+                .then((wallet) => onClose(wallet))
+                .catch(() => onClose())
+            }
+          >
             <PlusIcon />
             Add wallet
           </WalletCard>

package/src/ui/router.tsx

@@ -92,15 +92,16 @@ export const openBridge = (hot: HotConnector, setup?: BridgeProps["setup"]) => {
   });
 };
 
-export const openConnector = (hot: HotConnector) => {
+export const openConnector = async (hot: HotConnector) => {
   return new Promise<OmniWallet>((resolve, reject) => {
     present((close) => (
       <Connector
         hot={hot}
         onClose={(wallet) => {
-          close();
+          console.log("onClose", wallet);
           if (wallet) resolve(wallet);
           else reject(new Error("User rejected"));
+          close();
         }}
       />
     ));

package/CHANGELOG.md

@@ -1,3 +0,0 @@
-# 1.4.17
-
-- Fix google auth flow