@cryptorubic/web3 1.0.1 → 1.0.2-alpha-rub-1224.1

package/README.md

@@ -1 +1 @@
-# web3
+# web3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cryptorubic/web3",
-    "version": "1.0.1",
+    "version": "1.0.2-alpha-rub-1224.1",
     "dependencies": {
         "@ethersproject/bignumber": "^5.8.0",
         "@mysten/sui": "^1.24.0",

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

@@ -1,19 +1,19 @@
-import { Abi, MulticallResponse, MulticallParameters, PublicActions, PublicClient, WalletClient, WalletActions, BlockNumber, BlockTag, GetBlockReturnType, TransactionReceipt } from 'viem';
-import { AbstractAdapter } from '../common/abstract-adapter';
-import { EvmBlockchainName, ICustomLogger, Token, TokenAmount, PriceTokenAmount, HttpClient } from '@cryptorubic/core';
+import { EvmBlockchainName, HttpClient, ICustomLogger, PriceTokenAmount, Token, TokenAmount } from '@cryptorubic/core';
 import BigNumber from 'bignumber.js';
-import { EvmAdapterOptions } from '../models/evm-adapter-options';
+import { Abi, BlockNumber, BlockTag, GetBlockReturnType, MulticallParameters, MulticallResponse, PublicActions, PublicClient, TransactionReceipt, WalletActions, WalletClient } from 'viem';
 import { EvmTransactionConfig } from '../../../utils/models/evm-transaction-config';
-import { EvmAdapterSigner } from './signer/evm-adapter-signer';
-import { ClientAdaptersFactoryParams } from '../../models/create-factory-params';
 import { Web3PrimitiveType } from '../../../utils/models/primitive-types';
-import { ContractMulticallResponse } from '../models/web3-public-models/contract-multicall-response';
-import { MethodData } from '../models/web3-public-models/method-data';
-import { GasPrice } from '../models/evm-web3-public-models/gas-price';
-import { EvmTransactionOptions } from './models/evm-send-tx-params';
+import { ClientAdaptersFactoryParams } from '../../models/create-factory-params';
+import { AbstractAdapter } from '../common/abstract-adapter';
 import { ApprovableAdapter } from '../models/approve-adapter';
 import { AllowanceInfo } from '../models/common-types';
+import { EvmAdapterOptions } from '../models/evm-adapter-options';
+import { GasPrice } from '../models/evm-web3-public-models/gas-price';
+import { ContractMulticallResponse } from '../models/web3-public-models/contract-multicall-response';
+import { MethodData } from '../models/web3-public-models/method-data';
 import { TxStatus } from '../models/web3-public-models/tx-status';
+import { EvmTransactionOptions } from './models/evm-send-tx-params';
+import { EvmAdapterSigner } from './signer/evm-adapter-signer';
 export declare class EvmAdapter extends AbstractAdapter<PublicActions & PublicClient, WalletClient & WalletActions, EvmBlockchainName> implements ApprovableAdapter<EvmTransactionConfig> {
     private readonly adapterOptions;
     private readonly clientParams?;

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

@@ -1,28 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EvmAdapter = void 0;
-const viem_1 = require("viem");
-const viem_blockchain_mapping_1 = require("../../constants/viem-blockchain-mapping");
-const erc20_token_abi_1 = require("../constants/erc20-token-abi");
-const abstract_adapter_1 = require("../common/abstract-adapter");
 const core_1 = require("@cryptorubic/core");
 const bignumber_js_1 = require("bignumber.js");
+const viem_1 = require("viem");
+const insufficient_funds_gas_price_value_error_1 = require("../../../errors/cross-chain/insufficient-funds-gas-price-value.error");
+const rubic_sdk_error_1 = require("../../../errors/rubic-sdk.error");
 const web3_pure_1 = require("../../../utils/web3-pure");
+const viem_blockchain_mapping_1 = require("../../constants/viem-blockchain-mapping");
+const abstract_adapter_1 = require("../common/abstract-adapter");
+const erc20_token_abi_1 = require("../constants/erc20-token-abi");
 const possible_errors_1 = require("../constants/possible-errors");
-const evm_adapter_signer_1 = require("./signer/evm-adapter-signer");
-const rubic_sdk_error_1 = require("../../../errors/rubic-sdk.error");
 const uni_v3_permit_abi_1 = require("../constants/uni-v3-permit-abi");
-const insufficient_funds_gas_price_value_error_1 = require("../../../errors/cross-chain/insufficient-funds-gas-price-value.error");
-const options_1 = require("../utils/options");
 const tx_status_1 = require("../models/web3-public-models/tx-status");
+const options_1 = require("../utils/options");
+const evm_adapter_signer_1 = require("./signer/evm-adapter-signer");
 class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
     async needPreswapAction(token, contractAddress, walletAddress, amount) {
         return this.needApprove(token, contractAddress, walletAddress, amount);
     }
     async handlePreswap(contractAddress, walletAddress, tokenAmount) {
-        const approveAmount = this.blockchain === core_1.BLOCKCHAIN_NAME.GNOSIS || this.blockchain === core_1.BLOCKCHAIN_NAME.CRONOS
-            ? tokenAmount.stringWeiAmount
-            : tokenAmount.stringTokenAmount;
+        const approveAmount = tokenAmount.stringTokenAmount;
         const isNative = web3_pure_1.Web3Pure.isNativeAddress(this.blockchain, tokenAmount.address);
         const fromTokenAddress = isNative && tokenAmount.blockchain === core_1.BLOCKCHAIN_NAME.METIS
             ? '0xdeaddeaddeaddeaddeaddeaddeaddeaddead0000'

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

@@ -1,7 +1,7 @@
 import { BlockchainName, HttpClient, ICustomLogger } from '@cryptorubic/core';
+import { Abi, PublicActions, PublicClient, TransactionReceipt, WalletActions, WalletClient } from 'viem';
 import { ClientAdaptersFactoryParams } from '../../../models/create-factory-params';
 import { AbstractAdapterSigner } from '../../common/signer/abstract-adapter-signer';
-import { Abi, PublicActions, PublicClient, TransactionReceipt, WalletActions, WalletClient } from 'viem';
 import { EvmSendTxParams, EvmTransactionOptions } from '../models/evm-send-tx-params';
 import { Web3Error } from '../utils/parse-evm-error';
 export declare class EvmAdapterSigner extends AbstractAdapterSigner<WalletClient & WalletActions, EvmSendTxParams, TransactionReceipt> {

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

@@ -2,15 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EvmAdapterSigner = void 0;
 const core_1 = require("@cryptorubic/core");
-const abstract_adapter_signer_1 = require("../../common/signer/abstract-adapter-signer");
+const bignumber_js_1 = require("bignumber.js");
 const viem_1 = require("viem");
 const actions_1 = require("viem/actions");
-const options_1 = require("../../utils/options");
+const tx_reverted_in_chain_error_1 = require("../../../../errors/common/tx-reverted-in-chain.error");
+const rubic_sdk_error_1 = require("../../../../errors/rubic-sdk.error");
 const viem_blockchain_mapping_1 = require("../../../constants/viem-blockchain-mapping");
+const abstract_adapter_signer_1 = require("../../common/signer/abstract-adapter-signer");
+const options_1 = require("../../utils/options");
 const parse_evm_error_1 = require("../utils/parse-evm-error");
-const rubic_sdk_error_1 = require("../../../../errors/rubic-sdk.error");
-const tx_reverted_in_chain_error_1 = require("../../../../errors/common/tx-reverted-in-chain.error");
-const bignumber_js_1 = require("bignumber.js");
 class EvmAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
     get publicClient() {
         if (!this.publicRef.public) {
@@ -73,8 +73,8 @@ class EvmAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
                 value,
                 ...(params.txOptions.data && { data: params.txOptions.data })
             };
-            const gas = await this.publicClient.estimateGas(gaslessParams);
-            const calculatedGas = params.txOptions.gasLimitRatio
+            const gas = params.txOptions.gas ? BigInt(params.txOptions.gas) : await this.publicClient.estimateGas(gaslessParams);
+            const calculatedGas = !params.txOptions.gas && params.txOptions.gasLimitRatio
                 ? BigInt(new bignumber_js_1.default(gas.toString()).multipliedBy(params.txOptions.gasLimitRatio).toFixed(0))
                 : gas;
             const gasfulParams = {

package/src/lib/adapter/constants/chain-configs/chain-configs.js

@@ -237,25 +237,6 @@ exports.viemConfig = {
             }
         }
     }),
-    CRONOS: (0, viem_1.defineChain)({
-        blockExplorers: {
-            default: {
-                apiUrl: 'https://cronoscan.com/',
-                name: 'CRONOS Explorer',
-                url: 'https://cronoscan.com/'
-            }
-        },
-        id: 25,
-        name: 'Cronos Mainnet Beta',
-        nativeCurrency: { decimals: 18, name: 'CRO', symbol: 'CRO' },
-        rpcUrls: { default: { http: ['https://evm.cronos.org'] } },
-        testnet: false,
-        contracts: {
-            multicall3: {
-                address: '0x5e954f5972EC6BFc7dECd75779F10d848230345F'
-            }
-        }
-    }),
     MUMBAI: (0, viem_1.defineChain)({
         blockExplorers: {
             default: {
@@ -277,25 +258,6 @@ exports.viemConfig = {
             }
         }
     }),
-    GNOSIS: (0, viem_1.defineChain)({
-        blockExplorers: {
-            default: {
-                apiUrl: 'https://blockscout.com/xdai/mainnet/',
-                name: 'GNOSIS Explorer',
-                url: 'https://blockscout.com/xdai/mainnet/'
-            }
-        },
-        id: 100,
-        name: 'Gnosis Chain',
-        nativeCurrency: { decimals: 18, name: 'xDAI', symbol: 'xDAI' },
-        rpcUrls: { default: { http: ['https://rpc.gnosischain.com'] } },
-        testnet: false,
-        contracts: {
-            multicall3: {
-                address: '0x67dA5f2FfaDDfF067AB9d5F025F8810634d84287'
-            }
-        }
-    }),
     HARMONY: (0, viem_1.defineChain)({
         blockExplorers: {
             default: {
@@ -1048,25 +1010,6 @@ exports.viemConfig = {
             }
         }
     }),
-    ROOTSTOCK: (0, viem_1.defineChain)({
-        blockExplorers: {
-            default: {
-                apiUrl: 'https://explorer.rsk.co/',
-                name: 'ROOTSTOCK Explorer',
-                url: 'https://explorer.rsk.co/'
-            }
-        },
-        id: 30,
-        name: 'Rootstock',
-        nativeCurrency: { decimals: 18, name: 'RBTC', symbol: 'RBTC' },
-        rpcUrls: { default: { http: ['https://public-node.rsk.co'] } },
-        testnet: false,
-        contracts: {
-            multicall3: {
-                address: '0xcA11bde05977b3631167028862bE2a173976CA11'
-            }
-        }
-    }),
     ZK_SYNC: (0, viem_1.defineChain)({
         blockExplorers: {
             default: {

package/src/lib/adapter/constants/viem-blockchain-mapping.js

@@ -17,9 +17,7 @@ exports.viemBlockchainMapping = {
     [core_1.BLOCKCHAIN_NAME.AURORA]: chains_1.aurora,
     [core_1.BLOCKCHAIN_NAME.TELOS]: chains_1.telos,
     [core_1.BLOCKCHAIN_NAME.OPTIMISM]: chains_1.optimism,
-    [core_1.BLOCKCHAIN_NAME.CRONOS]: chains_1.cronos,
     [core_1.BLOCKCHAIN_NAME.OKE_X_CHAIN]: chains_1.okc,
-    [core_1.BLOCKCHAIN_NAME.GNOSIS]: chains_1.gnosis,
     [core_1.BLOCKCHAIN_NAME.FUSE]: chains_1.fuse,
     [core_1.BLOCKCHAIN_NAME.MOONBEAM]: chains_1.moonbeam,
     [core_1.BLOCKCHAIN_NAME.CELO]: chains_1.celo,
@@ -60,7 +58,6 @@ exports.viemBlockchainMapping = {
     [core_1.BLOCKCHAIN_NAME.HOLESKY]: chains_1.holesky,
     [core_1.BLOCKCHAIN_NAME.HORIZEN_EON]: chain_configs_1.viemConfig[core_1.BLOCKCHAIN_NAME.HORIZEN_EON],
     [core_1.BLOCKCHAIN_NAME.MERLIN]: chain_configs_1.viemConfig[core_1.BLOCKCHAIN_NAME.MERLIN],
-    [core_1.BLOCKCHAIN_NAME.ROOTSTOCK]: chain_configs_1.viemConfig[core_1.BLOCKCHAIN_NAME.ROOTSTOCK],
     [core_1.BLOCKCHAIN_NAME.MODE]: chains_1.mode,
     [core_1.BLOCKCHAIN_NAME.ZK_FAIR]: chains_1.zkFair,
     [core_1.BLOCKCHAIN_NAME.ZK_LINK]: chain_configs_1.viemConfig[core_1.BLOCKCHAIN_NAME.ZK_LINK],