@lifi/sdk 2.0.0-beta.12 → 2.0.0-beta.14

package/dist/{execution → src/execution}/StepExecutionManager.js

@@ -83,6 +83,12 @@ export class StepExecutionManager {
                                 customConfig.maxPriorityFeePerGas;
                             transactionRequest.maxFeePerGas = customConfig.maxFeePerGas;
                         }
+                        else {
+                            const estimatedGasLimit = await signer.estimateGas(transactionRequest);
+                            if (estimatedGasLimit) {
+                                transactionRequest.gasLimit = `${(BigInt(estimatedGasLimit.toString()) * 125n) / 100n}`;
+                            }
+                        }
                         // Submit the transaction
                         transaction = await signer.sendTransaction(transactionRequest);
                         // STEP 4: Wait for the transaction

package/dist/{cjs → src}/utils/errors.d.ts

@@ -23,11 +23,13 @@ export declare enum LifiErrorCode {
     SlippageError = 1011,
     TransactionRejected = 1012,
     BalanceError = 1013,
-    AllowanceRequired = 1014
+    AllowanceRequired = 1014,
+    InsufficientFunds = 1015
 }
 export declare enum EthersErrorType {
+    ActionRejected = "ACTION_REJECTED",
     CallExecption = "CALL_EXCEPTION",
-    ActionRejected = "ACTION_REJECTED"
+    InsufficientFunds = "INSUFFICIENT_FUNDS"
 }
 export declare enum EthersErrorMessage {
     ERC20Allowance = "ERC20: transfer amount exceeds allowance",

package/dist/{utils → src/utils}/errors.js

@@ -26,11 +26,13 @@ export var LifiErrorCode;
     LifiErrorCode[LifiErrorCode["TransactionRejected"] = 1012] = "TransactionRejected";
     LifiErrorCode[LifiErrorCode["BalanceError"] = 1013] = "BalanceError";
     LifiErrorCode[LifiErrorCode["AllowanceRequired"] = 1014] = "AllowanceRequired";
+    LifiErrorCode[LifiErrorCode["InsufficientFunds"] = 1015] = "InsufficientFunds";
 })(LifiErrorCode || (LifiErrorCode = {}));
 export var EthersErrorType;
 (function (EthersErrorType) {
-    EthersErrorType["CallExecption"] = "CALL_EXCEPTION";
     EthersErrorType["ActionRejected"] = "ACTION_REJECTED";
+    EthersErrorType["CallExecption"] = "CALL_EXCEPTION";
+    EthersErrorType["InsufficientFunds"] = "INSUFFICIENT_FUNDS";
 })(EthersErrorType || (EthersErrorType = {}));
 export var EthersErrorMessage;
 (function (EthersErrorMessage) {

package/dist/{utils → src/utils}/parseError.js

@@ -1,8 +1,8 @@
 import { errorCodes as MetaMaskErrorCodes, getMessageFromCode, } from 'eth-rpc-errors';
+import { fetchTxErrorDetails } from '../helpers';
 import ChainsService from '../services/ChainsService';
-import { ErrorMessage, EthersErrorType, EthersErrorMessage, LifiError, LifiErrorCode, MetaMaskProviderErrorCode, NotFoundError, ProviderError, RPCError, ServerError, SlippageError, TransactionError, UnknownError, ValidationError, } from './errors';
+import { ErrorMessage, EthersErrorMessage, EthersErrorType, LifiError, LifiErrorCode, MetaMaskProviderErrorCode, NotFoundError, ProviderError, RPCError, ServerError, SlippageError, TransactionError, UnknownError, ValidationError, } from './errors';
 import { formatTokenAmountOnly } from './utils';
-import { fetchTxErrorDetails } from '../helpers';
 /**
  * Available MetaMask error codes:
  *
@@ -107,6 +107,8 @@ export const parseError = async (e, step, process) => {
             catch (error) {
                 return new ProviderError(LifiErrorCode.TransactionFailed, e.reason, defaultErrorMessage, e.stack);
             }
+        case EthersErrorType.InsufficientFunds:
+            return new TransactionError(LifiErrorCode.InsufficientFunds, e.message, await getTransactionNotSentMessage(step, process), e.stack);
         case EthersErrorType.ActionRejected:
         case MetaMaskProviderErrorCode.userRejectedRequest:
             return new TransactionError(LifiErrorCode.TransactionRejected, e.message, await getTransactionNotSentMessage(step, process), e.stack);

package/dist/src/utils/preRestart.d.ts

@@ -0,0 +1,3 @@
+import { Signer } from 'ethers';
+import { Route } from '../types';
+export declare const handlePreRestart: (route: Route, signer: Signer) => Promise<void>;

package/dist/{utils → src/utils}/preRestart.js

@@ -1,18 +1,29 @@
 import { LifiErrorCode } from './errors';
-export const handlePreRestart = (route) => {
+export const handlePreRestart = async (route, signer) => {
     for (let index = 0; index < route.steps.length; index++) {
         const stepHasFailed = route.steps[index].execution?.status === 'FAILED';
         if (stepHasFailed) {
-            handleErrorType(route, index);
+            await handleErrorType(route, index, signer);
             deleteFailedProcesses(route, index);
             deleteTransactionData(route, index);
         }
     }
 };
-const handleErrorType = (route, index) => {
+const handleErrorType = async (route, index, signer) => {
     const isGasLimitError = route.steps[index].execution?.process.some((p) => p.error?.code === LifiErrorCode.GasLimitError);
     const isGasPriceError = route.steps[index].execution?.process.some((p) => p.error?.code === LifiErrorCode.TransactionUnderpriced);
+    const { transactionRequest } = route.steps[index];
     if (isGasLimitError) {
+        if (transactionRequest) {
+            let gasLimit = transactionRequest.gasLimit;
+            try {
+                gasLimit = await signer.estimateGas(transactionRequest);
+            }
+            catch (error) { }
+            if (gasLimit) {
+                transactionRequest.gasLimit = `${(BigInt(gasLimit.toString()) * 125n) / 100n}`;
+            }
+        }
         route.steps[index].estimate.gasCosts?.forEach((gasCost) => (gasCost.limit = `${Math.round(Number(gasCost.limit) * 1.25)}`));
     }
     if (isGasPriceError) {

package/dist/src/version.d.ts

@@ -0,0 +1,2 @@
+export declare const name = "@lifi/sdk";
+export declare const version = "2.0.0-beta.14";

package/dist/src/version.js

@@ -0,0 +1,2 @@
+export const name = '@lifi/sdk';
+export const version = '2.0.0-beta.14';

package/dist/test/fixtures.d.ts

@@ -0,0 +1,7 @@
+import { LifiStep, Route } from '@lifi/types';
+export declare const buildStepObject: ({ includingExecution, }: {
+    includingExecution?: boolean | undefined;
+}) => LifiStep;
+export declare const buildRouteObject: ({ step, }: {
+    step?: LifiStep | undefined;
+}) => Route;

package/dist/test/fixtures.js

@@ -0,0 +1,152 @@
+// This file holds generator functions to create objects for testing purposes
+import { ChainId, CoinKey, findDefaultToken, } from '@lifi/types';
+const SOME_TOKEN = {
+    ...findDefaultToken(CoinKey.USDC, ChainId.DAI),
+    priceUSD: '',
+};
+const SOME_OTHER_TOKEN = {
+    ...findDefaultToken(CoinKey.USDT, ChainId.DAI),
+    priceUSD: '',
+};
+const SOME_DATE = new Date('2021-04-10').getTime();
+export const buildStepObject = ({ includingExecution = true, }) => ({
+    id: '8d3a0474-4ee3-4a7a-90c7-2a2264b7f3a9',
+    type: 'lifi',
+    tool: '1inch',
+    toolDetails: {
+        key: '1inch',
+        name: '1inch',
+        logoURI: 'https://raw.githubusercontent.com/lifinance/types/main/src/assets/icons/exchanges/oneinch.png',
+    },
+    action: {
+        fromChainId: 137,
+        toChainId: 137,
+        fromToken: SOME_TOKEN,
+        toToken: SOME_OTHER_TOKEN,
+        fromAmount: '1000000',
+        slippage: 0.03,
+        fromAddress: '0x552008c0f6870c2f77e5cC1d2eb9bdff03e30Ea0',
+        toAddress: '0x552008c0f6870c2f77e5cC1d2eb9bdff03e30Ea0',
+    },
+    estimate: {
+        fromAmount: '1000000',
+        fromAmountUSD: '100',
+        toAmount: '260982615655554',
+        toAmountUSD: '26098',
+        toAmountMin: '253153137185887',
+        approvalAddress: '0x11111112542d85b3ef69ae05771c2dccff4faa26',
+        executionDuration: 300,
+        tool: '1inch',
+    },
+    includedSteps: [
+        {
+            id: 'f8474598-a553-4643-bbd1-bf8c77e679b3',
+            type: 'swap',
+            action: {
+                fromChainId: 137,
+                fromAmount: '5000000000000000000',
+                fromToken: {
+                    address: '0x0000000000000000000000000000000000000000',
+                    chainId: 137,
+                    symbol: 'MATIC',
+                    decimals: 18,
+                    name: 'MATIC',
+                    priceUSD: '1.124763',
+                    logoURI: 'https://static.debank.com/image/matic_token/logo_url/matic/6f5a6b6f0732a7a235131bd7804d357c.png',
+                    coinKey: CoinKey.MATIC,
+                },
+                toChainId: 137,
+                toToken: {
+                    address: '0xc2132d05d31c914a87c6611c10748aeb04b58e8f',
+                    chainId: 137,
+                    symbol: 'USDT',
+                    decimals: 6,
+                    name: '(PoS) Tether USD',
+                    priceUSD: '1.00081',
+                    logoURI: 'https://static.debank.com/image/coin/logo_url/usdt/23af7472292cb41dc39b3f1146ead0fe.png',
+                    coinKey: CoinKey.USDT,
+                },
+                slippage: 0.005,
+            },
+            estimate: {
+                tool: '1inch',
+                fromAmount: '5000000000000000000',
+                toAmount: '5617317',
+                toAmountMin: '5589230',
+                approvalAddress: '0x1111111254eeb25477b68fb85ed929f73a960582',
+                executionDuration: 30,
+                feeCosts: [],
+                gasCosts: [
+                    {
+                        type: 'SEND',
+                        price: '149725515512',
+                        estimate: '258059',
+                        limit: '344079',
+                        amount: '51517405651853448',
+                        amountUSD: '0.06',
+                        token: {
+                            address: '0x0000000000000000000000000000000000000000',
+                            chainId: 137,
+                            symbol: 'MATIC',
+                            decimals: 18,
+                            name: 'MATIC',
+                            priceUSD: '1.124763',
+                            logoURI: 'https://static.debank.com/image/matic_token/logo_url/matic/6f5a6b6f0732a7a235131bd7804d357c.png',
+                            coinKey: CoinKey.MATIC,
+                        },
+                    },
+                ],
+            },
+            tool: '1inch',
+            toolDetails: {
+                key: '1inch',
+                name: '1inch',
+                logoURI: 'https://raw.githubusercontent.com/lifinance/types/main/src/assets/icons/exchanges/oneinch.png',
+            },
+        },
+    ],
+    execution: includingExecution
+        ? {
+            status: 'PENDING',
+            process: [
+                {
+                    type: 'TOKEN_ALLOWANCE',
+                    startedAt: SOME_DATE,
+                    message: 'Somethings done',
+                    status: 'DONE',
+                    doneAt: SOME_DATE + 10,
+                    txHash: '0x11111112542d85b3ef69ae05771c2dccff4faa26',
+                    txLink: 'https://example.com',
+                },
+                {
+                    type: 'SWAP',
+                    startedAt: SOME_DATE + 20,
+                    message: 'Somethings pending',
+                    status: 'PENDING',
+                },
+            ],
+            fromAmount: '1000000',
+            toAmount: '261490494702370',
+        }
+        : undefined,
+});
+export const buildRouteObject = ({ step = buildStepObject({}), }) => ({
+    id: '0x433df53dbf6dbd7b946fc4f3b501c3ff32957d77d96c9d5ba1805b01eb6461cc',
+    fromChainId: 137,
+    fromAmountUSD: '1.00',
+    fromAmount: '1000000',
+    fromToken: SOME_TOKEN,
+    fromAddress: '0x552008c0f6870c2f77e5cC1d2eb9bdff03e30Ea0',
+    toChainId: 137,
+    toAmountUSD: '1.00',
+    toAmount: '260982615655554',
+    toAmountMin: '253153137185887',
+    toToken: SOME_OTHER_TOKEN,
+    toAddress: '0x552008c0f6870c2f77e5cC1d2eb9bdff03e30Ea0',
+    gasCostUSD: '0.01',
+    steps: [step],
+    insurance: {
+        feeAmountUsd: '0',
+        state: 'NOT_INSURABLE',
+    },
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lifi/sdk",
-  "version": "2.0.0-beta.12",
+  "version": "2.0.0-beta.14",
   "description": "LI.FI Any-to-Any Cross-Chain-Swap SDK",
   "main": "./dist/cjs/index.js",
   "module": "./dist/index.js",
@@ -84,12 +84,12 @@
   "devDependencies": {
     "@commitlint/cli": "^17.6.3",
     "@commitlint/config-conventional": "^17.6.3",
-    "@mswjs/interceptors": "^0.22.14",
-    "@typescript-eslint/eslint-plugin": "^5.59.5",
-    "@typescript-eslint/parser": "^5.59.5",
-    "@vitest/coverage-c8": "^0.31.0",
-    "cross-fetch": "^3.1.5",
-    "eslint": "^8.40.0",
+    "@mswjs/interceptors": "^0.22.15",
+    "@typescript-eslint/eslint-plugin": "^5.59.7",
+    "@typescript-eslint/parser": "^5.59.7",
+    "@vitest/coverage-c8": "^0.31.1",
+    "cross-fetch": "^3.1.6",
+    "eslint": "^8.41.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
     "husky": "^8.0.3",
@@ -100,7 +100,7 @@
     "prettier": "^2.8.8",
     "standard-version": "^9.5.0",
     "typescript": "^5.0.4",
-    "vitest": "^0.31.0"
+    "vitest": "^0.31.1"
   },
   "directories": {
     "test": "test"

package/dist/cjs/utils/preRestart.d.ts

@@ -1,2 +0,0 @@
-import { Route } from '../types';
-export declare const handlePreRestart: (route: Route) => void;

package/dist/cjs/version.d.ts

@@ -1,2 +0,0 @@
-export declare const name = "@lifi/sdk";
-export declare const version = "2.0.0-beta.12";

package/dist/utils/preRestart.d.ts

@@ -1,2 +0,0 @@
-import { Route } from '../types';
-export declare const handlePreRestart: (route: Route) => void;

package/dist/version.d.ts

@@ -1,2 +0,0 @@
-export declare const name = "@lifi/sdk";
-export declare const version = "2.0.0-beta.12";

package/dist/version.js

@@ -1,2 +0,0 @@
-export const name = '@lifi/sdk';
-export const version = '2.0.0-beta.12';