@kaspacom/swap-sdk 1.1.6 → 1.1.7

package/README.md

@@ -36,11 +36,11 @@ import {
 } from 'swap-widget';
 
 const controller = createKaspaComSwapController({
-  networkConfig: 'kasplex-testnet',
+  networkConfig: 'kasplex',
   walletProvider: window.ethereum, // any EIP-1193 provider
   onChange: async (state, patch) => {
     console.log('state changed', patch, state);
-    // Render your UI from state.computed, state.tradeInfo, state.loader, etc.
+    // Render your UI from state.computed, state.loader, etc.
   },
 });
 ```
@@ -101,10 +101,12 @@ console.log(tokens);
 ### createKaspaComSwapController(options)
 Creates and returns a `SwapSdkController` instance. Accepts either a preset string for `networkConfig` or a full `SwapSdkNetworkConfig` object.
 
-- **options.networkConfig**: `'kasplex-testnet'` or `SwapSdkNetworkConfig`
+- **options.networkConfig**: `'kasplex-testnet'`, `'kasplex'` or `SwapSdkNetworkConfig`
 - **options.walletProvider**: EIP-1193 provider (e.g., `window.ethereum`)
 - **options.partnerKey?**: Optional partner key string
 - **options.onChange?**: `(state, patch) => Promise<void>` callback invoked on any state change
+- **options.refreshPairsInterval?**: Optional Number of milliseconds to refresh pairs from the subgraph (for updated quotes)
+- **options.updateQuoteAfterRefreshPairs?**: Optional boolean to update quote after refreshing pairs
 
 Returns: `SwapSdkController`
 
@@ -132,6 +134,10 @@ Returns: `SwapSdkController`
   - Fetches the current partner fee in percentage (bps/divisor).
 - **getTokensFromGraph(limit?: number, search?: string): Promise<any[]>**
   - Queries the subgraph for tokens. Use for token lists/search.
+- **refreshTokensAndUpdateQuote(forceQuoteUpdate = false): Promise<void>**
+  - Refreshes tokens from the subgraph and updates quote if configured. Needed to be called after swap completed or once in a while to get updated quotes.
+- **destroy(): void**
+  - Releases all resources from the controller, needs to be called after done using the controller.
 
 ## Types
 
@@ -195,7 +201,7 @@ All types are exported from `swap-widget`.
   - `error?: string`
   - `txHash?: string` (Swap tx hash)
   - `approveTxHash?: string` (Approval transaction tx hash)
-  - `tradeInfo?: Trade<Currency, Currency, TradeType>` (Uniswap V2 trade)
+  - `path?: Token[]` (Trade path)
   - `computed?: ComputedAmounts`
   - `loader: LoaderStatuses | null`
 
@@ -215,7 +221,7 @@ All types are exported from `swap-widget`.
     The wrapped native token (WKAS).
 
 - **NETWORKS**
-  - Preset map of network keys to `SwapSdkNetworkConfig` objects. Includes `'kasplex-testnet'`.
+  - Preset map of network keys to `SwapSdkNetworkConfig` objects. Includes `'kasplex-testnet'`, `'kasplex'`.
 
 
 ## Usage Patterns

package/dist/index.cjs

@@ -127,6 +127,12 @@ var WalletService = class {
   getProvider() {
     return this.walletProvider || this.networkProvider;
   }
+  destroy() {
+    if (this.walletProvider) {
+      this.networkProvider.destroy();
+      this.disconnect();
+    }
+  }
   getSigner() {
     return this.signer;
   }
@@ -162,11 +168,6 @@ var WalletService = class {
       throw new Error("No Ethereum wallet detected. Please connect a wallet provider.");
     }
   }
-  // Disconnect wallet and emit event
-  disconnectWallet() {
-    this.address = null;
-    this.signer = null;
-  }
 };
 
 // src/services/swap.service.ts
@@ -1255,12 +1256,30 @@ var SwapService = class {
     this.signer = null;
     this.pairs = [];
     this.resolvePairsLoaded = null;
+    this.rejectPairsLoaded = null;
     this.resolvePartnerFeeLoaded = null;
+    this.rejectPartnerFeeLoaded = null;
     this.partnerFee = 0n;
     this.provider = provider;
-    this.wethAddress = config.wrappedToken.address;
     this.chainId = config.chainId;
-    const routerAbi = [
+    this.routerContract = new import_ethers2.Contract(config.routerAddress, this.routerAbi, provider);
+    this.factoryContract = new import_ethers2.Contract(config.factoryAddress, this.factoryAbi, provider);
+    if (config.proxyAddress) {
+      this.proxyContract = new import_ethers2.Contract(config.proxyAddress, this.proxyAbi, provider);
+    }
+    this.pairsLoadedPromise = new Promise((resolve, reject) => {
+      this.resolvePairsLoaded = resolve;
+      this.rejectPairsLoaded = reject;
+    });
+    this.partnerFeeLoadedPromise = new Promise((resolve, reject) => {
+      this.resolvePartnerFeeLoaded = resolve;
+      this.rejectPartnerFeeLoaded = reject;
+    });
+    this.loadAllPairs();
+    this.loadPartnerFee();
+  }
+  get routerAbi() {
+    return [
       // Swaps (ERC20 <-> ERC20)
       "function swapExactTokensForTokens(uint amountIn, uint amountOutMin, address[] calldata path, address to, uint deadline) external returns (uint[] memory amounts)",
       "function swapTokensForExactTokens(uint amountOut, uint amountInMax, address[] calldata path, address to, uint deadline) external returns (uint[] memory amounts)",
@@ -1273,47 +1292,49 @@ var SwapService = class {
       "function getAmountsOut(uint amountIn, address[] calldata path) external view returns (uint[] memory amounts)",
       "function getAmountOut(uint amountIn, uint reserveIn, uint reserveOut) external pure returns (uint amountOut)",
       "function getAmountIn(uint amountOut, uint reserveIn, uint reserveOut) internal pure returns (uint amountIn)",
-      "function getAmountsIn(address factory, uint amountOut, address[] memory path) internal view returns (uint[] memory amounts)",
+      "function getAmountsIn(uint amountOut, address[] memory path) internal view returns (uint[] memory amounts)",
       // Get WETH
       "function WETH() external pure returns (address)"
     ];
-    const factoryAbi = [
+  }
+  get factoryAbi() {
+    return [
       "function getPair(address tokenA, address tokenB) external view returns (address pair)",
       "function allPairs(uint) external view returns (address pair)",
       "function allPairsLength() external view returns (uint)"
     ];
-    const proxyAbi = [
-      ...routerAbi,
+  }
+  get proxyAbi() {
+    return [
+      ...this.routerAbi,
       "function partners(bytes32) external view returns (address feeRecipient, uint16 feeBps)"
     ];
-    this.routerContract = new import_ethers2.Contract(config.routerAddress, routerAbi, provider);
-    this.factoryContract = new import_ethers2.Contract(config.factoryAddress, factoryAbi, provider);
-    if (config.proxyAddress) {
-      this.proxyContract = new import_ethers2.Contract(config.proxyAddress, proxyAbi, provider);
-    }
-    this.pairsLoadedPromise = new Promise((resolve) => {
-      this.resolvePairsLoaded = resolve;
-    });
-    this.partnerFeeLoadedPromise = new Promise((resolve) => {
-      this.resolvePartnerFeeLoaded = resolve;
-    });
-    this.loadAllPairsFromGraph();
-    this.loadPartnerFee();
   }
   // parnter fee is BPS_DIVISOR = 10_000n;
   async loadPartnerFee() {
     if (!this.resolvePairsLoaded) {
       return this.partnerFee;
     }
-    if (this.swapOptions.partnerKey && this.proxyContract) {
-      const [, fee] = await this.proxyContract?.partners(this.swapOptions.partnerKey);
-      this.partnerFee = fee;
-    }
-    if (this.resolvePartnerFeeLoaded) {
-      this.resolvePartnerFeeLoaded();
-      this.resolvePartnerFeeLoaded = null;
+    try {
+      if (this.swapOptions.partnerKey && this.proxyContract) {
+        const [, fee] = await this.proxyContract?.partners(this.swapOptions.partnerKey);
+        this.partnerFee = fee;
+      }
+      if (this.resolvePartnerFeeLoaded) {
+        this.resolvePartnerFeeLoaded();
+        this.resolvePartnerFeeLoaded = null;
+      }
+      return this.partnerFee;
+    } catch (error) {
+      if (this.rejectPartnerFeeLoaded) {
+        this.rejectPartnerFeeLoaded(error);
+        this.partnerFeeLoadedPromise = new Promise((resolve, reject) => {
+          this.resolvePartnerFeeLoaded = resolve;
+          this.rejectPartnerFeeLoaded = reject;
+        });
+      }
+      throw error;
     }
-    return this.partnerFee;
   }
   setSigner(signer) {
     this.signer = signer;
@@ -1333,11 +1354,7 @@ var SwapService = class {
     }
     return num.toFixed(decimals);
   }
-  /**
-   * Loads all pairs from The Graph and caches them as Uniswap SDK Pair instances.
-   * @param graphEndpoint The GraphQL endpoint URL
-   */
-  async loadAllPairsFromGraph() {
+  async refreshPairsFromGraph() {
     const query = `{
       pairs(first: 1000) {
         id
@@ -1347,46 +1364,47 @@ var SwapService = class {
         token1 { id symbol name decimals }
       }
     }`;
-    try {
-      const response = await fetch(this.config.graphEndpoint, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ query })
-      });
-      if (!response.ok) throw new Error(`Network error: ${response.status}`);
-      const { data } = await response.json();
-      if (!data || !data.pairs) return;
-      const pairs = [];
-      for (const pair of data.pairs) {
-        pairs.push(
-          this.createSDKPair(pair)
-        );
-      }
-      this.pairs = pairs;
-      const wethPair = data.pairs.find(
-        (pair) => pair.token0.id.toLowerCase() === this.wethAddress.toLowerCase() || pair.token1.id.toLowerCase() === this.wethAddress.toLowerCase()
+    const response = await fetch(this.config.graphEndpoint, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ query })
+    });
+    if (!response.ok) throw new Error(`Network error: ${response.status}`);
+    const { data } = await response.json();
+    if (!data || !data.pairs) throw new Error(`No pairs found: ${data}`);
+    return data.pairs;
+  }
+  async refreshPairs() {
+    const pairsResult = this.swapOptions.getPairsData ? await this.swapOptions.getPairsData() : await this.refreshPairsFromGraph();
+    const pairs = [];
+    for (const pair of pairsResult) {
+      pairs.push(
+        this.createSDKPair(pair)
       );
-      if (wethPair) {
-        const tokenData = wethPair.token0.id.toLowerCase() === this.wethAddress.toLowerCase() ? wethPair.token0 : wethPair.token1;
-        this.wethToken = {
-          address: tokenData.id,
-          symbol: tokenData.symbol,
-          name: tokenData.name,
-          decimals: Number(tokenData.decimals)
-        };
-      } else {
-        throw new Error("No weth token found");
-      }
+    }
+    this.pairs = pairs;
+  }
+  /**
+   * Loads all pairs from The Graph and caches them as Uniswap SDK Pair instances.
+   * @param graphEndpoint The GraphQL endpoint URL
+   */
+  async loadAllPairs() {
+    try {
+      await this.refreshPairs();
       if (this.resolvePairsLoaded) {
         this.resolvePairsLoaded();
         this.resolvePairsLoaded = null;
       }
     } catch (error) {
       console.error("Error loading pairs from graph:", error);
-      if (this.resolvePairsLoaded) {
-        this.resolvePairsLoaded();
-        this.resolvePairsLoaded = null;
+      if (this.rejectPairsLoaded) {
+        this.rejectPairsLoaded(error);
       }
+      this.pairsLoadedPromise = new Promise((resolve, reject) => {
+        this.resolvePairsLoaded = resolve;
+        this.rejectPairsLoaded = reject;
+      });
+      setTimeout(this.loadAllPairs.bind(this), 1e3);
     }
   }
   async waitForPairsLoaded() {
@@ -1396,7 +1414,7 @@ var SwapService = class {
     return await this.partnerFeeLoadedPromise;
   }
   createSDKPair(pair) {
-    const { token0, token1, id, reserve0, reserve1 } = pair;
+    const { token0, token1, reserve0, reserve1 } = pair;
     const sdkToken0 = new import_sdk_core2.Token(
       this.chainId,
       token0.id,
@@ -1459,8 +1477,6 @@ var SwapService = class {
       isOutputAmount ? sdkToToken : sdkFromToken,
       amountInWei
     );
-    await this.waitForPairsLoaded();
-    await this.waitForPartnerFeeLoaded();
     const pairs = this.getPairs();
     if (!pairs || pairs.length === 0) {
       throw new Error("Pairs not loaded yet. Please wait for initialization.");
@@ -1486,6 +1502,14 @@ var SwapService = class {
     value = value.replace(/\.?0+$/, "");
     return value;
   }
+  async getAmountsIn(sellAmountWei, pathAddresses) {
+    const [aIn] = await this.routerContract.getAmountsIn(sellAmountWei, pathAddresses);
+    return aIn;
+  }
+  async getAmountsOut(buyAmountWei, pathAddresses) {
+    const [, aOut] = await this.routerContract.getAmountsOut(buyAmountWei, pathAddresses);
+    return aOut;
+  }
   /**
    * 
    * @param sellToken 
@@ -1497,6 +1521,8 @@ var SwapService = class {
    */
   async calculateTrade(sellToken, buyToken, targetAmount, isOutputAmount, slippage) {
     try {
+      await this.waitForPairsLoaded();
+      await this.waitForPartnerFeeLoaded();
       const roundedAmountIn = this.roundToDecimals(targetAmount, isOutputAmount ? buyToken.decimals : sellToken.decimals);
       let sellAmountWei = (0, import_ethers2.parseUnits)(
         roundedAmountIn,
@@ -1507,8 +1533,8 @@ var SwapService = class {
         const denominator = PARTNER_FEE_BPS_DIVISOR - this.partnerFee;
         sellAmountWei = (numerator + denominator - 1n) / denominator;
       }
-      const sellTokenForContracts = sellToken.address == import_ethers2.ethers.ZeroAddress ? this.wethToken : sellToken;
-      const buyTokenForContracts = buyToken.address == import_ethers2.ethers.ZeroAddress ? this.wethToken : buyToken;
+      const sellTokenForContracts = sellToken.address == import_ethers2.ethers.ZeroAddress ? this.config.wrappedToken : sellToken;
+      const buyTokenForContracts = buyToken.address == import_ethers2.ethers.ZeroAddress ? this.config.wrappedToken : buyToken;
       const trade = await this.getBestTrade(
         sellTokenForContracts,
         buyTokenForContracts,
@@ -1518,8 +1544,16 @@ var SwapService = class {
       if (!trade) {
         throw new Error("No trade path found for the given tokens and amount.");
       }
-      const amountIn = trade.inputAmount.quotient.toString();
-      const amountOut = trade.outputAmount.quotient.toString();
+      const pathAddresses = trade.route.path.map((token) => token.address);
+      let amountIn = "0";
+      let amountOut = "0";
+      if (isOutputAmount) {
+        amountIn = String(await this.getAmountsIn(sellAmountWei, pathAddresses));
+        amountOut = String((0, import_ethers2.parseUnits)(targetAmount, buyToken.decimals));
+      } else {
+        amountOut = String(await this.getAmountsOut(sellAmountWei, pathAddresses));
+        amountIn = String((0, import_ethers2.parseUnits)(targetAmount, sellToken.decimals));
+      }
       let amounts = {
         amountIn: (0, import_ethers2.formatUnits)(amountIn, sellToken.decimals),
         amountOut: isOutputAmount ? this.trimTrailingZeros(roundedAmountIn) : (0, import_ethers2.formatUnits)(amountOut, buyToken.decimals),
@@ -1529,18 +1563,23 @@ var SwapService = class {
       const slippagePercent = new import_sdk_core2.Percent(Math.round(parseFloat(slippage) * 100), 1e4);
       let maxAmountIn, minAmountOut;
       if (isOutputAmount) {
-        maxAmountIn = trade.maximumAmountIn(slippagePercent).quotient.toString();
+        const slippageAmount = BigInt(amountIn) * BigInt(slippagePercent.numerator.toString()) / BigInt(slippagePercent.denominator.toString());
+        const maxAmountInBigInt = BigInt(amountIn) + slippageAmount;
+        maxAmountIn = maxAmountInBigInt.toString();
         amounts.maxAmountInRaw = maxAmountIn;
         amounts.maxAmountIn = (0, import_ethers2.formatUnits)(maxAmountIn, sellToken.decimals);
       } else {
-        minAmountOut = trade.minimumAmountOut(slippagePercent).quotient.toString();
+        const amountOutBigInt = BigInt(amountOut);
+        const slippageAmount = amountOutBigInt * BigInt(slippagePercent.numerator.toString()) / BigInt(slippagePercent.denominator.toString());
+        const minAmountOutBigInt = amountOutBigInt - slippageAmount;
+        minAmountOut = minAmountOutBigInt.toString();
         amounts.minAmountOutRaw = minAmountOut;
         amounts.minAmountOut = (0, import_ethers2.formatUnits)(minAmountOut, buyToken.decimals);
       }
       if (this.partnerFee && this.partnerFee > 0n) {
         if (!isOutputAmount) {
-          const amountOut2 = BigInt(trade.outputAmount.quotient.toString());
-          const amountOutMinusFee = amountOut2 * (PARTNER_FEE_BPS_DIVISOR - this.partnerFee) / PARTNER_FEE_BPS_DIVISOR;
+          const amountOutBigInt = BigInt(amountOut);
+          const amountOutMinusFee = amountOutBigInt * (PARTNER_FEE_BPS_DIVISOR - this.partnerFee) / PARTNER_FEE_BPS_DIVISOR;
           amounts.amountOutRaw = amountOutMinusFee.toString();
           amounts.amountOut = (0, import_ethers2.formatUnits)(amountOutMinusFee, buyToken.decimals);
           if (minAmountOut) {
@@ -1834,6 +1873,7 @@ var DEFAULT_SETTINGS = {
 };
 var SwapSdkController = class {
   constructor(options) {
+    this.refreshPairsTimeout = null;
     this.state = {
       loader: null
     };
@@ -1852,11 +1892,16 @@ var SwapSdkController = class {
       this.options.networkConfig,
       this.options.walletProvider
     );
-    this.swapService = new SwapService(
+    this.swapService = new (this.options.swapServiceClass || SwapService)(
       this.walletService.getProvider(),
       this.options.networkConfig,
       this.options
     );
+    if (this.options.refreshPairsInterval) {
+      this.swapService.waitForPairsLoaded().finally(() => {
+        this.refreshPairsTimeout = setTimeout(this.refreshTokensAndUpdateQuoteAndSetTimeout.bind(this), this.options.refreshPairsInterval);
+      });
+    }
   }
   async setChange(patch) {
     const next = {
@@ -1905,6 +1950,7 @@ var SwapSdkController = class {
       await this.setChange({
         computed: tradeResult.computed,
         tradeInfo: tradeResult.trade,
+        path: tradeResult.trade.route.path,
         loader: null
       });
     } catch (error) {
@@ -1962,9 +2008,8 @@ var SwapSdkController = class {
       if (!fromToken || !toToken || amount === void 0) throw new Error("Tokens or amount not set");
       await this.approveIfNeeded();
       await this.setChange({ loader: 3 /* SWAPPING */ });
-      const trade = this.state.tradeInfo;
-      if (!trade) throw new Error("Trade info missing - calculate quote first");
-      const path = trade.route.path.map((token) => token.address);
+      if (!this.state.path) throw new Error("Trade info missing - calculate quote first");
+      const path = this.state.path.map((token) => token.address);
       if (path.length === 0) throw new Error("Trade path missing");
       const computed = this.state.computed;
       if (!computed) throw new Error("Computed amounts missing");
@@ -2006,6 +2051,29 @@ var SwapSdkController = class {
   get currentNetworkConfig() {
     return this.options.networkConfig;
   }
+  async destroy() {
+    if (this.walletService) {
+      this.walletService.destroy();
+    }
+    if (this.refreshPairsTimeout) {
+      clearTimeout(this.refreshPairsTimeout);
+      this.refreshPairsTimeout = null;
+    }
+  }
+  async refreshTokensAndUpdateQuote(forceQuoteUpdate = false) {
+    await this.swapService?.refreshPairsFromGraph();
+    if ((this.options.updateQuoteAfterRefreshPairs || forceQuoteUpdate) && !this.state.loader) {
+      await this.calculateQuoteIfNeeded();
+    }
+  }
+  async refreshTokensAndUpdateQuoteAndSetTimeout() {
+    try {
+      await this.refreshTokensAndUpdateQuote();
+    } catch (error) {
+      console.error(error);
+    }
+    this.refreshPairsTimeout = setTimeout(this.refreshTokensAndUpdateQuoteAndSetTimeout.bind(this), this.options.refreshPairsInterval);
+  }
 };
 
 // src/config/networks.ts
@@ -2037,6 +2105,33 @@ var NETWORKS = {
       name: "Kasplex Kaspa",
       symbol: "KAS"
     }
+  },
+  "kasplex": {
+    name: "Kasplex",
+    chainId: 202555,
+    rpcUrl: "https://evmrpc.kasplex.org",
+    routerAddress: "0x3a1f0bD164fe9D8fa18Da5abAB352dC634CA5F10",
+    factoryAddress: "0xa9CBa43A407c9Eb30933EA21f7b9D74A128D613c",
+    proxyAddress: "0x4c5BEaAE83577E3a117ce2F477fC42a1EA39A8a3",
+    graphEndpoint: "https://graph-kasplex.kaspa.com/subgraphs/name/kasplex-v2-core",
+    blockExplorerUrl: "https://explorer.kasplex.org",
+    additionalJsonRpcApiProviderOptionsOptions: {
+      batchMaxCount: 1,
+      batchMaxSize: 1,
+      batchStallTime: 0
+    },
+    wrappedToken: {
+      address: "0x2c2Ae87Ba178F48637acAe54B87c3924F544a83e",
+      decimals: 18,
+      name: "Wrapped KAS",
+      symbol: "WKAS"
+    },
+    nativeToken: {
+      address: import_ethers3.ethers.ZeroAddress,
+      decimals: 18,
+      name: "Kasplex Kaspa",
+      symbol: "KAS"
+    }
   }
   // Add more networks as needed
 };