Merge branch 'master' into rubic-8339

Cryptorubic · Sep 2, 2024 · b8d3663 · b8d3663
2 parents 92f2f41 + f1e0aca
commit b8d3663
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/features/on-chain/calculation-manager/providers/dexes/tron/bridgers/bridgers-trade.ts b/src/features/on-chain/calculation-manager/providers/dexes/tron/bridgers/bridgers-trade.ts
@@ -1,5 +1,4 @@
 import { SwapRequestError } from 'src/common/errors';
-import { NotSupportedRegionError } from 'src/common/errors/swap/not-supported-region';
 import { PriceTokenAmount, Token, TokenAmount } from 'src/common/tokens';
 import { TronBlockchainName } from 'src/core/blockchain/models/blockchain-name';
 import { TronTransactionConfig } from 'src/core/blockchain/web3-pure/typed-web3-pure/tron-web3-pure/models/tron-transaction-config';
@@ -13,6 +12,7 @@ import {
     BridgersSwapRequest,
     BridgersSwapResponse
 } from 'src/features/common/providers/bridgers/models/bridgers-swap-api';
+import { createTokenNativeAddressProxy } from 'src/features/common/utils/token-native-address-proxy';
 import { TronBridgersTransactionData } from 'src/features/cross-chain/calculation-manager/providers/bridgers-provider/tron-bridgers-trade/models/tron-bridgers-transaction-data';
 import { FeeInfo } from 'src/features/cross-chain/calculation-manager/providers/common/models/fee-info';
 import { OnChainPlatformFee } from 'src/features/on-chain/calculation-manager/providers/common/models/on-chain-proxy-fee-info';
@@ -127,8 +127,14 @@ export class BridgersTrade extends TronOnChainTrade {
         fromAddress?: string;
         receiverAddress?: string;
     }): Promise<TronBridgersTransactionData> {
-        const fromTokenAddress = this.from.isNative ? bridgersNativeAddress : this.from.address;
-        const toTokenAddress = this.to.isNative ? bridgersNativeAddress : this.to.address;
+        const fromTokenAddress = createTokenNativeAddressProxy(
+            this.from,
+            bridgersNativeAddress
+        ).address;
+        const toTokenAddress = createTokenNativeAddressProxy(
+            this.to,
+            bridgersNativeAddress
+        ).address;
         const fromAddress = options.fromAddress || this.walletAddress;
         const toAddress = options.receiverAddress || fromAddress;
 
@@ -149,11 +155,8 @@ export class BridgersTrade extends TronOnChainTrade {
 
         const swapData = await Injector.httpClient.post<
             BridgersSwapResponse<TronBridgersTransactionData>
-        >('https://api.bridgers.xyz/api/sswap/swap', swapRequest);
+        >('https://sswap.swft.pro/api/sswap/swap', swapRequest);
 
-        if (swapData.resCode === 1146) {
-            throw new NotSupportedRegionError();
-        }
         return swapData.data.txData;
     }
 }