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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cryptorubic/web3",
-    "version": "1.0.2-alpha-rub-1224.1",
+    "version": "1.0.2-alpha-rub-977.0",
     "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 { EvmBlockchainName, HttpClient, ICustomLogger, PriceTokenAmount, Token, TokenAmount } from '@cryptorubic/core';
+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 BigNumber from 'bignumber.js';
-import { Abi, BlockNumber, BlockTag, GetBlockReturnType, MulticallParameters, MulticallResponse, PublicActions, PublicClient, TransactionReceipt, WalletActions, WalletClient } from 'viem';
+import { EvmAdapterOptions } from '../models/evm-adapter-options';
 import { EvmTransactionConfig } from '../../../utils/models/evm-transaction-config';
-import { Web3PrimitiveType } from '../../../utils/models/primitive-types';
+import { EvmAdapterSigner } from './signer/evm-adapter-signer';
 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 { 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 { TxStatus } from '../models/web3-public-models/tx-status';
+import { GasPrice } from '../models/evm-web3-public-models/gas-price';
 import { EvmTransactionOptions } from './models/evm-send-tx-params';
-import { EvmAdapterSigner } from './signer/evm-adapter-signer';
+import { ApprovableAdapter } from '../models/approve-adapter';
+import { AllowanceInfo } from '../models/common-types';
+import { TxStatus } from '../models/web3-public-models/tx-status';
 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,26 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EvmAdapter = void 0;
-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 abstract_adapter_1 = require("../common/abstract-adapter");
+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 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 tx_status_1 = require("../models/web3-public-models/tx-status");
+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 evm_adapter_signer_1 = require("./signer/evm-adapter-signer");
+const tx_status_1 = require("../models/web3-public-models/tx-status");
 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 = tokenAmount.stringTokenAmount;
+        const approveAmount = this.blockchain === core_1.BLOCKCHAIN_NAME.GNOSIS || this.blockchain === core_1.BLOCKCHAIN_NAME.CRONOS
+            ? tokenAmount.stringWeiAmount
+            : 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/constants/chain-configs/chain-configs.js

@@ -237,6 +237,25 @@ 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: {
@@ -258,6 +277,25 @@ 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: {
@@ -1010,6 +1048,25 @@ 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,7 +17,9 @@ 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,
@@ -58,6 +60,7 @@ 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],

package/src/lib/errors/blockchain/user-reject.error.d.ts

@@ -3,5 +3,5 @@ import { RubicSdkError } from '../rubic-sdk.error';
  * Thrown, when user cancels transaction.
  */
 export declare class UserRejectError extends RubicSdkError {
-    constructor();
+    constructor(message?: string);
 }

package/src/lib/errors/blockchain/user-reject.error.js

@@ -6,8 +6,8 @@ const rubic_sdk_error_1 = require("../rubic-sdk.error");
  * Thrown, when user cancels transaction.
  */
 class UserRejectError extends rubic_sdk_error_1.RubicSdkError {
-    constructor() {
-        super();
+    constructor(message) {
+        super(message);
         Object.setPrototypeOf(this, UserRejectError.prototype);
     }
 }