@hot-labs/kit 1.1.2 → 1.2.0-alpha.1

package/src/core/index.ts

@@ -1,6 +1,6 @@
 export { OmniToken, WalletType, Network, chains } from "./chains";
 export { createHotBridge, HotBridge, ReviewFee } from "./bridge";
-export { rpc as nearRpc, TGAS } from "../near/rpc";
+export { rpc as nearRpc, TGAS } from "./nearRpc";
 export { EventEmitter } from "./events";
 export { Recipient } from "./recipient";
 export { formatter } from "./utils";

package/src/{near/rpc.ts → core/nearRpc.ts}

@@ -1,8 +1,6 @@
 import { JsonRpcProvider } from "@near-js/providers";
 import { getErrorTypeFromErrorMessage, parseRpcError } from "@near-js/utils";
 import { TypedError, FinalExecutionOutcome } from "@near-js/types";
-import { api } from "../core/api";
-import { Network } from "../core";
 
 let _nextId = 123;
 
@@ -24,13 +22,22 @@ const wait = (timeout: number) => {
   return new Promise<void>((resolve) => setTimeout(resolve, timeout));
 };
 
+const c1 = Math.random() > 0.5;
+export const rpcProviders = [
+  c1 ? "https://c1.rpc.fastnear.com" : "https://c2.rpc.fastnear.com",
+  c1 ? "https://c2.rpc.fastnear.com" : "https://c1.rpc.fastnear.com",
+  "https://relmn.aurora.dev",
+  "https://nearrpc.aurora.dev",
+  "https://archival-rpc.mainnet.near.org",
+];
+
 export class NearRpc extends JsonRpcProvider {
   public providers: string[];
   public currentProviderIndex = 0;
   public startTimeout;
 
-  constructor(providers = [api.getRpcUrl(Network.Near)], private timeout = 30_000, private triesCountForEveryProvider = 3, private incrementTimout = true) {
-    super({ url: api.getRpcUrl(Network.Near) });
+  constructor(providers = rpcProviders, private timeout = 30_000, private triesCountForEveryProvider = 3, private incrementTimout = true) {
+    super({ url: "" });
     this.currentProviderIndex = 0;
     this.providers = providers;
     this.startTimeout = timeout;

package/src/core/types.ts

@@ -40,30 +40,9 @@ export interface AuthCallIntent {
   intent: "auth_call";
 }
 
-export interface AddPublicKeyIntent {
-  intent: "add_public_key";
-  public_key: string;
-}
-
-export interface RemovePublicKeyIntent {
-  intent: "remove_public_key";
-  public_key: string;
-}
-
-export interface NftWithdrawIntent {
-  intent: "nft_withdraw";
-  token_id: string;
-  receiver_id: string;
-  memo?: string;
-  msg?: string;
-  min_gas?: string;
-}
-
 export interface Commitment {
   signature: string;
   public_key?: string;
   payload: Record<string, any> | string;
   standard: string;
 }
-
-export type Intent = TransferIntent | MtWithdrawIntent | FtWithdrawIntent | TokenDiffIntent | AuthCallIntent | AddPublicKeyIntent | RemovePublicKeyIntent | NftWithdrawIntent;

package/src/core/utils.ts

@@ -148,12 +148,7 @@ export const formatter = {
   },
 
   amount(value: Value, decimals = 24) {
-    if (+formatter.num(value) > 1_000_000_000_000_000_000) return `${formatter.round(+formatter.num(value) / 1_000_000_000_000_000, 2)}Q`;
-    if (+formatter.num(value) > 1_000_000_000_000_000) return `${formatter.round(+formatter.num(value) / 1_000_000_000_000, 2)}T`;
-    if (+formatter.num(value) > 1_000_000_000_000) return `${formatter.round(+formatter.num(value) / 1_000_000_000, 2)}B`;
-    if (+formatter.num(value) > 1_000_000_000) return `${formatter.round(+formatter.num(value) / 1_000_000, 2)}M`;
-    const num = formatter.num(value).toFixed(decimals);
-    if (+num === 0) return "0";
+    const num = String(+formatter.num(value).toFixed(decimals));
     return formatter.formatNumberWithSubscriptZeros(num, 3, 0.0001);
   },
 
@@ -165,15 +160,4 @@ export const formatter = {
   wait(ms: number) {
     return new Promise((resolve) => setTimeout(resolve, ms));
   },
-
-  chunk(array: any[], size: number) {
-    return array.reduce((acc, item, index) => {
-      const chunkIndex = Math.floor(index / size);
-      if (!acc[chunkIndex]) {
-        acc[chunkIndex] = [];
-      }
-      acc[chunkIndex].push(item);
-      return acc;
-    }, []);
-  },
 };

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, OmniConnectorOption, WC_ICON } from "../OmniConnector";
+import { ConnectorType, OmniConnector, WC_ICON } from "../OmniConnector";
 import { HotConnector } from "../HotConnector";
 import { OmniWallet } from "../OmniWallet";
 
@@ -20,9 +20,9 @@ declare global {
   }
 }
 
-const wallets: Record<string, OmniConnectorOption> = {
+const wallets = {
   keplr: {
-    name: "Keplr Wallet",
+    name: "Keplr",
     icon: "https://cdn.prod.website-files.com/667dc891bc7b863b5397495b/68a4ca95f93a9ab64dc67ab4_keplr-symbol.svg",
     download: "https://www.keplr.app/get",
     deeplink: "keplrwallet://wcV2?",
@@ -30,21 +30,13 @@ const wallets: Record<string, OmniConnectorOption> = {
     id: "keplr",
   },
   leap: {
-    name: "Leap Wallet",
+    name: "Leap",
     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> {
@@ -58,12 +50,28 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
   constructor(wibe3: HotConnector) {
     super(wibe3);
 
-    this.options = Object.values(wallets);
+    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",
+      },
+    ];
+
     Keplr.getKeplr().then((keplr) => {
       const option = this.options.find((option) => option.id === "keplr")!;
       runInAction(() => {
         option.type = keplr ? "extension" : "external";
-        option.name = keplr ? "Keplr Wallet" : "Keplr Mobile";
+        option.name = keplr ? "Keplr" : "Keplr Mobile";
       });
     });
 
@@ -105,7 +113,7 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
     return chains.getByType(WalletType.COSMOS).map((t) => t.key);
   }
 
-  async setupWalletConnect(id?: "keplr" | "leap" | "gonkaWallet"): Promise<CosmosWallet> {
+  async setupWalletConnect(id?: "keplr" | "leap"): Promise<CosmosWallet> {
     const wc = await this.wc;
     if (!wc) throw new Error("WalletConnect not found");
 
@@ -117,7 +125,7 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
     const address = account.bech32Address;
 
     this.setStorage({ type: "walletconnect", id });
-    const wallet = new CosmosWallet({
+    const wallet = new CosmosWallet(this, {
       address: address,
       publicKeyHex: publicKey,
       disconnect: () => this.disconnectWalletConnect(),
@@ -162,7 +170,7 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
 
   async setKeplrWallet(keplr: Keplr, address: string, publicKey: string) {
     return this.setWallet(
-      new CosmosWallet({
+      new CosmosWallet(this, {
         address: address,
         publicKeyHex: publicKey,
         disconnect: () => keplr.disable(),
@@ -175,7 +183,7 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
     );
   }
 
-  async connectKeplr(type: "keplr" | "leap" | "gonkaWallet", extension?: Keplr): Promise<OmniWallet | { qrcode: string; deeplink?: string; task: Promise<OmniWallet> }> {
+  async connectKeplr(type: "keplr" | "leap", extension?: Keplr): Promise<OmniWallet | { qrcode: string; deeplink?: string; task: Promise<OmniWallet> }> {
     if (!extension) {
       return await this.connectWalletConnect({
         onConnect: () => this.setupWalletConnect(type),
@@ -224,10 +232,6 @@ 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,6 +2,7 @@ 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 {
@@ -12,11 +13,10 @@ 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();
+  constructor(readonly connector: CosmosConnector, readonly wallet: ProtocolWallet) {
+    super(connector);
   }
 
   get address() {
@@ -31,6 +31,11 @@ export default class CosmosWallet extends OmniWallet {
     return "";
   }
 
+  async disconnect() {
+    super.disconnect();
+    this.wallet.disconnect?.();
+  }
+
   sendTransaction(signDoc: any): Promise<string> {
     if (!this.wallet.sendTransaction) throw "Not impl";
     return this.wallet.sendTransaction(signDoc);

package/src/evm/connector.ts

@@ -121,11 +121,6 @@ class EvmConnector extends OmniConnector<EvmWallet, { provider: EvmProvider }> {
 
     return await this.connectWallet(id, wallet.provider);
   }
-
-  async disconnect() {
-    this.wallets.forEach((w) => w.disconnect());
-    super.disconnect();
-  }
 }
 
 export default EvmConnector;

package/src/evm/wallet.ts

@@ -22,15 +22,7 @@ class EvmWallet extends OmniWallet {
   readonly type = WalletType.EVM;
 
   constructor(readonly connector: OmniConnector, readonly address: string, readonly provider: EvmProvider) {
-    super();
-  }
-
-  async disconnect() {
-    await this.provider.request?.({ method: "wallet_revokePermissions", params: [{ eth_accounts: {} }] });
-  }
-
-  get icon() {
-    return this.connector.icon;
+    super(connector);
   }
 
   private rpcs: Record<number, JsonRpcProvider> = {};
@@ -50,6 +42,11 @@ class EvmWallet extends OmniWallet {
     return this.address.toLowerCase();
   }
 
+  async disconnect() {
+    this.provider.request?.({ method: "wallet_revokePermissions", params: [{ eth_accounts: {} }] });
+    await super.disconnect();
+  }
+
   async fetchBalances(chain: number, whitelist: string[]): Promise<Record<string, bigint>> {
     const native = await this.fetchBalance(chain, "native");
     try {

package/src/exchange.ts

@@ -184,7 +184,7 @@ export class Exchange {
     if (!intentFrom) throw new Error("Unsupported token");
     if (!intentTo) throw new Error("Unsupported token");
 
-    const deadlineTime = 5 * 60 * 1000;
+    const deadlineTime = 20 * 60 * 1000;
     const directChains = [Network.Near, Network.Juno, Network.Gonka, Network.ADI];
     const deadline = new Date(Date.now() + deadlineTime).toISOString();
     const noFee = from.symbol === to.symbol || (from.symbol.toLowerCase().includes("usd") && to.symbol.toLowerCase().includes("usd"));
@@ -282,7 +282,10 @@ export class Exchange {
     if (request.from.chain !== Network.Hot && sender !== "qr") {
       const amount = BigInt(qoute.quote.amountIn);
       const depositAddress = qoute.quote.depositAddress!;
-      fee = await sender.transferFee(request.from, depositAddress, amount).catch(() => null);
+      fee = await sender.transferFee(request.from, depositAddress, amount).catch((e) => {
+        console.error("Failed to calculate transfer fee", e);
+        return null;
+      });
     }
 
     return {
@@ -300,7 +303,7 @@ export class Exchange {
     };
   }
 
-  async makeSwap(review: BridgeReview, pending: { log: (message: string) => void }): Promise<{ review: BridgeReview; processing?: () => Promise<BridgeReview> }> {
+  async makeSwap(review: BridgeReview, pending: { log: (message: string) => void }) {
     const { sender, recipient } = review;
 
     if (review.qoute === "withdraw") {
@@ -309,7 +312,7 @@ export class Exchange {
       const recipientWallet = this.wibe3.wallets.find((w) => w.address === recipient.address);
       if (recipientWallet) this.wibe3.fetchToken(review.to, recipientWallet);
       this.wibe3.fetchToken(review.from, sender);
-      return { review };
+      return review;
     }
 
     if (review.qoute === "deposit") {
@@ -319,7 +322,7 @@ export class Exchange {
 
       const recipientWallet = this.wibe3.wallets.find((w) => w.address === recipient.address);
       if (recipientWallet) this.wibe3.fetchToken(review.to, recipientWallet);
-      return { review };
+      return review;
     }
 
     if (sender !== "qr") {
@@ -334,41 +337,44 @@ 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 })
+        hash = await sender.intents
+          .transfer({
+            amount: review.amountIn,
+            token: review.from.address as OmniToken,
+            recipient: depositAddress,
+          })
           .execute();
       } else {
         hash = await sender.transfer({
           receiver: depositAddress,
           amount: review.amountIn,
           comment: review.qoute.depositMemo,
-          gasFee: review.fee ?? undefined,
           token: review.from,
+          gasFee: review.fee ?? undefined,
         });
       }
 
+      pending.log("Submitting tx");
       this.wibe3.fetchToken(review.from, sender);
-      OneClickService.submitDepositTx({ txHash: hash, depositAddress }).catch(() => {});
+      await OneClickService.submitDepositTx({ txHash: hash, depositAddress }).catch(() => {});
     }
 
-    return {
-      review,
-      processing: async () => {
-        const recipientWallet = this.wibe3.wallets.find((w) => w.address === recipient.address);
-        if (!recipientWallet) return await this.processing(review);
+    if (sender !== "qr") {
+      wait(1000).then(() => this.wibe3.fetchToken(review.to, sender));
+    }
 
-        const beforeBalance = await this.wibe3.fetchToken(review.to, recipientWallet).catch(() => null);
-        if (!beforeBalance) return await this.processing(review);
+    pending.log("Processing...");
+    const recipientWallet = this.wibe3.wallets.find((w) => w.address === recipient.address);
+    if (!recipientWallet) return await this.processing(review);
 
-        return await Promise.race([
-          this.waitBalance(review.to, recipientWallet, beforeBalance, review),
-          this.processing(review), //
-        ]);
-      },
-    };
+    const beforeBalance = await this.wibe3.fetchToken(review.to, recipientWallet).catch(() => null);
+    if (!beforeBalance) return await this.processing(review);
+
+    return await Promise.race([
+      this.waitBalance(review.to, recipientWallet, beforeBalance, review),
+      this.processing(review), //
+    ]);
   }
 
   async waitBalance(to: Token, wallet: OmniWallet, beforeBalance: bigint, review: BridgeReview): Promise<BridgeReview> {

package/src/hot-wallet/google.ts

@@ -50,19 +50,12 @@ class GoogleConnector extends OmniConnector<OmniWallet> {
     if (account.type === WalletType.STELLAR) {
       const signMessage = async (message: string) => request("stellar:signMessage", { message });
       const signTransaction = async (transaction: Transaction) => request("stellar:signTransaction", { transaction: transaction.toXDR() });
-      this.wallets.push(
-        new StellarWallet({
-          rpc: this.wibe3.hotBridge.stellar,
-          address: account.address,
-          signMessage,
-          signTransaction,
-        })
-      );
+      this.wallets.push(new StellarWallet(this, { address: account.address, signMessage, signTransaction }));
     }
 
     if (account.type === WalletType.TON) {
       this.setWallet(
-        new TonWallet({
+        new TonWallet(this, {
           sendTransaction: (params) => request("ton:sendTransaction", params),
           signData: (params) => request("ton:signData", params),
           account: { address: account.address, publicKey: account.publicKey },
@@ -72,21 +65,21 @@ class GoogleConnector extends OmniConnector<OmniWallet> {
 
     if (account.type === WalletType.NEAR) {
       this.setWallet(
-        new NearWallet(account.address, account.publicKey, {
+        new NearWallet(this, account.address, account.publicKey, {
           signAndSendTransaction: (params: SignAndSendTransactionParams) => request("near:signAndSendTransaction", params),
           signAndSendTransactions: (params: SignAndSendTransactionsParams) => request("near:signAndSendTransactions", params),
           signMessage: (params: SignMessageParams) => request("near:signMessage", params),
           getAccounts: async () => [{ accountId: account.address, publicKey: account.publicKey }],
           signIn: () => request("near:signIn", {}),
-          manifest: {} as unknown as WalletManifest,
           signOut: async () => {},
+          manifest: {} as unknown as WalletManifest,
         }) as NearWallet
       );
     }
 
     if (account.type === WalletType.SOLANA) {
       this.setWallet(
-        new SolanaWallet({
+        new SolanaWallet(this, {
           sendTransaction: async (transaction: unknown, _: unknown, options?: unknown) => await request("solana:sendTransaction", { transaction, options }),
           signMessage: async (message: string) => await request("solana:signMessage", { message }),
           disconnect: async () => {},

package/src/index.ts

@@ -1,5 +1,3 @@
-import "@lottiefiles/dotlottie-wc";
-
 export { OmniWallet } from "./OmniWallet";
 export { OmniConnector } from "./OmniConnector";
 export { HotConnector } from "./HotConnector";

package/src/near/connector.ts

@@ -28,7 +28,7 @@ class Connector extends OmniConnector<NearWallet> {
     this.connector.on("wallet:signOut", () => this.removeWallet());
     this.connector.getConnectedWallet().then(async ({ wallet }) => {
       const [account] = await wallet.getAccounts();
-      if (account) this.setWallet(new NearWallet(account.accountId, account.publicKey, wallet));
+      if (account) this.setWallet(new NearWallet(this, account.accountId, account.publicKey, wallet));
     });
 
     this.connector.whenManifestLoaded.then(() => {
@@ -49,7 +49,7 @@ class Connector extends OmniConnector<NearWallet> {
     if (!wallet) throw new Error("Wallet not found");
     const [account] = await wallet.getAccounts();
     if (!account) throw new Error("No account found");
-    return this.setWallet(new NearWallet(account.accountId, account.publicKey, wallet));
+    return this.setWallet(new NearWallet(this, account.accountId, account.publicKey, wallet));
   }
 
   async disconnect() {

package/src/near/wallet.ts

@@ -1,25 +1,30 @@
 import { NearWalletBase, SignMessageParams, SignedMessage, SignAndSendTransactionParams } from "@hot-labs/near-connect";
 import { base64, base58 } from "@scure/base";
 
+import { OmniConnector } from "../OmniConnector";
 import { OmniWallet } from "../OmniWallet";
 import { WalletType } from "../core/chains";
 import { ReviewFee } from "../core/bridge";
-import { rpc, TGAS } from "./rpc";
+import { rpc, TGAS } from "../core/nearRpc";
 import { Token } from "../core/token";
 import { Commitment } from "../core";
 
 export default class NearWallet extends OmniWallet {
-  readonly icon = "https://storage.herewallet.app/upload/73a44e583769f11112b0eff1f2dd2a560c05eed5f6d92f0c03484fa047c31668.png";
   readonly type = WalletType.NEAR;
 
-  constructor(readonly address: string, readonly publicKey?: string, readonly wallet?: NearWalletBase) {
-    super();
+  constructor(readonly connector: OmniConnector, readonly address: string, readonly publicKey?: string, readonly wallet?: NearWalletBase) {
+    super(connector);
   }
 
   get omniAddress() {
     return this.address;
   }
 
+  async disconnect() {
+    await this.wallet?.signOut();
+    super.disconnect();
+  }
+
   async fetchBalances(_: number, whitelist: string[]): Promise<Record<string, bigint>> {
     const balances = await Promise.all(
       whitelist.map(async (token) => {

package/src/solana/connector.ts

@@ -9,8 +9,8 @@ import { OmniWallet } from "../OmniWallet";
 import { WalletType } from "../core/chains";
 import HOT from "../hot-wallet/iframe";
 
-import SolanaProtocolWallet from "./WalletStandard";
-import { getWallets } from "./walletStandartList";
+import SolanaProtocolWallet from "./protocol";
+import { getWallets } from "./wallets";
 import SolanaWallet from "./wallet";
 
 const wallets = getWallets();
@@ -36,7 +36,7 @@ class SolanaConnector extends OmniConnector<SolanaWallet, { wallet: Wallet }> {
         const wallet = this.options.find((w) => w.id === id);
         if (!wallet) return;
         const protocolWallet = await SolanaProtocolWallet.connect(wallet.wallet, { silent: true });
-        this.setWallet(new SolanaWallet(protocolWallet));
+        this.setWallet(new SolanaWallet(this, protocolWallet));
       } catch {
         this.removeStorage();
       }
@@ -59,7 +59,7 @@ class SolanaConnector extends OmniConnector<SolanaWallet, { wallet: Wallet }> {
         const connected = await this.getConnectedWallet();
         if (connected !== wallet.name) return;
         const protocolWallet = await SolanaProtocolWallet.connect(wallet, { silent: true });
-        this.setWallet(new SolanaWallet(protocolWallet));
+        this.setWallet(new SolanaWallet(this, protocolWallet));
       } catch {
         this.removeStorage();
       }
@@ -88,7 +88,7 @@ class SolanaConnector extends OmniConnector<SolanaWallet, { wallet: Wallet }> {
 
     this.setStorage({ type: "walletconnect" });
     return this.setWallet(
-      new SolanaWallet({
+      new SolanaWallet(this, {
         address: account,
         sendTransaction: async (tx: Transaction | VersionedTransaction, connection: Connection, options?: any) => {
           const transaction = Buffer.from(tx.serialize()).toString("base64");
@@ -112,9 +112,8 @@ class SolanaConnector extends OmniConnector<SolanaWallet, { wallet: Wallet }> {
     );
   }
 
-  async disconnect() {
-    this.wallets.forEach((w) => w.wallet.disconnect?.());
-    super.disconnect();
+  async createWallet(address: string): Promise<OmniWallet> {
+    return new SolanaWallet(this, { address });
   }
 
   async getConnectedWallet() {
@@ -143,7 +142,7 @@ class SolanaConnector extends OmniConnector<SolanaWallet, { wallet: Wallet }> {
     try {
       this.setStorage({ type: "wallet", id });
       const protocolWallet = await SolanaProtocolWallet.connect(wallet.wallet, { silent: false });
-      return this.setWallet(new SolanaWallet(protocolWallet));
+      return this.setWallet(new SolanaWallet(this, protocolWallet));
     } catch (e) {
       this.removeStorage();
       throw e;

package/src/solana/injected/solana-wallet.ts

@@ -110,7 +110,7 @@ export class GhostWallet implements Wallet {
     this._connected();
   }
 
-  _on: StandardEventsOnMethod = (event: StandardEventsNames, listener: StandardEventsListeners[StandardEventsNames]) => {
+  _on: StandardEventsOnMethod = (event, listener) => {
     this._listeners[event]?.push(listener) || (this._listeners[event] = [listener]);
     return (): void => this._off(event, listener);
   };
@@ -152,7 +152,7 @@ export class GhostWallet implements Wallet {
     }
   };
 
-  _connect: StandardConnectMethod = async ({ silent }: { silent?: boolean } = {}) => {
+  _connect: StandardConnectMethod = async ({ silent } = {}) => {
     if (!this._account) await this._ghost.connect(silent ? { onlyIfTrusted: true } : undefined);
     this._connected();
     return { accounts: this.accounts };
@@ -162,7 +162,7 @@ export class GhostWallet implements Wallet {
     await this._ghost.disconnect();
   };
 
-  _signAndSendTransaction: SolanaSignAndSendTransactionMethod = async (...inputs: any[]) => {
+  _signAndSendTransaction: SolanaSignAndSendTransactionMethod = async (...inputs) => {
     if (!this._account) throw new Error("not connected");
 
     const outputs: SolanaSignAndSendTransactionOutput[] = [];
@@ -189,7 +189,7 @@ export class GhostWallet implements Wallet {
     return outputs;
   };
 
-  _signTransaction: SolanaSignTransactionMethod = async (...inputs: any[]) => {
+  _signTransaction: SolanaSignTransactionMethod = async (...inputs) => {
     if (!this._account) throw new Error("not connected");
 
     const outputs: SolanaSignTransactionOutput[] = [];
@@ -243,7 +243,7 @@ export class GhostWallet implements Wallet {
     return outputs;
   };
 
-  _signMessage: SolanaSignMessageMethod = async (...inputs: any[]) => {
+  _signMessage: SolanaSignMessageMethod = async (...inputs) => {
     if (!this._account) throw new Error("not connected");
 
     const outputs: SolanaSignMessageOutput[] = [];
@@ -264,7 +264,7 @@ export class GhostWallet implements Wallet {
     return outputs;
   };
 
-  _signIn: SolanaSignInMethod = async (...inputs: any[]) => {
+  _signIn: SolanaSignInMethod = async (...inputs) => {
     const outputs: SolanaSignInOutput[] = [];
 
     if (inputs.length > 1) {

package/src/solana/{WalletStandard.ts → protocol.ts}

@@ -1,5 +1,7 @@
 import type { Connection, Transaction, VersionedTransaction } from "@solana/web3.js";
+import { SolanaSignAndSendTransactionMethod, SolanaSignMessageMethod, SolanaSignTransactionMethod } from "@solana/wallet-standard-features";
 import type { Wallet } from "@wallet-standard/base";
+import { base58 } from "@scure/base";
 
 export interface ISolanaProtocolWallet {
   address: string;
@@ -39,7 +41,7 @@ class SolanaProtocolWallet implements ISolanaProtocolWallet {
   async sendTransaction(transaction: Transaction | VersionedTransaction, connection: Connection, options?: any): Promise<string> {
     const account = await this.getAccount();
     const features = this.wallet.features as any;
-    const signTx = features["solana:signTransaction"]?.signTransaction;
+    const signTx = features["solana:signTransaction"]?.signTransaction as SolanaSignTransactionMethod;
     const [signed] = await signTx({ account, chain: account.chains[0], transaction: transaction.serialize() });
     const signedTx = signed.signedTransaction as Transaction | VersionedTransaction | Uint8Array;
     const raw = signedTx instanceof Uint8Array ? signedTx : (signedTx as any).serialize();
@@ -50,7 +52,7 @@ class SolanaProtocolWallet implements ISolanaProtocolWallet {
   async signMessage(message: string) {
     const account = await this.getAccount();
     const features = this.wallet.features as any;
-    const signMessageFeature = features["solana:signMessage"]?.signMessage;
+    const signMessageFeature = features["solana:signMessage"]?.signMessage as SolanaSignMessageMethod;
 
     if (!signMessageFeature) throw new Error("Wallet does not support solana:signMessage");
     const [result] = await signMessageFeature({ account, message: new TextEncoder().encode(message) });