create-lightning-scaffold 1.0.2 → 1.0.5

package/templates/web/components/Swap.tsx.ejs

@@ -1,7 +1,7 @@
 "use client";
 import { useState, useEffect } from "react";
 import { useWallet } from "@lazorkit/wallet";
-import { Connection, PublicKey, VersionedTransaction } from "@solana/web3.js";
+import { Connection, PublicKey } from "@solana/web3.js";
 
 const TOKENS = [
   { symbol: "SOL", mint: "So11111111111111111111111111111111111111112", decimals: 9 },
@@ -11,9 +11,10 @@ const TOKENS = [
   { symbol: "JUP", mint: "JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN", decimals: 6 },
 ];
 
-const SLIPPAGE_OPTIONS = [50, 100, 300]; // 0.5%, 1%, 3% in bps
+const SLIPPAGE_OPTIONS = [50, 100, 300];
 
 const JUPITER_API = "https://api.jup.ag/swap/v1";
+const JUP_API_KEY = process.env.NEXT_PUBLIC_JUPITER_API_KEY || "";
 
 function useBalances(walletAddress: string | undefined) {
   const [balances, setBalances] = useState<Record<string, number>>({});
@@ -22,11 +23,7 @@ function useBalances(walletAddress: string | undefined) {
     const rpc = process.env.NEXT_PUBLIC_SOLANA_RPC || "https://api.devnet.solana.com";
     const conn = new Connection(rpc);
     const pk = new PublicKey(walletAddress);
-    
-    // Fetch SOL balance
     conn.getBalance(pk).then((bal) => setBalances((b) => ({ ...b, SOL: bal / 1e9 }))).catch(() => {});
-    
-    // Fetch token balances
     conn.getParsedTokenAccountsByOwner(pk, { programId: new PublicKey("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA") })
       .then((res) => {
         const tokenBals: Record<string, number> = {};
@@ -75,85 +72,71 @@ export function Swap() {
   const [signing, setSigning] = useState(false);
   const [result, setResult] = useState<{ success: boolean; message: string } | null>(null);
 
-  const switchTokens = () => {
-    setFromToken(toToken);
-    setToToken(fromToken);
-    setAmount("");
-    setQuote(null);
-  };
+  const switchTokens = () => { setFromToken(toToken); setToToken(fromToken); setAmount(""); setQuote(null); };
 
-  // Fetch quote from Jupiter
   useEffect(() => {
-    if (!amount || parseFloat(amount) <= 0) {
-      setQuote(null);
-      return;
-    }
+    if (!amount || parseFloat(amount) <= 0) { setQuote(null); return; }
     const timeout = setTimeout(async () => {
       try {
         const inputAmount = Math.floor(parseFloat(amount) * 10 ** fromToken.decimals);
-        const res = await fetch(
-          `${JUPITER_API}/quote?inputMint=${fromToken.mint}&outputMint=${toToken.mint}&amount=${inputAmount}&slippageBps=${slippage}`
-        );
+        const headers: Record<string, string> = {};
+        if (JUP_API_KEY) headers["x-api-key"] = JUP_API_KEY;
+        const res = await fetch(`${JUPITER_API}/quote?inputMint=${fromToken.mint}&outputMint=${toToken.mint}&amount=${inputAmount}&slippageBps=${slippage}&restrictIntermediateTokens=true`, { headers });
         const data = await res.json();
         if (data.outAmount) setQuote(data);
-      } catch (e) {
-        console.error("Quote error:", e);
-      }
+        else setQuote(null);
+      } catch (e) { console.error("Quote error:", e); setQuote(null); }
     }, 500);
     return () => clearTimeout(timeout);
   }, [amount, fromToken, toToken, slippage]);
 
-  const outputAmount = quote
-    ? (parseInt(quote.outAmount) / 10 ** toToken.decimals).toFixed(toToken.decimals === 6 ? 2 : 4)
-    : "0.00";
+  const outputAmount = quote ? (parseInt(quote.outAmount) / 10 ** toToken.decimals).toFixed(toToken.decimals === 6 ? 2 : 4) : "0.00";
 
   const handleSwap = async () => {
     if (!smartWalletPubkey || !quote) return;
     setLoading(true);
     setResult(null);
     try {
-      // Get swap transaction from Jupiter
-      const swapRes = await fetch(`${JUPITER_API}/swap`, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({
-          quoteResponse: quote,
-          userPublicKey: smartWalletPubkey.toBase58(),
-          dynamicComputeUnitLimit: true,
-          dynamicSlippage: true,
-        }),
+      const headers: Record<string, string> = { "Content-Type": "application/json" };
+      if (JUP_API_KEY) headers["x-api-key"] = JUP_API_KEY;
+      const swapRes = await fetch(`${JUPITER_API}/swap-instructions`, {
+        method: "POST", headers,
+        body: JSON.stringify({ quoteResponse: quote, userPublicKey: smartWalletPubkey.toBase58(), wrapAndUnwrapSol: true, dynamicComputeUnitLimit: true }),
       });
-      const { swapTransaction } = await swapRes.json();
-      
-      // Decode and sign via LazorKit
-      const tx = VersionedTransaction.deserialize(Buffer.from(swapTransaction, "base64"));
-      const signature = await signAndSendTransaction({
-        instructions: [], // Jupiter provides full tx, we pass empty and let SDK handle
-        transactionOptions: { feeToken: "USDC" },
+      if (!swapRes.ok) throw new Error(`Jupiter API error: ${await swapRes.text()}`);
+      const { setupInstructions = [], swapInstruction, cleanupInstruction, addressLookupTableAddresses = [] } = await swapRes.json();
+      if (!swapInstruction) throw new Error("No swap instruction returned");
+
+      const toInstruction = (ix: any) => ({
+        programId: new PublicKey(ix.programId),
+        keys: ix.accounts.map((acc: any) => ({ pubkey: new PublicKey(acc.pubkey), isSigner: acc.isSigner, isWritable: acc.isWritable })),
+        data: Buffer.from(ix.data, "base64"),
       });
-      
+      const instructions = [...setupInstructions.map(toInstruction), toInstruction(swapInstruction), ...(cleanupInstruction ? [toInstruction(cleanupInstruction)] : [])];
+
+      let addressLookupTableAccounts: any[] = [];
+      if (addressLookupTableAddresses.length > 0) {
+        const rpc = process.env.NEXT_PUBLIC_SOLANA_RPC || "https://api.devnet.solana.com";
+        const conn = new Connection(rpc);
+        const alts = await Promise.all(addressLookupTableAddresses.map(async (addr: string) => (await conn.getAddressLookupTable(new PublicKey(addr))).value));
+        addressLookupTableAccounts = alts.filter(Boolean);
+      }
+
+      const signature = await signAndSendTransaction({ instructions, transactionOptions: { feeToken: "USDC", addressLookupTableAccounts } });
       setResult({ success: true, message: `Swapped! ${signature.slice(0, 8)}...` });
-      setAmount("");
-      setQuote(null);
-    } catch (e) {
-      setResult({ success: false, message: e instanceof Error ? e.message : "Swap failed" });
-    } finally {
-      setLoading(false);
-    }
+      setAmount(""); setQuote(null);
+    } catch (e) { console.error("Swap error:", e); setResult({ success: false, message: e instanceof Error ? e.message : "Swap failed" }); }
+    finally { setLoading(false); }
   };
 
   const handleSignMessage = async () => {
-    setSigning(true);
-    setResult(null);
+    setSigning(true); setResult(null);
     try {
       const message = `Verify wallet ownership\nTimestamp: ${Date.now()}`;
       const { signature } = await signMessage(message);
       setResult({ success: true, message: `Signed: ${signature.slice(0, 16)}...` });
-    } catch (e) {
-      setResult({ success: false, message: e instanceof Error ? e.message : "Sign failed" });
-    } finally {
-      setSigning(false);
-    }
+    } catch (e) { console.error("Sign error:", e); setResult({ success: false, message: e instanceof Error ? e.message : "Sign failed" }); }
+    finally { setSigning(false); }
   };
 
   const addr = wallet?.smartWallet || "";
@@ -163,30 +146,20 @@ export function Swap() {
     <div className="w-full max-w-sm bg-neutral-900 rounded-2xl p-6 text-white">
       <div className="flex items-center justify-between mb-6">
         <h1 className="text-lg font-semibold">Swap</h1>
-        <button onClick={() => disconnect()} className="text-xs text-neutral-500 hover:text-neutral-300">
-          {addr.slice(0, 6)}...{addr.slice(-4)}
-        </button>
+        <button onClick={() => disconnect()} className="text-xs text-neutral-500 hover:text-neutral-300">{addr.slice(0, 6)}...{addr.slice(-4)}</button>
       </div>
       <div className="space-y-2">
         <div className="border border-neutral-700 rounded-xl p-4 bg-neutral-800">
-          <div className="flex items-center justify-between mb-2">
-            <span className="text-xs text-neutral-500">From</span>
-            <span className="text-xs text-neutral-500">Balance: {(balances[fromToken.symbol] ?? 0).toFixed(4)}</span>
-          </div>
+          <div className="flex items-center justify-between mb-2"><span className="text-xs text-neutral-500">From</span><span className="text-xs text-neutral-500">Balance: {(balances[fromToken.symbol] ?? 0).toFixed(4)}</span></div>
           <div className="flex items-center gap-3">
             <input type="number" placeholder="0.00" value={amount} onChange={(e) => setAmount(e.target.value)} className="flex-1 text-2xl font-medium bg-transparent w-full focus:outline-none text-white placeholder-neutral-600" />
             <TokenSelect token={fromToken} tokens={TOKENS} onChange={setFromToken} exclude={toToken.symbol} />
           </div>
           <button onClick={() => setAmount(String(balances[fromToken.symbol] ?? 0))} className="text-xs text-neutral-500 hover:text-white mt-1">Max</button>
         </div>
-        <div className="flex justify-center">
-          <button onClick={switchTokens} className="w-8 h-8 border border-neutral-700 rounded-lg flex items-center justify-center text-neutral-500 hover:bg-neutral-800 bg-neutral-800">↓</button>
-        </div>
+        <div className="flex justify-center"><button onClick={switchTokens} className="w-8 h-8 border border-neutral-700 rounded-lg flex items-center justify-center text-neutral-500 hover:bg-neutral-800 bg-neutral-800">↓</button></div>
         <div className="border border-neutral-700 rounded-xl p-4 bg-neutral-800">
-          <div className="flex items-center justify-between mb-2">
-            <span className="text-xs text-neutral-500">To</span>
-            <span className="text-xs text-neutral-500">Balance: {(balances[toToken.symbol] ?? 0).toFixed(4)}</span>
-          </div>
+          <div className="flex items-center justify-between mb-2"><span className="text-xs text-neutral-500">To</span><span className="text-xs text-neutral-500">Balance: {(balances[toToken.symbol] ?? 0).toFixed(4)}</span></div>
           <div className="flex items-center gap-3">
             <span className="flex-1 text-2xl font-medium text-neutral-500">{outputAmount}</span>
             <TokenSelect token={toToken} tokens={TOKENS} onChange={setToToken} exclude={fromToken.symbol} />
@@ -194,64 +167,29 @@ export function Swap() {
           {quote && <p className="text-xs text-neutral-500 mt-2">via Jupiter · {quote.routePlan?.[0]?.swapInfo?.label || "Best route"}</p>}
         </div>
       </div>
-      <div className="flex items-center justify-between mt-3 text-xs">
-        <span className="text-neutral-500">Slippage</span>
-        <div className="flex gap-1">
-          {SLIPPAGE_OPTIONS.map((s) => (
-            <button key={s} onClick={() => setSlippage(s)} className={`px-2 py-1 rounded ${slippage === s ? "bg-white text-black" : "bg-neutral-700 text-neutral-300 hover:bg-neutral-600"}`}>
-              {s / 100}%
-            </button>
-          ))}
-        </div>
-      </div>
-      <button onClick={handleSwap} disabled={loading || !quote} className="mt-4 w-full py-3 bg-white text-black text-sm font-medium rounded-xl hover:opacity-90 disabled:opacity-50">
-        {loading ? "Swapping..." : "Swap"}
-      </button>
-      <button onClick={handleSignMessage} disabled={signing} className="mt-2 w-full py-3 bg-transparent text-white text-sm font-medium rounded-xl border border-neutral-700 hover:bg-neutral-800 disabled:opacity-50">
-        {signing ? "Signing..." : "Sign Message"}
-      </button>
+      <div className="flex items-center justify-between mt-3 text-xs"><span className="text-neutral-500">Slippage</span><div className="flex gap-1">{SLIPPAGE_OPTIONS.map((s) => (<button key={s} onClick={() => setSlippage(s)} className={`px-2 py-1 rounded ${slippage === s ? "bg-white text-black" : "bg-neutral-700 text-neutral-300 hover:bg-neutral-600"}`}>{s / 100}%</button>))}</div></div>
+      <button onClick={handleSwap} disabled={loading || !quote} className="mt-4 w-full py-3 bg-white text-black text-sm font-medium rounded-xl hover:opacity-90 disabled:opacity-50">{loading ? "Swapping..." : "Swap"}</button>
+      <button onClick={handleSignMessage} disabled={signing} className="mt-2 w-full py-3 bg-transparent text-white text-sm font-medium rounded-xl border border-neutral-700 hover:bg-neutral-800 disabled:opacity-50">{signing ? "Signing..." : "Sign Message"}</button>
       {result && <p className={`mt-3 text-sm text-center ${result.success ? "text-neutral-400" : "text-red-400"}`}>{result.message}</p>}
       <p className="mt-4 text-xs text-center text-neutral-500">Gas sponsored · Powered by LazorKit + Jupiter</p>
     </div>
 <% } else { %>
     <div style={styles.container}>
-      <div style={styles.header}>
-        <h1 style={styles.title}>Swap</h1>
-        <button onClick={() => disconnect()} style={styles.address}>{addr.slice(0, 6)}...{addr.slice(-4)}</button>
-      </div>
+      <div style={styles.header}><h1 style={styles.title}>Swap</h1><button onClick={() => disconnect()} style={styles.address}>{addr.slice(0, 6)}...{addr.slice(-4)}</button></div>
       <div style={styles.card}>
         <div style={styles.label}><span>From</span><span>Balance: {(balances[fromToken.symbol] ?? 0).toFixed(4)}</span></div>
-        <div style={styles.inputRow}>
-          <input type="number" placeholder="0.00" value={amount} onChange={(e) => setAmount(e.target.value)} style={styles.input} />
-          <TokenSelect token={fromToken} tokens={TOKENS} onChange={setFromToken} exclude={toToken.symbol} />
-        </div>
+        <div style={styles.inputRow}><input type="number" placeholder="0.00" value={amount} onChange={(e) => setAmount(e.target.value)} style={styles.input} /><TokenSelect token={fromToken} tokens={TOKENS} onChange={setFromToken} exclude={toToken.symbol} /></div>
         <button onClick={() => setAmount(String(balances[fromToken.symbol] ?? 0))} style={{ ...styles.address, fontSize: 12, marginTop: 4 }}>Max</button>
       </div>
-      <div style={styles.arrow}><button onClick={switchTokens} style={{ ...styles.arrowBox, cursor: 'pointer', border: '1px solid #e5e5e5' }}>↓</button></div>
+      <div style={styles.arrow}><button onClick={switchTokens} style={{ ...styles.arrowBox, cursor: 'pointer' }}>↓</button></div>
       <div style={styles.card}>
         <div style={styles.label}><span>To</span><span>Balance: {(balances[toToken.symbol] ?? 0).toFixed(4)}</span></div>
-        <div style={styles.inputRow}>
-          <span style={{ ...styles.input, color: '#d4d4d4' }}>{outputAmount}</span>
-          <TokenSelect token={toToken} tokens={TOKENS} onChange={setToToken} exclude={fromToken.symbol} />
-        </div>
+        <div style={styles.inputRow}><span style={{ ...styles.input, color: '#737373' }}>{outputAmount}</span><TokenSelect token={toToken} tokens={TOKENS} onChange={setToToken} exclude={fromToken.symbol} /></div>
         {quote && <p style={styles.quote}>via Jupiter · {quote.routePlan?.[0]?.swapInfo?.label || "Best route"}</p>}
       </div>
-      <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', marginTop: 12, fontSize: 12 }}>
-        <span style={{ color: '#737373' }}>Slippage</span>
-        <div style={{ display: 'flex', gap: 4 }}>
-          {SLIPPAGE_OPTIONS.map((s) => (
-            <button key={s} onClick={() => setSlippage(s)} style={{ padding: '4px 8px', borderRadius: 4, border: 'none', cursor: 'pointer', background: slippage === s ? '#fafafa' : '#262626', color: slippage === s ? '#0a0a0a' : '#a3a3a3' }}>
-              {s / 100}%
-            </button>
-          ))}
-        </div>
-      </div>
-      <button onClick={handleSwap} disabled={loading || !quote} style={{ ...styles.button, ...(loading || !quote ? styles.buttonDisabled : {}) }}>
-        {loading ? "Swapping..." : "Swap"}
-      </button>
-      <button onClick={handleSignMessage} disabled={signing} style={{ ...styles.buttonSecondary, ...(signing ? styles.buttonDisabled : {}) }}>
-        {signing ? "Signing..." : "Sign Message"}
-      </button>
+      <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', marginTop: 12, fontSize: 12 }}><span style={{ color: '#737373' }}>Slippage</span><div style={{ display: 'flex', gap: 4 }}>{SLIPPAGE_OPTIONS.map((s) => (<button key={s} onClick={() => setSlippage(s)} style={{ padding: '4px 8px', borderRadius: 4, border: 'none', cursor: 'pointer', background: slippage === s ? '#fafafa' : '#262626', color: slippage === s ? '#0a0a0a' : '#a3a3a3' }}>{s / 100}%</button>))}</div></div>
+      <button onClick={handleSwap} disabled={loading || !quote} style={{ ...styles.button, ...(loading || !quote ? styles.buttonDisabled : {}) }}>{loading ? "Swapping..." : "Swap"}</button>
+      <button onClick={handleSignMessage} disabled={signing} style={{ ...styles.buttonSecondary, ...(signing ? styles.buttonDisabled : {}) }}>{signing ? "Signing..." : "Sign Message"}</button>
       {result && <p style={{ ...styles.result, color: result.success ? '#737373' : '#ef4444' }}>{result.message}</p>}
       <p style={styles.footer}>Gas sponsored · Powered by LazorKit + Jupiter</p>
     </div>
@@ -264,25 +202,11 @@ function TokenSelect({ token, tokens, onChange, exclude }: { token: typeof TOKEN
   return (
     <div style={{ position: 'relative' }}>
 <% if (styling === 'tailwind') { %>
-      <button onClick={() => setOpen(!open)} className="flex items-center gap-2 px-3 py-2 bg-neutral-700 rounded-lg text-sm font-medium text-white">
-        {token.symbol}<span className="text-neutral-400">▼</span>
-      </button>
-      {open && (
-        <div className="absolute right-0 mt-1 bg-neutral-800 border border-neutral-700 rounded-lg shadow-lg z-10">
-          {tokens.filter((t) => t.symbol !== exclude).map((t) => (
-            <button key={t.symbol} onClick={() => { onChange(t); setOpen(false); }} className="block w-full px-4 py-2 text-left text-sm text-white hover:bg-neutral-700">{t.symbol}</button>
-          ))}
-        </div>
-      )}
+      <button onClick={() => setOpen(!open)} className="flex items-center gap-2 px-3 py-2 bg-neutral-700 rounded-lg text-sm font-medium text-white">{token.symbol}<span className="text-neutral-400">▼</span></button>
+      {open && (<div className="absolute right-0 mt-1 bg-neutral-800 border border-neutral-700 rounded-lg shadow-lg z-10">{tokens.filter((t) => t.symbol !== exclude).map((t) => (<button key={t.symbol} onClick={() => { onChange(t); setOpen(false); }} className="block w-full px-4 py-2 text-left text-sm text-white hover:bg-neutral-700">{t.symbol}</button>))}</div>)}
 <% } else { %>
       <button onClick={() => setOpen(!open)} style={styles.tokenBtn}>{token.symbol} <span style={{ color: '#a3a3a3' }}>▼</span></button>
-      {open && (
-        <div style={styles.dropdown as React.CSSProperties}>
-          {tokens.filter((t) => t.symbol !== exclude).map((t) => (
-            <button key={t.symbol} onClick={() => { onChange(t); setOpen(false); }} style={styles.dropdownItem}>{t.symbol}</button>
-          ))}
-        </div>
-      )}
+      {open && (<div style={styles.dropdown as React.CSSProperties}>{tokens.filter((t) => t.symbol !== exclude).map((t) => (<button key={t.symbol} onClick={() => { onChange(t); setOpen(false); }} style={styles.dropdownItem}>{t.symbol}</button>))}</div>)}
 <% } %>
     </div>
   );