Add variable simulation when receiving tx data (#713)

Cryptorubic · Sep 16, 2024 · 9a86f43 · 9a86f43
2 parents 87f9ef5 + 806c120
commit 9a86f43
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 20 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "rubic-sdk",
-    "version": "5.36.8",
+    "version": "5.36.9",
     "description": "Simplify dApp creation",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",

diff --git a/...hain/web3-private-service/web3-private/evm-web3-private/models/evm-transaction-options.ts b/...hain/web3-private-service/web3-private/evm-web3-private/models/evm-transaction-options.ts
@@ -21,4 +21,9 @@ export interface EvmTransactionOptions extends EvmBasicTransactionOptions {
      * gasLimit multiplier (to change ratio for specific chain)
      */
     gasLimitRatio?: number;
+
+    /**
+     * Address send transaction to
+     */
+    to?: string;
 }
diff --git a/...chain/calculation-manager/providers/common/emv-cross-chain-trade/evm-cross-chain-trade.ts b/...chain/calculation-manager/providers/common/emv-cross-chain-trade/evm-cross-chain-trade.ts
@@ -176,15 +176,18 @@ export abstract class EvmCrossChainTrade extends CrossChainTrade<EvmEncodeConfig
         const { data, value, to } = await this.encode({ ...options, fromAddress });
 
         try {
-            const gasfullOptions = await this.web3Private.simulateTransaction(
-                to,
-                {
-                    data,
-                    value
-                },
-                this.from.blockchain
-            );
-            return gasfullOptions;
+            if (!options?.testMode) {
+                const gasfullOptions = await this.web3Private.simulateTransaction(
+                    to,
+                    {
+                        data,
+                        value
+                    },
+                    this.from.blockchain
+                );
+                return gasfullOptions;
+            }
+            return { data, value, to };
         } catch (err) {
             throw err;
         }

diff --git a/...culation-manager/providers/common/on-chain-trade/evm-on-chain-trade/evm-on-chain-trade.ts b/...culation-manager/providers/common/on-chain-trade/evm-on-chain-trade/evm-on-chain-trade.ts
@@ -281,7 +281,7 @@ export abstract class EvmOnChainTrade extends OnChainTrade {
     ): Promise<EvmTransactionOptions | never> {
         this.apiFromAddress = fromAddress;
         if (!options?.testMode) {
-            await this.checkWalletState(options?.testMode);
+            await this.checkWalletState(options.testMode);
         }
         await this.checkReceiverAddress(
             options.receiverAddress,
@@ -291,15 +291,19 @@ export abstract class EvmOnChainTrade extends OnChainTrade {
         const { data, value, to } = await this.encode({ ...options, fromAddress });
 
         try {
-            const gasfullOptions = await this.web3Private.simulateTransaction(
-                to,
-                {
-                    data,
-                    value
-                },
-                this.from.blockchain
-            );
-            return gasfullOptions;
+            if (!options?.testMode) {
+                const gasfullOptions = await this.web3Private.simulateTransaction(
+                    to,
+                    {
+                        data,
+                        value
+                    },
+                    this.from.blockchain
+                );
+                return gasfullOptions;
+            }
+
+            return { data, value, to };
         } catch (err) {
             throw err;
         }