@swapkit/core 1.0.0-rc.170 → 1.0.0-rc.171

package/package.json

@@ -1,16 +1,18 @@
 {
   "author": "swapkit-oss",
   "dependencies": {
-    "@swapkit/api": "1.0.0-rc.83",
-    "@swapkit/helpers": "1.0.0-rc.115",
-    "@swapkit/toolbox-cosmos": "1.0.0-rc.142",
-    "@swapkit/toolbox-evm": "1.0.0-rc.122",
-    "@swapkit/toolbox-solana": "1.0.0-rc.3",
-    "@swapkit/toolbox-substrate": "1.0.0-rc.50",
-    "@swapkit/toolbox-utxo": "1.0.0-rc.126"
+    "@swapkit/api": "undefined",
+    "@swapkit/contracts": "undefined",
+    "@swapkit/helpers": "undefined",
+    "@swapkit/plugin-evm": "1.0.0-rc.16",
+    "@swapkit/toolbox-cosmos": "1.0.0-rc.143",
+    "@swapkit/toolbox-evm": "1.0.0-rc.123",
+    "@swapkit/toolbox-solana": "1.0.0-rc.4",
+    "@swapkit/toolbox-substrate": "1.0.0-rc.51",
+    "@swapkit/toolbox-utxo": "1.0.0-rc.127"
   },
   "devDependencies": {
-    "@swapkit/tokens": "1.0.0-rc.57"
+    "@swapkit/tokens": "undefined"
   },
   "description": "SwapKit - Core",
   "files": [
@@ -36,5 +38,5 @@
   },
   "type": "module",
   "types": "./src/index.ts",
-  "version": "1.0.0-rc.170"
+  "version": "1.0.0-rc.171"
 }

package/src/client.ts

