Fix api from address

Cryptorubic · Sep 13, 2024 · c6d6f36 · c6d6f36
1 parent 0370126
commit c6d6f36
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "rubic-sdk",
-    "version": "5.36.6",
+    "version": "5.36.7",
     "description": "Simplify dApp creation",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",

diff --git a/src/features/cross-chain/calculation-manager/providers/common/cross-chain-trade.ts b/src/features/cross-chain/calculation-manager/providers/common/cross-chain-trade.ts
@@ -91,7 +91,7 @@ export abstract class CrossChainTrade<T = unknown> {
     }
 
     protected get walletAddress(): string {
-        return this.web3Private.address;
+        return this._apiFromAddress ?? this.web3Private.address;
     }
 
     protected abstract get methodName(): string;
@@ -139,6 +139,12 @@ export abstract class CrossChainTrade<T = unknown> {
         }
     }
 
+    private _apiFromAddress: string | null = null;
+
+    public set apiFromAddress(value: string | null) {
+        this._apiFromAddress = value;
+    }
+
     protected constructor(
         protected readonly providerAddress: string,
         protected readonly routePath: RubicStep[]

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
@@ -164,6 +164,7 @@ export abstract class EvmCrossChainTrade extends CrossChainTrade<EvmEncodeConfig
         fromAddress: string,
         options: SwapTransactionOptions = {}
     ): Promise<EvmTransactionOptions | never> {
+        this.apiFromAddress = fromAddress;
         if (!options?.testMode) {
             await this.checkTradeErrors();
         }

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
@@ -279,6 +279,7 @@ export abstract class EvmOnChainTrade extends OnChainTrade {
         fromAddress: string,
         options: SwapTransactionOptions = {}
     ): Promise<EvmTransactionOptions | never> {
+        this.apiFromAddress = fromAddress;
         if (!options?.testMode) {
             await this.checkWalletState(options?.testMode);
         }

diff --git a/src/features/on-chain/calculation-manager/providers/common/on-chain-trade/on-chain-trade.ts b/src/features/on-chain/calculation-manager/providers/common/on-chain-trade/on-chain-trade.ts
@@ -44,6 +44,12 @@ export abstract class OnChainTrade {
 
     public abstract readonly feeInfo: FeeInfo;
 
+    private _apiFromAddress: string | null = null;
+
+    public set apiFromAddress(value: string | null) {
+        this._apiFromAddress = value;
+    }
+
     /**
      * Type of instant trade provider.
      */
@@ -66,7 +72,7 @@ export abstract class OnChainTrade {
     }
 
     protected get walletAddress(): string {
-        return this.web3Private.address;
+        return this._apiFromAddress ?? this.web3Private.address;
     }
 
     protected get httpClient(): HttpClient {