Fix tests, checkAmounts and gas calculation refactoring

Author: axtezy

__tests__/api-tests/instant-trades.ts

@@ -1,6 +1,6 @@
-import { SDK } from 'src/core/sdk/sdk';
-import { BLOCKCHAIN_NAME } from 'src/core/blockchain/models/blockchain-name';
 import { minimalConfiguration } from '../utils/configuration';
+import { SDK } from '../../src/core/sdk/sdk';
+import { BLOCKCHAIN_NAME } from '../../src/core/blockchain/models/blockchain-name';
 
 export const instantTradesApiSpec = () =>
     describe('Instant trades module tests', () => {

__tests__/utils/configuration.ts

@@ -1,5 +1,5 @@
-import { BLOCKCHAIN_NAME, BlockchainName } from 'src/core/blockchain/models/blockchain-name';
-import { Configuration } from 'src/core/sdk/models/configuration';
+import { BLOCKCHAIN_NAME, BlockchainName } from '../../src/core/blockchain/models/blockchain-name';
+import { Configuration } from '../../src/core/sdk/models/configuration';
 
 const baseRpcUrl = 'http://localhost';
 

src/common/errors/cross-chain/updated-rates-error.ts

@@ -5,15 +5,7 @@ import { RubicSdkError } from 'src/common/errors';
  * in target network.
  */
 export class UpdatedRatesError extends RubicSdkError {
-    constructor(
-        public readonly transaction: {
-            data: string;
-            to: string;
-            value: string;
-            oldAmount: string;
-            newAmount: string;
-        }
-    ) {
+    constructor(public readonly oldAmount: string, public readonly newAmount: string) {
         super();
         Object.setPrototypeOf(this, UpdatedRatesError.prototype);
     }

src/common/tokens/constants/native-tokens.ts

@@ -8,7 +8,7 @@ import { BitcoinWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/b
 import { EvmWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/evm-web3-pure';
 import { IcpWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/icp-web3-pure';
 import { KavaCosmosWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/non-evm-web3-pure/kava-cosmos-web3-pure';
-import { SolanaWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/non-evm-web3-pure/solana-web3-pure';
+import { SolanaWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/solana-web3-pure/solana-web3-pure';
 import { TronWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/tron-web3-pure/tron-web3-pure';
 
 const testnetNativeTokens: Record<TestnetEvmBlockchain, Token> = {

src/core/blockchain/web3-private-service/web3-private/solana-web3-private/solana-web3-private.ts

@@ -4,7 +4,7 @@ import { EvmWeb3Private } from 'src/core/blockchain/web3-private-service/web3-pr
 import { Web3Error } from 'src/core/blockchain/web3-private-service/web3-private/models/web3.error';
 import { SolanaTransactionOptions } from 'src/core/blockchain/web3-private-service/web3-private/solana-web3-private/models/solana-transaction-options';
 import { Web3Private } from 'src/core/blockchain/web3-private-service/web3-private/web3-private';
-import { SolanaWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/non-evm-web3-pure/solana-web3-pure';
+import { SolanaWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/solana-web3-pure/solana-web3-pure';
 import { Injector } from 'src/core/injector/injector';
 import { SolanaWeb3 } from 'src/core/sdk/models/solana-web3';
 

src/core/blockchain/web3-public-service/web3-public/solana-web3-public/solana-web3-public.ts

@@ -16,7 +16,7 @@ import {
     TxStatus
 } from 'src/core/blockchain/web3-public-service/web3-public/models/tx-status';
 import { Web3Public } from 'src/core/blockchain/web3-public-service/web3-public/web3-public';
-import { SolanaWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/non-evm-web3-pure/solana-web3-pure';
+import { SolanaWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/solana-web3-pure/solana-web3-pure';
 import { AbiItem } from 'web3-utils';
 
 /**

src/core/blockchain/web3-pure/typed-web3-pure/non-evm-web3-pure/solana-web3-pure.ts renamed to src/core/blockchain/web3-pure/typed-web3-pure/solana-web3-pure/solana-web3-pure.ts

@@ -31,14 +31,14 @@ import { PolkadotWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/
 import { RippleWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/non-evm-web3-pure/ripple-web3-pure';
 import { SecretWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/non-evm-web3-pure/secret-web3-pure';
 import { SiaWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/non-evm-web3-pure/sia-web3-pure';
-import { SolanaWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/non-evm-web3-pure/solana-web3-pure';
 import { StellarWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/non-evm-web3-pure/stellar-web3-pure';
 import { TezosWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/non-evm-web3-pure/tezos-web3-pure';
 import { TonWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/non-evm-web3-pure/ton-web3-pure';
 import { WavesWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/non-evm-web3-pure/waves-web3-pure';
 import { WaxWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/non-evm-web3-pure/wax-web3-pure';
 import { ZilliqaWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/non-evm-web3-pure/zilliqa-web3-pure';
 import { OntologyWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/ontology-web3-pure';
+import { SolanaWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/solana-web3-pure/solana-web3-pure';
 import { TronWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/tron-web3-pure/tron-web3-pure';
 import { XdcWeb3Pure } from 'src/core/blockchain/web3-pure/typed-web3-pure/xdc-web3-pure';
 

src/core/blockchain/web3-pure/web3-pure.ts

@@ -14,7 +14,6 @@ import { CrossChainManager } from 'src/features/cross-chain/calculation-manager/
 import { CrossChainStatusManager } from 'src/features/cross-chain/status-manager/cross-chain-status-manager';
 import { CrossChainSymbiosisManager } from 'src/features/cross-chain/symbiosis-manager/cross-chain-symbiosis-manager';
 import { DeflationTokenManager } from 'src/features/deflation-token-manager/deflation-token-manager';
-import { LimitOrderManager } from 'src/features/limit-order/limit-order-manager';
 import { OnChainManager } from 'src/features/on-chain/calculation-manager/on-chain-manager';
 import { OnChainStatusManager } from 'src/features/on-chain/status-manager/on-chain-status-manager';
 
@@ -52,11 +51,6 @@ export class SDK {
      */
     public readonly deflationTokenManager: DeflationTokenManager;
 
-    /**
-     * Use it to create limit order.
-     */
-    public readonly limitOrderManager: LimitOrderManager;
-
     /**
      * Can be used to get `Web3Public` instance by blockchain name to get public information from blockchain.
      */
@@ -129,7 +123,6 @@ export class SDK {
         this.onChainStatusManager = new OnChainStatusManager();
         this.crossChainStatusManager = new CrossChainStatusManager();
         this.crossChainSymbiosisManager = new CrossChainSymbiosisManager();
-        this.limitOrderManager = new LimitOrderManager();
     }
 
     /**

src/core/sdk/sdk.ts

@@ -2,7 +2,6 @@ import {
     EIP1559Gas,
     SingleGasPrice
 } from 'src/core/blockchain/web3-public-service/web3-public/evm-web3-public/models/gas-price';
-import { EvmEncodeConfig } from 'src/core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/models/evm-encode-config';
 
 /**
  * Stores options for transaction in `encode` function.
@@ -35,7 +34,9 @@ export interface EncodeTransactionOptions {
      */
     feeLimit?: number;
 
-    directTransaction?: EvmEncodeConfig;
-
     referrer?: string;
+
+    skipAmountCheck?: boolean;
+
+    useCacheData?: boolean;
 }