@@ -1,3 +1,4 @@
+import { lowercasedContractAbiMapping } from "@swapkit/contracts";
 import {
   type AddChainWalletParams,
   ApproveMode,
@@ -15,20 +16,19 @@ import {
   type WalletChain,
   isGasAsset,
 } from "@swapkit/helpers";
-import {
-  type BaseEVMWallet,
-  type TransferParams as EVMTransferParams,
-  evmValidateAddress,
-} from "@swapkit/toolbox-evm";
-
 import {
   type TransferParams as CosmosTransferParams,
   estimateTransactionFee as cosmosTransactionFee,
   cosmosValidateAddress,
 } from "@swapkit/toolbox-cosmos";
+import {
+  type BaseEVMWallet,
+  type TransferParams as EVMTransferParams,
+  evmValidateAddress,
+} from "@swapkit/toolbox-evm";
 import { substrateValidateAddress } from "@swapkit/toolbox-substrate";
 import { type UTXOTransferParams, utxoValidateAddress } from "@swapkit/toolbox-utxo";
-import { lowercasedContractAbiMapping } from "./aggregator/contracts/index.ts";
+
 import {
   getExplorerAddressUrl as getAddressUrl,
   getExplorerTxUrl as getTxUrl,
@@ -335,6 +335,9 @@ export function SwapKit<
     const { assetValue } = params;
     const chain = params.assetValue.chain as WalletChain;
     if (!connectedWallets[chain]) throw new SwapKitError("core_wallet_connection_not_found");
+
+    const baseValue = AssetValue.fromChainOrSignature(chain, 0);
+
     switch (chain) {
       case Chain.Arbitrum:
       case Chain.Avalanche:
@@ -342,76 +345,92 @@ export function SwapKit<
       case Chain.BinanceSmartChain:
       case Chain.Polygon: {
         const wallet = connectedWallets[chain as Exclude<EVMChain, Chain.Optimism>];
-        if (type === "transfer") {
-          const txObject = await wallet.createTransferTx(params);
-          return wallet.estimateTransactionFee(txObject, feeOptionKey);
-        }
-        if (type === "approve" && !isGasAsset(assetValue)) {
-          wallet.estimateTransactionFee(
-            await wallet.createApprovalTx({
-              assetAddress: assetValue.address as string,
-              spenderAddress: params.contractAddress as string,
-              amount: assetValue.getBaseValue("bigint"),
-              from: wallet.address,
-            }),
-            feeOptionKey,
-          );
-        }
-        if (type === "swap") {
-          const plugin = params.route.providers[0] as PluginNameEnum;
-          if (plugin === PluginNameEnum.CHAINFLIP) {
-            const txObject = await wallet.createTransferTx({
-              from: wallet.address,
-              recipient: wallet.address,
-              assetValue,
-            });
+        switch (type) {
+          case "transfer": {
+            const txObject = await wallet.createTransferTx(params);
             return wallet.estimateTransactionFee(txObject, feeOptionKey);
           }
-          const {
-            route: { evmTransactionDetails },
-          } = params;
-          if (
-            !(
-              evmTransactionDetails &&
-              lowercasedContractAbiMapping[evmTransactionDetails.contractAddress]
-            )
-          )
-            return undefined;
-          wallet.estimateCall({
-            contractAddress: evmTransactionDetails.contractAddress,
-            // biome-ignore lint/style/noNonNullAssertion: TS cant infer the type
-            abi: lowercasedContractAbiMapping[evmTransactionDetails.contractAddress]!,
-            funcName: evmTransactionDetails.contractMethod,
-            funcParams: evmTransactionDetails.contractParams,
-          });
+
+          case "approve": {
+            if (isGasAsset(assetValue)) return baseValue;
+
+            return wallet.estimateTransactionFee(
+              await wallet.createApprovalTx({
+                assetAddress: assetValue.address as string,
+                spenderAddress: params.contractAddress as string,
+                amount: assetValue.getBaseValue("bigint"),
+                from: wallet.address,
+              }),
+              feeOptionKey,
+            );
+          }
+
+          case "swap": {
+            const plugin = params.route.providers[0] as PluginNameEnum;
+            if (plugin === PluginNameEnum.CHAINFLIP) {
+              const txObject = await wallet.createTransferTx({
+                from: wallet.address,
+                recipient: wallet.address,
+                assetValue,
+              });
+              return wallet.estimateTransactionFee(txObject, feeOptionKey);
+            }
+            const { evmTransactionDetails } = params.route;
+
+            if (
+              !(
+                evmTransactionDetails &&
+                lowercasedContractAbiMapping[evmTransactionDetails.contractAddress]
+              )
+            ) {
+              return undefined;
+            }
+
+            const estimate = await wallet.estimateCall({
+              contractAddress: evmTransactionDetails.contractAddress,
+              // biome-ignore lint/style/noNonNullAssertion: TS cant infer the type
+              abi: lowercasedContractAbiMapping[evmTransactionDetails.contractAddress]!,
+              funcName: evmTransactionDetails.contractMethod,
+              funcParams: evmTransactionDetails.contractParams,
+            });
+
+            return AssetValue.fromChainOrSignature(chain, estimate);
+          }
+
+          default:
+            return baseValue;
         }
-        return AssetValue.fromChainOrSignature(chain, 0);
       }
+
       case Chain.Bitcoin:
       case Chain.BitcoinCash:
       case Chain.Dogecoin:
       case Chain.Dash:
       case Chain.Litecoin: {
-        const wallet = connectedWallets[chain as UTXOChain];
-        return wallet.estimateTransactionFee({
+        const { estimateMaxSendableAmount, address } = connectedWallets[chain as UTXOChain];
+
+        return estimateMaxSendableAmount({
           ...params,
           feeOptionKey,
-          from: wallet.address,
-          recipient: wallet.address,
+          from: address,
+          recipient: address,
         });
       }
+
       case Chain.THORChain:
       case Chain.Maya:
       case Chain.Kujira:
       case Chain.Cosmos: {
         return cosmosTransactionFee(params);
       }
+
       case Chain.Polkadot: {
         const wallet = connectedWallets[chain as Chain.Polkadot];
         return wallet.estimateTransactionFee({ ...params, recipient: wallet.address });
       }
+
       default:
-        return undefined;
+        return baseValue;
     }
   }
 

package/src/helpers/explorerUrls.ts

@@ -1,4 +1,4 @@
-import { Chain, ChainToExplorerUrl } from "@swapkit/helpers";
+import { Chain, ChainToExplorerUrl, SwapKitError } from "@swapkit/helpers";
 
 export function getExplorerTxUrl({ chain, txHash }: { txHash: string; chain: Chain }) {
   const baseUrl = ChainToExplorerUrl[chain];
@@ -28,7 +28,7 @@ export function getExplorerTxUrl({ chain, txHash }: { txHash: string; chain: Cha
       return `${baseUrl}/transaction/${txHash.toLowerCase()}`;
 
     default:
-      throw new Error(`Unsupported chain: ${chain}`);
+      throw new SwapKitError({ errorKey: "core_explorer_unsupported_chain", info: { chain } });
   }
 }
 

package/src/aggregator/contracts/avaxGeneric.ts

@@ -1,92 +0,0 @@
-export const avaxGeneric = [
-  {
-    inputs: [{ internalType: "address", name: "_ttp", type: "address" }],
-    stateMutability: "nonpayable",
-    type: "constructor",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: false, internalType: "uint256", name: "fee", type: "uint256" },
-      { indexed: false, internalType: "address", name: "feeRecipient", type: "address" },
-    ],
-    name: "FeeSet",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: true, internalType: "address", name: "owner", type: "address" },
-      { indexed: false, internalType: "bool", name: "active", type: "bool" },
-    ],
-    name: "OwnerSet",
-    type: "event",
-  },
-  {
-    inputs: [],
-    name: "fee",
-    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "feeRecipient",
-    outputs: [{ internalType: "address", name: "", type: "address" }],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [{ internalType: "address", name: "", type: "address" }],
-    name: "owners",
-    outputs: [{ internalType: "bool", name: "", type: "bool" }],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "_fee", type: "uint256" },
-      { internalType: "address", name: "_feeRecipient", type: "address" },
-    ],
-    name: "setFee",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      { internalType: "address", name: "owner", type: "address" },
-      { internalType: "bool", name: "active", type: "bool" },
-    ],
-    name: "setOwner",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      { internalType: "address", name: "tcRouter", type: "address" },
-      { internalType: "address", name: "tcVault", type: "address" },
-      { internalType: "string", name: "tcMemo", type: "string" },
-      { internalType: "address", name: "token", type: "address" },
-      { internalType: "uint256", name: "amount", type: "uint256" },
-      { internalType: "address", name: "router", type: "address" },
-      { internalType: "bytes", name: "data", type: "bytes" },
-      { internalType: "uint256", name: "deadline", type: "uint256" },
-    ],
-    name: "swapIn",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "tokenTransferProxy",
-    outputs: [
-      { internalType: "contract TSAggregatorTokenTransferProxy", name: "", type: "address" },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  { stateMutability: "payable", type: "receive" },
-];

