+
+ Solana Wallet
+
+
+
+ EVM Recipient
+ 0 && !evmRecipientValid
+ ? "error"
+ : "default"}
+ bind:value={store.recipient}
+ />
+
+
+ Solana Recipient
+ 0 && !solanaRecipientValid
+ ? "error"
+ : "default"}
+ bind:value={store.solanaRecipient}
+ />
+
Verifier
- {#if sameChain}
-
-
-
- {:else}
-
-
-
-
- {/if}
+
+
+
+
Exclusive
@@ -289,7 +362,21 @@
- {#if !allowanceCheck}
+ {#if !recipientValid}
+
+ {:else if !allowanceCheck && !hasSolanaInput}
{#snippet name()}
Set allowance
@@ -308,7 +395,7 @@
>
Low Balance
- {:else if store.intentType === "escrow"}
+ {:else if store.intentType === "escrow" || hasSolanaInput}
{#snippet name()}
Execute Open
diff --git a/src/lib/state.svelte.ts b/src/lib/state.svelte.ts
index 59b0ded..c7f5b5d 100644
--- a/src/lib/state.svelte.ts
+++ b/src/lib/state.svelte.ts
@@ -10,13 +10,15 @@ import {
INPUT_SETTLER_ESCROW_LIFI,
MULTICHAIN_INPUT_SETTLER_COMPACT,
MULTICHAIN_INPUT_SETTLER_ESCROW,
+ solanaDevnetConnection,
type availableAllocators,
type chain,
type Token,
type Verifier
} from "./config";
-import { getAllowance, getBalance, getCompactBalance } from "./libraries/token";
+import { getAllowance, getBalance, getCompactBalance, getSolanaBalance } from "./libraries/token";
import onboard from "./utils/web3-onboard";
+import solanaWallet from "./utils/solana-wallet.svelte";
import { createWalletClient, custom } from "viem";
import { browser } from "$app/environment";
import { initDb, db } from "./db";
@@ -260,6 +262,24 @@ class Store {
});
});
+ solanaBalances = $derived.by(() => {
+ this.refreshEpoch;
+ const account = this.solanaPublicKey || undefined;
+ const resolved: Partial>>> = {};
+ if (!account) return resolved;
+ for (const token of coinList(this.mainnet)) {
+ if (token.chain !== "solanaDevnet") continue;
+ if (!resolved.solanaDevnet) resolved.solanaDevnet = {};
+ const key = `balance:${this.mainnet ? "mainnet" : "testnet"}:${token.chain}:${token.address}:${account}`;
+ resolved.solanaDevnet[token.address] = getOrFetchRpc(
+ key,
+ () => getSolanaBalance(account, token.address, solanaDevnetConnection),
+ { ttlMs: 30_000 }
+ );
+ }
+ return resolved;
+ });
+
multichain = $derived([...new Set(this.inputTokens.map((i) => i.token.chain))].length > 1);
inputSettler = $derived.by(() => {
@@ -272,7 +292,11 @@ class Store {
intentType = $state<"escrow" | "compact">("escrow");
allocatorId = $state(ALWAYS_OK_ALLOCATOR);
verifier = $state("polymer");
+ recipient: string = $state("");
+ solanaRecipient: string = $state("");
exclusiveFor: string = $state("");
+
+ solanaPublicKey = $derived(solanaWallet.publicKey ?? "");
useExclusiveForQuoteRequest = $state(false);
invalidateWalletReadCache(scope: "all" | "balance" | "allowance" | "compact" = "all") {
@@ -376,11 +400,13 @@ class Store {
const { bucket, ttlMs, isMainnet, scopeKey, fetcher } = opts;
const resolved: Record>> = {} as any;
for (const token of coinList(isMainnet)) {
+ const client = clients[token.chain as keyof typeof clients];
+ if (!client) continue;
if (!resolved[token.chain as chain]) resolved[token.chain] = {};
const key = `${bucket}:${isMainnet ? "mainnet" : "testnet"}:${token.chain}:${token.address}:${scopeKey}`;
resolved[token.chain][token.address] = getOrFetchRpc(
key,
- () => fetcher(token.address, clients[token.chain]),
+ () => fetcher(token.address, client),
{ ttlMs }
);
}
diff --git a/src/lib/utils/convert.ts b/src/lib/utils/convert.ts
index ee97ecc..e0d1e9b 100644
--- a/src/lib/utils/convert.ts
+++ b/src/lib/utils/convert.ts
@@ -1,6 +1,27 @@
// --- Type conversion helpers --- //
import { checksumAddress } from "viem";
+import bs58 from "bs58";
+
+export function solanaAddressToBytes32(base58Address: string): `0x${string}` {
+ const decoded = bs58.decode(base58Address);
+ if (decoded.length !== 32) {
+ throw new Error(`Invalid Solana address: expected 32 bytes, got ${decoded.length}`);
+ }
+ const hex = Array.from(decoded)
+ .map((b) => b.toString(16).padStart(2, "0"))
+ .join("");
+ return `0x${hex}`;
+}
+
+export function isValidSolanaAddress(value: string): boolean {
+ try {
+ const decoded = bs58.decode(value.trim());
+ return decoded.length === 32;
+ } catch {
+ return false;
+ }
+}
export function toBigIntWithDecimals(value: number, decimals: number): bigint {
// Convert number to string in full precision
@@ -21,10 +42,11 @@ export function toBigIntWithDecimals(value: number, decimals: number): bigint {
}
export function addressToBytes32(address: `0x${string}`): `0x${string}` {
- if (address.length !== 42 && address.length !== 40) {
+ const raw = address.replace("0x", "");
+ if (raw.length !== 40 && raw.length !== 64) {
throw new Error(`Invalid address length: ${address.length}`);
}
- return `0x${address.replace("0x", "").padStart(64, "0")}`;
+ return `0x${raw.padStart(64, "0")}`;
}
export function bytes32ToAddress(bytes: `0x${string}`): `0x${string}` {
diff --git a/src/lib/utils/solana-wallet.svelte.ts b/src/lib/utils/solana-wallet.svelte.ts
new file mode 100644
index 0000000..d1feee8
--- /dev/null
+++ b/src/lib/utils/solana-wallet.svelte.ts
@@ -0,0 +1,59 @@
+import { PhantomWalletAdapter } from "@solana/wallet-adapter-phantom";
+import { SolflareWalletAdapter } from "@solana/wallet-adapter-solflare";
+import type { WalletAdapter } from "@solana/wallet-adapter-base";
+
+export const AVAILABLE_WALLETS = [
+ { name: "Phantom", adapter: new PhantomWalletAdapter() },
+ { name: "Solflare", adapter: new SolflareWalletAdapter() }
+] as const;
+
+class SolanaWalletStore {
+ #adapter = $state(null);
+ #connected = $state(false);
+ #publicKey = $state(null);
+
+ get adapter(): WalletAdapter | null {
+ return this.#adapter;
+ }
+
+ get connected(): boolean {
+ return this.#connected;
+ }
+
+ /** Base58-encoded public key of the connected wallet, or null */
+ get publicKey(): string | null {
+ return this.#publicKey;
+ }
+
+ async connect(adapter: WalletAdapter): Promise {
+ if (this.#adapter?.connected) {
+ this.#adapter.off("connect");
+ this.#adapter.off("disconnect");
+ await this.#adapter.disconnect();
+ }
+ this.#adapter = adapter;
+ adapter.on("connect", (pk) => {
+ this.#connected = true;
+ this.#publicKey = pk.toBase58();
+ });
+ adapter.on("disconnect", () => {
+ this.#connected = false;
+ this.#publicKey = null;
+ });
+ await adapter.connect();
+ }
+
+ async disconnect(): Promise {
+ if (this.#adapter) {
+ this.#adapter.off("connect");
+ this.#adapter.off("disconnect");
+ await this.#adapter.disconnect();
+ }
+ this.#adapter = null;
+ this.#connected = false;
+ this.#publicKey = null;
+ }
+}
+
+const solanaWallet = new SolanaWalletStore();
+export default solanaWallet;
diff --git a/src/lib/utils/web3-onboard.ts b/src/lib/utils/web3-onboard.ts
index 5ca6309..6e9e55c 100644
--- a/src/lib/utils/web3-onboard.ts
+++ b/src/lib/utils/web3-onboard.ts
@@ -5,7 +5,7 @@ import zealWalletModule from "@web3-onboard/zeal";
import coinbaseWalletModule from "@web3-onboard/coinbase";
import walletConnectModule from "@web3-onboard/walletconnect";
import { env } from "$env/dynamic/public";
-import { chainMap } from "../config";
+import { chainMap, clients } from "../config";
const injected = injectedWalletsModule();
const zealWalletSdk = zealWalletModule();
@@ -26,14 +26,14 @@ const wallets = [
];
const getChains = () => {
- return Object.values(chainMap).map((v) => {
- return {
+ return Object.entries(chainMap)
+ .filter(([name]) => name in clients)
+ .map(([, v]) => ({
id: v.id,
token: v.nativeCurrency.symbol,
label: v.name,
rpcUrl: v.rpcUrls.default.http[0]
- };
- });
+ }));
};
const appMetadata = {