@cryptorubic/web3 0.3.4 → 0.3.6-alpha-id-990.1

package/package.json

@@ -1,17 +1,16 @@
 {
   "name": "@cryptorubic/web3",
-  "version": "v0.3.4",
+  "version": "0.3.6-alpha-id-990.1",
   "dependencies": {
     "tslib": "^2.3.0",
     "bignumber.js": "9.1.2",
-    "@cryptorubic/core": "v0.3.4",
-    "viem": "^2.19.1",
+    "@cryptorubic/core": "0.3.6-alpha-id-990.1",
     "web3-utils": "^4.3.1",
     "@ton/ton": "^15.1.0",
     "@solana/web3.js": "1.95.3",
     "@solflare-wallet/utl-sdk": "^1.4.0",
     "@ethersproject/bignumber": "^5.7.0",
-    "@cryptorubic/tron-types": "v0.3.4",
+    "@cryptorubic/tron-types": "0.3.6-alpha-id-990.1",
     "bitcoin-address-validation": "^2.2.3",
     "axios": "0.27.2",
     "crc-32": "^1.2.2",

package/src/lib/adapter/adapters/constants/uni-v3-permit-abi.d.ts

@@ -0,0 +1,2 @@
+import { Abi } from 'viem';
+export declare const UNI_V3_PERMIT_2_ABI: Abi;

package/src/lib/adapter/adapters/constants/uni-v3-permit-abi.js

@@ -0,0 +1,72 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UNI_V3_PERMIT_2_ABI = void 0;
+exports.UNI_V3_PERMIT_2_ABI = [
+    {
+        inputs: [
+            {
+                internalType: 'address',
+                name: 'owner',
+                type: 'address',
+            },
+            {
+                internalType: 'address',
+                name: 'token',
+                type: 'address',
+            },
+            {
+                internalType: 'address',
+                name: 'spender',
+                type: 'address',
+            },
+        ],
+        name: 'allowance',
+        outputs: [
+            {
+                internalType: 'uint160',
+                name: 'amount',
+                type: 'uint160',
+            },
+            {
+                internalType: 'uint48',
+                name: 'expiration',
+                type: 'uint48',
+            },
+            {
+                internalType: 'uint48',
+                name: 'nonce',
+                type: 'uint48',
+            },
+        ],
+        stateMutability: 'view',
+        type: 'function',
+    },
+    {
+        inputs: [
+            {
+                internalType: 'address',
+                name: 'token',
+                type: 'address',
+            },
+            {
+                internalType: 'address',
+                name: 'spender',
+                type: 'address',
+            },
+            {
+                internalType: 'uint160',
+                name: 'amount',
+                type: 'uint160',
+            },
+            {
+                internalType: 'uint48',
+                name: 'expiration',
+                type: 'uint48',
+            },
+        ],
+        name: 'approve',
+        outputs: [],
+        stateMutability: 'nonpayable',
+        type: 'function',
+    },
+];

package/src/lib/adapter/adapters/evm-adapter.d.ts

@@ -18,7 +18,7 @@ export declare class EvmAdapter extends AbstractAdapter<PublicActions & PublicCl
     multicallByContract<T>(contracts: MulticallParameters, allowErrors?: boolean): Promise<MulticallResponse<T>[]>;
     multicallByAddress<T>(address: string, abi: Abi, method: string, methodArgs?: unknown[][], allowErrors?: boolean): Promise<MulticallResponse<T>[]>;
     static encodeMethodCall(contractAddress: string, contractAbi: Abi, method: string, parameters?: unknown[], value?: string): EvmTransactionConfig;
-    simulateTransaction(config: EvmTransactionConfig, from: string): Promise<string>;
+    simulateTransaction(config: EvmTransactionConfig, from: string, timeout?: number): Promise<string>;
     callForTokensInfo(tokenAddresses: string[] | ReadonlyArray<string>): Promise<Token<EvmBlockchainName>[]>;
     getGasPrice(): Promise<string>;
     checkEnoughBalance(token: TokenAmount | PriceTokenAmount, walletAddress: string, amount?: BigNumber): Promise<boolean>;
@@ -33,6 +33,9 @@ export declare class EvmAdapter extends AbstractAdapter<PublicActions & PublicCl
     encodeApprove(tokenAddress: string, spenderAddress: string, amount?: string): EvmTransactionConfig;
     needApprove(token: TokenAmount, contractAddress: string, walletAddress: string, amount: string): Promise<boolean>;
     approve(fromAddress: string, tokenAddress: string, spenderAddress: string, amount?: string): Promise<string>;
+    needPermit2Approve(token: TokenAmount, permit2Address: string, walletAddress: string, spenderAddress: string): Promise<boolean>;
+    encodePermit2Approve(tokenAddress: string, spenderAddress: string, permit2Address: string, expiration: string, amount: string): EvmTransactionConfig;
+    approveOnPermit2(fromAddress: string, tokenAddress: string, permit2Address: string, spenderAddress: string, deadline?: BigNumber, amount?: BigNumber): Promise<string>;
     /**
      * Calculates EIP-1559 specific gas details.
      * @see {@link https://github.com/ethers-io/ethers.js/blob/master/packages/abstract-provider/src.ts/index.ts#L235}

package/src/lib/adapter/adapters/evm-adapter.js

@@ -9,6 +9,7 @@ const core_1 = require("@cryptorubic/core");
 const bignumber_js_1 = require("bignumber.js");
 const web3_pure_1 = require("../../utils/web3-pure");
 const possible_errors_1 = require("./constants/possible-errors");
+const uni_v3_permit_abi_1 = require("./constants/uni-v3-permit-abi");
 class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
     async needPreswapAction(token, contractAddress, walletAddress, amount) {
         return this.needApprove(token, contractAddress, walletAddress, amount);
@@ -137,7 +138,7 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
             throw err;
         }
     }
-    async simulateTransaction(config, from) {
+    async simulateTransaction(config, from, timeout = 15000) {
         try {
             const callParams = {
                 account: from,
@@ -145,8 +146,11 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
                 to: config.to,
                 ...(config.value && { value: BigInt(config.value) }),
             };
-            const gasLimitWei = await this.public.estimateGas(callParams);
-            return gasLimitWei.toString();
+            const gasLimitWei = await Promise.race([
+                this.public.estimateGas(callParams),
+                new Promise((_, reject) => setTimeout(() => reject('Timeout'), timeout)),
+            ]);
+            return gasLimitWei?.toString();
         }
         catch (err) {
             this.logger?.customError('Error while simulating transaction', err);
@@ -262,6 +266,26 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
         const config = this.encodeApprove(tokenAddress, spenderAddress, amount);
         return this.write(fromAddress, config.to, config.value, config.data);
     }
+    async needPermit2Approve(token, permit2Address, walletAddress, spenderAddress) {
+        const res = await this.read(permit2Address, uni_v3_permit_abi_1.UNI_V3_PERMIT_2_ABI, 'allowance', [walletAddress, token.address, spenderAddress]);
+        const [amount, expiration, _nonce] = res;
+        return (token.weiAmount.gt(amount) ||
+            new bignumber_js_1.default(Date.now()).gt(Number(expiration) * 1000));
+    }
+    encodePermit2Approve(tokenAddress, spenderAddress, permit2Address, expiration, amount) {
+        const tx = EvmAdapter.encodeMethodCall(permit2Address, uni_v3_permit_abi_1.UNI_V3_PERMIT_2_ABI, 'approve', [tokenAddress, spenderAddress, amount, expiration]);
+        return {
+            data: tx.data,
+            value: tx.value,
+            to: tx.to,
+        };
+    }
+    async approveOnPermit2(fromAddress, tokenAddress, permit2Address, spenderAddress, deadline = new bignumber_js_1.default(1000000), amount) {
+        const approveAmount = amount ? amount : new bignumber_js_1.default(2).pow(256).minus(1);
+        const expiration = new bignumber_js_1.default(Date.now()).plus(deadline).toFixed();
+        const tx = this.encodePermit2Approve(tokenAddress, spenderAddress, permit2Address, expiration, approveAmount.toFixed());
+        return this.write(fromAddress, tx.to, tx.value, tx.data);
+    }
     /**
      * Calculates EIP-1559 specific gas details.
      * @see {@link https://github.com/ethers-io/ethers.js/blob/master/packages/abstract-provider/src.ts/index.ts#L235}

package/src/lib/adapter/adapters/models/permit2-contract-types.d.ts

@@ -0,0 +1 @@
+export type Permit2AllowanceContractResponse = [string, number, number];

package/src/lib/adapter/adapters/models/permit2-contract-types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/lib/adapter/adapters/solana-adapter.js

@@ -34,8 +34,13 @@ class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
     }
     async simulateTransaction(_config, _from) { }
     async callForTokensInfo(tokenAddresses) {
+        const nativeToken = core_1.nativeTokensList[core_1.BLOCKCHAIN_NAME.SOLANA];
         const nativeTokenIndex = tokenAddresses.findIndex((address) => web3_pure_1.Web3Pure.isNativeAddress(core_1.CHAIN_TYPE.SOLANA, address));
         const filteredTokenAddresses = tokenAddresses.filter((_, index) => index !== nativeTokenIndex);
+        // only native token in tokenAddresses
+        if (!filteredTokenAddresses.length) {
+            return [nativeToken];
+        }
         const mints = filteredTokenAddresses.map((address) => new web3_js_1.PublicKey(address));
         const tokenSdk = new utl_sdk_1.Client();
         const tokensMint = await tokenSdk.fetchMints(mints);
@@ -51,8 +56,7 @@ class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
         if (nativeTokenIndex === -1) {
             return tokens;
         }
-        const blockchainNativeToken = core_1.nativeTokensList[core_1.BLOCKCHAIN_NAME.SOLANA];
-        tokens.splice(nativeTokenIndex, 0, blockchainNativeToken);
+        tokens.splice(nativeTokenIndex, 0, nativeToken);
         return tokens;
     }
 }