@shogun-sdk/swap 0.0.2-test.23 → 0.0.2-test.25

package/dist/index.cjs

@@ -33,6 +33,7 @@ __export(src_exports, {
   getTokenList: () => getTokenList,
   isNativeAddress: () => isNativeAddress,
   isViemWalletClient: () => isViemWalletClient,
+  normalizeEvmTokenAddress: () => normalizeEvmTokenAddress,
   serializeBigIntsToStrings: () => serializeBigIntsToStrings,
   useBalances: () => useBalances,
   useExecuteOrder: () => useExecuteOrder,
@@ -49,12 +50,13 @@ async function getTokenList(params) {
 
 // src/core/getQuote.ts
 var import_intents_sdk4 = require("@shogun-sdk/intents-sdk");
-var import_viem = require("viem");
+var import_viem2 = require("viem");
 
 // src/core/executeOrder/normalizeNative.ts
 var import_intents_sdk3 = require("@shogun-sdk/intents-sdk");
 
 // src/utils/address.ts
+var import_viem = require("viem");
 var NATIVE_TOKEN = {
   ETH: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
   SOL: "So11111111111111111111111111111111111111111",
@@ -65,6 +67,10 @@ var isNativeAddress = (tokenAddress) => {
   const normalizedTokenAddress = tokenAddress.toLowerCase();
   return !!tokenAddress && NATIVE_ADDRESSES.includes(normalizedTokenAddress);
 };
+function normalizeEvmTokenAddress(address) {
+  const lower = address.toLowerCase();
+  return lower === NATIVE_TOKEN.ETH.toLowerCase() ? import_viem.zeroAddress : address;
+}
 
 // src/utils/chain.ts
 var import_intents_sdk2 = require("@shogun-sdk/intents-sdk");
@@ -235,7 +241,7 @@ function buildQuoteParams({
     tokenOut,
     sourceChainId,
     destChainId,
-    amount: (0, import_viem.parseUnits)(amount.toString(), tokenIn.decimals ?? 18),
+    amount: (0, import_viem2.parseUnits)(amount.toString(), tokenIn.decimals ?? 18),
     slippage
   };
 }
@@ -290,8 +296,8 @@ async function getBalances(params, options) {
 }
 
 // src/core/executeOrder/execute.ts
-var import_intents_sdk10 = require("@shogun-sdk/intents-sdk");
-var import_viem4 = require("viem");
+var import_intents_sdk11 = require("@shogun-sdk/intents-sdk");
+var import_viem6 = require("viem");
 
 // src/wallet-adapter/svm-wallet-adapter/adapter.ts
 var import_web3 = require("@solana/web3.js");
@@ -333,7 +339,7 @@ var adaptSolanaWallet = (walletAddress, chainId, rpcUrl, signAndSendTransaction)
 // src/wallet-adapter/evm-wallet-adapter/adapter.ts
 var import_ethers = require("ethers/lib/ethers.js");
 var import_utils2 = require("ethers/lib/utils.js");
-var import_viem2 = require("viem");
+var import_viem3 = require("viem");
 function isEVMTransaction(tx) {
   return typeof tx.from === "string";
 }
@@ -369,6 +375,21 @@ var adaptEthersSigner = (signer, transport) => {
       throw error;
     }
   };
+  const readContract = async ({
+    address,
+    abi,
+    functionName,
+    args = []
+  }) => {
+    const iface = new import_ethers.utils.Interface(abi);
+    const fnArgs = Array.isArray(args) ? args : [];
+    const data = iface.encodeFunctionData(functionName, fnArgs);
+    const provider = signer.provider;
+    if (!provider) throw new Error("Signer has no provider");
+    const result = await provider.call({ to: address, data });
+    const decoded = iface.decodeFunctionResult(functionName, result);
+    return decoded[0];
+  };
   return {
     vmType: "EVM" /* EVM */,
     transport,
@@ -376,7 +397,8 @@ var adaptEthersSigner = (signer, transport) => {
     address: async () => signer.getAddress(),
     sendTransaction,
     signTypedData,
-    switchChain
+    switchChain,
+    readContract
   };
 };
 var adaptViemWallet = (wallet) => {
@@ -435,20 +457,35 @@ var adaptViemWallet = (wallet) => {
     if (!addr) throw new Error("No address found");
     return addr;
   };
+  const readContract = async ({
+    address: address2,
+    abi,
+    functionName,
+    args = []
+  }) => {
+    const publicClient = wallet.extend(import_viem3.publicActions);
+    return await publicClient.readContract({
+      address: address2,
+      abi,
+      functionName,
+      args
+    });
+  };
   return {
     vmType: "EVM" /* EVM */,
-    transport: (0, import_viem2.custom)(wallet.transport),
+    transport: (0, import_viem3.custom)(wallet.transport),
     getChainId: async () => wallet.getChainId(),
     address,
     sendTransaction,
     signTypedData,
-    switchChain
+    switchChain,
+    readContract
   };
 };
 
 // src/core/executeOrder/handleEvmExecution.ts
-var import_intents_sdk8 = require("@shogun-sdk/intents-sdk");
-var import_viem3 = require("viem");
+var import_intents_sdk9 = require("@shogun-sdk/intents-sdk");
+var import_viem5 = require("viem");
 
 // src/core/executeOrder/stageMessages.ts
 var DEFAULT_STAGE_MESSAGES = {
@@ -603,6 +640,51 @@ async function handleOrderPollingResult({
   };
 }
 
+// src/core/executeOrder/ensurePermit2Allowance.ts
+var import_viem4 = require("viem");
+var import_intents_sdk8 = require("@shogun-sdk/intents-sdk");
+async function ensurePermit2Allowance({
+  chainId,
+  tokenIn,
+  wallet,
+  accountAddress,
+  requiredAmount,
+  increaseByDelta = false
+}) {
+  const spender = import_intents_sdk8.PERMIT2_ADDRESS[chainId];
+  let currentAllowance = 0n;
+  try {
+    if (!wallet.readContract) {
+      throw new Error("Wallet does not implement readContract()");
+    }
+    currentAllowance = await wallet.readContract({
+      address: tokenIn,
+      abi: import_viem4.erc20Abi,
+      functionName: "allowance",
+      args: [accountAddress, spender]
+    });
+  } catch (error) {
+    console.warn(`[Permit2] Failed to read allowance for ${tokenIn}`, error);
+  }
+  const approvalAmount = increaseByDelta ? currentAllowance + requiredAmount : import_viem4.maxUint256;
+  console.debug(
+    `[Permit2] Approving ${approvalAmount} for ${tokenIn} (current: ${currentAllowance}, required: ${requiredAmount})`
+  );
+  await wallet.sendTransaction({
+    to: tokenIn,
+    from: accountAddress,
+    data: (0, import_viem4.encodeFunctionData)({
+      abi: import_viem4.erc20Abi,
+      functionName: "approve",
+      args: [spender, approvalAmount]
+    }),
+    value: 0n
+  });
+  console.info(
+    `[Permit2] Approval transaction sent for ${tokenIn} on chain ${chainId}`
+  );
+}
+
 // src/core/executeOrder/handleEvmExecution.ts
 async function handleEvmExecution({
   recipientAddress,
@@ -617,12 +699,13 @@ async function handleEvmExecution({
   const messageFor = (stage) => DEFAULT_STAGE_MESSAGES[stage];
   await wallet.switchChain(chainId);
   const tokenIn = normalizeNative(chainId, quote.tokenIn.address);
+  quote.tokenOut.address = normalizeEvmTokenAddress(quote.tokenOut.address);
   const shouldWrapNative = isNativeAddress(quote.tokenIn.address);
   update("processing", shouldWrapNative ? `${messageFor("processing")} (wrapping native token)` : messageFor("processing"));
   if (shouldWrapNative) {
     await wallet.sendTransaction({
       to: tokenIn,
-      data: (0, import_viem3.encodeFunctionData)({
+      data: (0, import_viem5.encodeFunctionData)({
         abi: [{ type: "function", name: "deposit", stateMutability: "payable", inputs: [], outputs: [] }],
         functionName: "deposit",
         args: []
@@ -632,15 +715,12 @@ async function handleEvmExecution({
     });
   }
   update("processing", messageFor("approving"));
-  await wallet.sendTransaction({
-    to: tokenIn,
-    data: (0, import_viem3.encodeFunctionData)({
-      abi: import_viem3.erc20Abi,
-      functionName: "approve",
-      args: [import_intents_sdk8.PERMIT2_ADDRESS[chainId], quote.amountIn]
-    }),
-    value: 0n,
-    from: accountAddress
+  await ensurePermit2Allowance({
+    chainId,
+    tokenIn,
+    wallet,
+    accountAddress,
+    requiredAmount: BigInt(quote.amountIn)
   });
   update("processing", messageFor("approved"));
   const destination = recipientAddress ?? accountAddress;
@@ -653,7 +733,7 @@ async function handleEvmExecution({
   });
   console.debug(`order`, order);
   update("processing", messageFor("signing"));
-  const { orderTypedData, nonce } = isSingleChain ? await (0, import_intents_sdk8.getEVMSingleChainOrderTypedData)(order) : await (0, import_intents_sdk8.getEVMCrossChainOrderTypedData)(order);
+  const { orderTypedData, nonce } = isSingleChain ? await (0, import_intents_sdk9.getEVMSingleChainOrderTypedData)(order) : await (0, import_intents_sdk9.getEVMCrossChainOrderTypedData)(order);
   const typedData = serializeBigIntsToStrings(orderTypedData);
   if (!wallet.signTypedData) {
     throw new Error("Wallet does not support EIP-712 signing");
@@ -684,7 +764,7 @@ async function handleEvmExecution({
 }
 
 // src/core/executeOrder/handleSolanaExecution.ts
-var import_intents_sdk9 = require("@shogun-sdk/intents-sdk");
+var import_intents_sdk10 = require("@shogun-sdk/intents-sdk");
 var import_web32 = require("@solana/web3.js");
 async function handleSolanaExecution({
   recipientAddress,
@@ -743,11 +823,11 @@ async function getSolanaOrderInstructions({
   rpcUrl
 }) {
   if (isSingleChain) {
-    return await (0, import_intents_sdk9.getSolanaSingleChainOrderInstructions)(order, {
+    return await (0, import_intents_sdk10.getSolanaSingleChainOrderInstructions)(order, {
       rpcUrl
     });
   }
-  return await (0, import_intents_sdk9.getSolanaCrossChainOrderInstructions)(order, {
+  return await (0, import_intents_sdk10.getSolanaCrossChainOrderInstructions)(order, {
     rpcUrl
   });
 }
@@ -801,7 +881,7 @@ async function executeOrder({
     const isSingleChain = tokenIn.chainId === tokenOut.chainId;
     const chainId = Number(tokenIn.chainId);
     update("processing");
-    if ((0, import_intents_sdk10.isEvmChain)(chainId)) {
+    if ((0, import_intents_sdk11.isEvmChain)(chainId)) {
       log("Detected EVM chain:", chainId);
       const result = await handleEvmExecution({
         recipientAddress,
@@ -816,7 +896,7 @@ async function executeOrder({
       log("EVM execution result:", result);
       return result;
     }
-    if (chainId === import_intents_sdk10.ChainID.Solana) {
+    if (chainId === import_intents_sdk11.ChainID.Solana) {
       log("Detected Solana chain");
       const result = await handleSolanaExecution({
         recipientAddress,
@@ -835,7 +915,7 @@ async function executeOrder({
     log("Error:", unsupported);
     return { status: false, message: unsupported, stage: "error" };
   } catch (error) {
-    const message = error instanceof import_viem4.BaseError ? error.shortMessage : error instanceof Error ? error.message : String(error);
+    const message = error instanceof import_viem6.BaseError ? error.shortMessage : error instanceof Error ? error.message : String(error);
     log("Execution failed:", { message, error });
     update("error", message);
     return { status: false, message, stage: "error" };

package/dist/index.d.cts

@@ -1,10 +1,10 @@
-export { NATIVE_TOKEN, SOLANA_CHAIN_ID, SupportedChains, buildQuoteParams, getBalances, getQuote, getTokenList, isNativeAddress, isViemWalletClient, serializeBigIntsToStrings } from './core.cjs';
-export { B as BalanceRequestParams, c as BalanceResponse, P as PlaceOrderResult, Q as QuoteTokenInfo, b as Stage, S as SwapQuoteParams, a as SwapQuoteResponse, T as TokenBalance, f as TokenInfo, d as TokenSearchResponse, e as executeOrder } from './execute-DOv1i2Su.cjs';
+export { NATIVE_TOKEN, SOLANA_CHAIN_ID, SupportedChains, buildQuoteParams, getBalances, getQuote, getTokenList, isNativeAddress, isViemWalletClient, normalizeEvmTokenAddress, serializeBigIntsToStrings } from './core.cjs';
+export { B as BalanceRequestParams, c as BalanceResponse, P as PlaceOrderResult, Q as QuoteTokenInfo, b as Stage, S as SwapQuoteParams, a as SwapQuoteResponse, T as TokenBalance, f as TokenInfo, d as TokenSearchResponse, e as executeOrder } from './execute-Xvw4wXBo.cjs';
 export { ChainID, isEvmChain } from '@shogun-sdk/intents-sdk';
 export { useBalances, useExecuteOrder, useQuote, useTokenList } from './react.cjs';
 export { adaptEthersSigner, adaptSolanaWallet, adaptViemWallet } from './wallet-adapter.cjs';
 import 'viem';
-import './wallet-MmUIz8GE.cjs';
+import './wallet-BhuMJ3K_.cjs';
 import '@mysten/sui/transactions';
 import '@solana/web3.js';
 import 'ethers/lib/ethers.js';

package/dist/index.d.ts

@@ -1,10 +1,10 @@
-export { NATIVE_TOKEN, SOLANA_CHAIN_ID, SupportedChains, buildQuoteParams, getBalances, getQuote, getTokenList, isNativeAddress, isViemWalletClient, serializeBigIntsToStrings } from './core.js';
-export { B as BalanceRequestParams, c as BalanceResponse, P as PlaceOrderResult, Q as QuoteTokenInfo, b as Stage, S as SwapQuoteParams, a as SwapQuoteResponse, T as TokenBalance, f as TokenInfo, d as TokenSearchResponse, e as executeOrder } from './execute-CKTsf_tD.js';
+export { NATIVE_TOKEN, SOLANA_CHAIN_ID, SupportedChains, buildQuoteParams, getBalances, getQuote, getTokenList, isNativeAddress, isViemWalletClient, normalizeEvmTokenAddress, serializeBigIntsToStrings } from './core.js';
+export { B as BalanceRequestParams, c as BalanceResponse, P as PlaceOrderResult, Q as QuoteTokenInfo, b as Stage, S as SwapQuoteParams, a as SwapQuoteResponse, T as TokenBalance, f as TokenInfo, d as TokenSearchResponse, e as executeOrder } from './execute-D2qcOzkI.js';
 export { ChainID, isEvmChain } from '@shogun-sdk/intents-sdk';
 export { useBalances, useExecuteOrder, useQuote, useTokenList } from './react.js';
 export { adaptEthersSigner, adaptSolanaWallet, adaptViemWallet } from './wallet-adapter.js';
 import 'viem';
-import './wallet-MmUIz8GE.js';
+import './wallet-BhuMJ3K_.js';
 import '@mysten/sui/transactions';
 import '@solana/web3.js';
 import 'ethers/lib/ethers.js';

package/dist/index.js

@@ -12,6 +12,7 @@ import { parseUnits } from "viem";
 import { isEvmChain } from "@shogun-sdk/intents-sdk";
 
 // src/utils/address.ts
+import { zeroAddress } from "viem";
 var NATIVE_TOKEN = {
   ETH: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
   SOL: "So11111111111111111111111111111111111111111",
@@ -22,6 +23,10 @@ var isNativeAddress = (tokenAddress) => {
   const normalizedTokenAddress = tokenAddress.toLowerCase();
   return !!tokenAddress && NATIVE_ADDRESSES.includes(normalizedTokenAddress);
 };
+function normalizeEvmTokenAddress(address) {
+  const lower = address.toLowerCase();
+  return lower === NATIVE_TOKEN.ETH.toLowerCase() ? zeroAddress : address;
+}
 
 // src/utils/chain.ts
 import { ChainID } from "@shogun-sdk/intents-sdk";
@@ -290,10 +295,11 @@ var adaptSolanaWallet = (walletAddress, chainId, rpcUrl, signAndSendTransaction)
 };
 
 // src/wallet-adapter/evm-wallet-adapter/adapter.ts
-import "ethers/lib/ethers.js";
+import { utils as ethersUtils } from "ethers/lib/ethers.js";
 import { hexValue } from "ethers/lib/utils.js";
 import {
-  custom
+  custom,
+  publicActions
 } from "viem";
 function isEVMTransaction(tx) {
   return typeof tx.from === "string";
@@ -330,6 +336,21 @@ var adaptEthersSigner = (signer, transport) => {
       throw error;
     }
   };
+  const readContract = async ({
+    address,
+    abi,
+    functionName,
+    args = []
+  }) => {
+    const iface = new ethersUtils.Interface(abi);
+    const fnArgs = Array.isArray(args) ? args : [];
+    const data = iface.encodeFunctionData(functionName, fnArgs);
+    const provider = signer.provider;
+    if (!provider) throw new Error("Signer has no provider");
+    const result = await provider.call({ to: address, data });
+    const decoded = iface.decodeFunctionResult(functionName, result);
+    return decoded[0];
+  };
   return {
     vmType: "EVM" /* EVM */,
     transport,
@@ -337,7 +358,8 @@ var adaptEthersSigner = (signer, transport) => {
     address: async () => signer.getAddress(),
     sendTransaction,
     signTypedData,
-    switchChain
+    switchChain,
+    readContract
   };
 };
 var adaptViemWallet = (wallet) => {
@@ -396,6 +418,20 @@ var adaptViemWallet = (wallet) => {
     if (!addr) throw new Error("No address found");
     return addr;
   };
+  const readContract = async ({
+    address: address2,
+    abi,
+    functionName,
+    args = []
+  }) => {
+    const publicClient = wallet.extend(publicActions);
+    return await publicClient.readContract({
+      address: address2,
+      abi,
+      functionName,
+      args
+    });
+  };
   return {
     vmType: "EVM" /* EVM */,
     transport: custom(wallet.transport),
@@ -403,17 +439,17 @@ var adaptViemWallet = (wallet) => {
     address,
     sendTransaction,
     signTypedData,
-    switchChain
+    switchChain,
+    readContract
   };
 };
 
 // src/core/executeOrder/handleEvmExecution.ts
 import {
   getEVMSingleChainOrderTypedData,
-  getEVMCrossChainOrderTypedData,
-  PERMIT2_ADDRESS
+  getEVMCrossChainOrderTypedData
 } from "@shogun-sdk/intents-sdk";
-import { encodeFunctionData, erc20Abi } from "viem";
+import { encodeFunctionData as encodeFunctionData2 } from "viem";
 
 // src/core/executeOrder/stageMessages.ts
 var DEFAULT_STAGE_MESSAGES = {
@@ -568,6 +604,51 @@ async function handleOrderPollingResult({
   };
 }
 
+// src/core/executeOrder/ensurePermit2Allowance.ts
+import { encodeFunctionData, erc20Abi, maxUint256 } from "viem";
+import { PERMIT2_ADDRESS } from "@shogun-sdk/intents-sdk";
+async function ensurePermit2Allowance({
+  chainId,
+  tokenIn,
+  wallet,
+  accountAddress,
+  requiredAmount,
+  increaseByDelta = false
+}) {
+  const spender = PERMIT2_ADDRESS[chainId];
+  let currentAllowance = 0n;
+  try {
+    if (!wallet.readContract) {
+      throw new Error("Wallet does not implement readContract()");
+    }
+    currentAllowance = await wallet.readContract({
+      address: tokenIn,
+      abi: erc20Abi,
+      functionName: "allowance",
+      args: [accountAddress, spender]
+    });
+  } catch (error) {
+    console.warn(`[Permit2] Failed to read allowance for ${tokenIn}`, error);
+  }
+  const approvalAmount = increaseByDelta ? currentAllowance + requiredAmount : maxUint256;
+  console.debug(
+    `[Permit2] Approving ${approvalAmount} for ${tokenIn} (current: ${currentAllowance}, required: ${requiredAmount})`
+  );
+  await wallet.sendTransaction({
+    to: tokenIn,
+    from: accountAddress,
+    data: encodeFunctionData({
+      abi: erc20Abi,
+      functionName: "approve",
+      args: [spender, approvalAmount]
+    }),
+    value: 0n
+  });
+  console.info(
+    `[Permit2] Approval transaction sent for ${tokenIn} on chain ${chainId}`
+  );
+}
+
 // src/core/executeOrder/handleEvmExecution.ts
 async function handleEvmExecution({
   recipientAddress,
@@ -582,12 +663,13 @@ async function handleEvmExecution({
   const messageFor = (stage) => DEFAULT_STAGE_MESSAGES[stage];
   await wallet.switchChain(chainId);
   const tokenIn = normalizeNative(chainId, quote.tokenIn.address);
+  quote.tokenOut.address = normalizeEvmTokenAddress(quote.tokenOut.address);
   const shouldWrapNative = isNativeAddress(quote.tokenIn.address);
   update("processing", shouldWrapNative ? `${messageFor("processing")} (wrapping native token)` : messageFor("processing"));
   if (shouldWrapNative) {
     await wallet.sendTransaction({
       to: tokenIn,
-      data: encodeFunctionData({
+      data: encodeFunctionData2({
         abi: [{ type: "function", name: "deposit", stateMutability: "payable", inputs: [], outputs: [] }],
         functionName: "deposit",
         args: []
@@ -597,15 +679,12 @@ async function handleEvmExecution({
     });
   }
   update("processing", messageFor("approving"));
-  await wallet.sendTransaction({
-    to: tokenIn,
-    data: encodeFunctionData({
-      abi: erc20Abi,
-      functionName: "approve",
-      args: [PERMIT2_ADDRESS[chainId], quote.amountIn]
-    }),
-    value: 0n,
-    from: accountAddress
+  await ensurePermit2Allowance({
+    chainId,
+    tokenIn,
+    wallet,
+    accountAddress,
+    requiredAmount: BigInt(quote.amountIn)
   });
   update("processing", messageFor("approved"));
   const destination = recipientAddress ?? accountAddress;
@@ -1125,6 +1204,7 @@ export {
   getTokenList,
   isNativeAddress,
   isViemWalletClient,
+  normalizeEvmTokenAddress,
   serializeBigIntsToStrings,
   useBalances,
   useExecuteOrder,