package/src/aggregator/contracts/avaxWoofi.ts

@@ -1,145 +0,0 @@
-export const avaxWoofi = [
-  {
-    inputs: [
-      { internalType: "address", name: "_ttp", type: "address" },
-      { internalType: "address", name: "_weth", type: "address" },
-      { internalType: "address", name: "_swapRouter", type: "address" },
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: false, internalType: "uint256", name: "fee", type: "uint256" },
-      { indexed: false, internalType: "address", name: "feeRecipient", type: "address" },
-    ],
-    name: "FeeSet",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: true, internalType: "address", name: "owner", type: "address" },
-      { indexed: false, internalType: "bool", name: "active", type: "bool" },
-    ],
-    name: "OwnerSet",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: false, internalType: "address", name: "from", type: "address" },
-      { indexed: false, internalType: "address", name: "token", type: "address" },
-      { indexed: false, internalType: "uint256", name: "amount", type: "uint256" },
-      { indexed: false, internalType: "uint256", name: "out", type: "uint256" },
-      { indexed: false, internalType: "uint256", name: "fee", type: "uint256" },
-      { indexed: false, internalType: "address", name: "vault", type: "address" },
-      { indexed: false, internalType: "string", name: "memo", type: "string" },
-    ],
-    name: "SwapIn",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: false, internalType: "address", name: "to", type: "address" },
-      { indexed: false, internalType: "address", name: "token", type: "address" },
-      { indexed: false, internalType: "uint256", name: "amount", type: "uint256" },
-      { indexed: false, internalType: "uint256", name: "fee", type: "uint256" },
-    ],
-    name: "SwapOut",
-    type: "event",
-  },
-  {
-    inputs: [],
-    name: "fee",
-    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "feeRecipient",
-    outputs: [{ internalType: "address", name: "", type: "address" }],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [{ internalType: "address", name: "", type: "address" }],
-    name: "owners",
-    outputs: [{ internalType: "bool", name: "", type: "bool" }],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "_fee", type: "uint256" },
-      { internalType: "address", name: "_feeRecipient", type: "address" },
-    ],
-    name: "setFee",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      { internalType: "address", name: "owner", type: "address" },
-      { internalType: "bool", name: "active", type: "bool" },
-    ],
-    name: "setOwner",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      { internalType: "address", name: "router", type: "address" },
-      { internalType: "address", name: "vault", type: "address" },
-      { internalType: "string", name: "memo", type: "string" },
-      { internalType: "address", name: "token", type: "address" },
-      { internalType: "uint256", name: "amount", type: "uint256" },
-      { internalType: "uint256", name: "amountOutMin", type: "uint256" },
-      { internalType: "uint256", name: "deadline", type: "uint256" },
-    ],
-    name: "swapIn",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      { internalType: "address", name: "token", type: "address" },
-      { internalType: "address", name: "to", type: "address" },
-      { internalType: "uint256", name: "amountOutMin", type: "uint256" },
-    ],
-    name: "swapOut",
-    outputs: [],
-    stateMutability: "payable",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "swapRouter",
-    outputs: [{ internalType: "contract IWoofi", name: "", type: "address" }],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "tokenTransferProxy",
-    outputs: [
-      { internalType: "contract TSAggregatorTokenTransferProxy", name: "", type: "address" },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "weth",
-    outputs: [{ internalType: "address", name: "", type: "address" }],
-    stateMutability: "view",
-    type: "function",
-  },
-  { stateMutability: "payable", type: "receive" },
-];

package/src/aggregator/contracts/bscGeneric.ts

@@ -1,106 +0,0 @@
-export const bscGeneric = [
-  {
-    inputs: [{ internalType: "address", name: "_ttp", type: "address" }],
-    stateMutability: "nonpayable",
-    type: "constructor",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: false, internalType: "uint256", name: "fee", type: "uint256" },
-      { indexed: false, internalType: "address", name: "feeRecipient", type: "address" },
-    ],
-    name: "FeeSet",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: true, internalType: "address", name: "owner", type: "address" },
-      { indexed: false, internalType: "bool", name: "active", type: "bool" },
-    ],
-    name: "OwnerSet",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: false, internalType: "address", name: "from", type: "address" },
-      { indexed: false, internalType: "address", name: "token", type: "address" },
-      { indexed: false, internalType: "uint256", name: "amount", type: "uint256" },
-      { indexed: false, internalType: "uint256", name: "out", type: "uint256" },
-      { indexed: false, internalType: "uint256", name: "fee", type: "uint256" },
-      { indexed: false, internalType: "address", name: "vault", type: "address" },
-      { indexed: false, internalType: "string", name: "memo", type: "string" },
-    ],
-    name: "SwapIn",
-    type: "event",
-  },
-  {
-    inputs: [],
-    name: "fee",
-    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "feeRecipient",
-    outputs: [{ internalType: "address", name: "", type: "address" }],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [{ internalType: "address", name: "", type: "address" }],
-    name: "owners",
-    outputs: [{ internalType: "bool", name: "", type: "bool" }],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "_fee", type: "uint256" },
-      { internalType: "address", name: "_feeRecipient", type: "address" },
-    ],
-    name: "setFee",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      { internalType: "address", name: "owner", type: "address" },
-      { internalType: "bool", name: "active", type: "bool" },
-    ],
-    name: "setOwner",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      { internalType: "address", name: "router", type: "address" },
-      { internalType: "address", name: "vault", type: "address" },
-      { internalType: "string", name: "memo", type: "string" },
-      { internalType: "address", name: "token", type: "address" },
-      { internalType: "uint256", name: "amount", type: "uint256" },
-      { internalType: "address", name: "swapRouter", type: "address" },
-      { internalType: "bytes", name: "data", type: "bytes" },
-      { internalType: "uint256", name: "deadline", type: "uint256" },
-    ],
-    name: "swapIn",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "tokenTransferProxy",
-    outputs: [
-      { internalType: "contract TSAggregatorTokenTransferProxy", name: "", type: "address" },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  { stateMutability: "payable", type: "receive" },
-];

package/src/aggregator/contracts/ethGeneric.ts

@@ -1,92 +0,0 @@
-export const ethGeneric = [
-  {
-    inputs: [{ internalType: "address", name: "_ttp", type: "address" }],
-    stateMutability: "nonpayable",
-    type: "constructor",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: false, internalType: "uint256", name: "fee", type: "uint256" },
-      { indexed: false, internalType: "address", name: "feeRecipient", type: "address" },
-    ],
-    name: "FeeSet",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: true, internalType: "address", name: "owner", type: "address" },
-      { indexed: false, internalType: "bool", name: "active", type: "bool" },
-    ],
-    name: "OwnerSet",
-    type: "event",
-  },
-  {
-    inputs: [],
-    name: "fee",
-    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "feeRecipient",
-    outputs: [{ internalType: "address", name: "", type: "address" }],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [{ internalType: "address", name: "", type: "address" }],
-    name: "owners",
-    outputs: [{ internalType: "bool", name: "", type: "bool" }],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "_fee", type: "uint256" },
-      { internalType: "address", name: "_feeRecipient", type: "address" },
-    ],
-    name: "setFee",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      { internalType: "address", name: "owner", type: "address" },
-      { internalType: "bool", name: "active", type: "bool" },
-    ],
-    name: "setOwner",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      { internalType: "address", name: "tcRouter", type: "address" },
-      { internalType: "address", name: "tcVault", type: "address" },
-      { internalType: "string", name: "tcMemo", type: "string" },
-      { internalType: "address", name: "token", type: "address" },
-      { internalType: "uint256", name: "amount", type: "uint256" },
-      { internalType: "address", name: "router", type: "address" },
-      { internalType: "bytes", name: "data", type: "bytes" },
-      { internalType: "uint256", name: "deadline", type: "uint256" },
-    ],
-    name: "swapIn",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "tokenTransferProxy",
-    outputs: [
-      { internalType: "contract TSAggregatorTokenTransferProxy", name: "", type: "address" },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  { stateMutability: "payable", type: "receive" },
-];