From ab3b393a29466e41304ded20d52844d53208332d Mon Sep 17 00:00:00 2001 From: ahsan-javaiid Date: Mon, 10 Feb 2025 15:56:50 +0500 Subject: [PATCH 1/4] fix: enable blockscout for rootstock --- .../src/providers/ethereum/libs/assets-handlers/assetinfo-mew.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/extension/src/providers/ethereum/libs/assets-handlers/assetinfo-mew.ts b/packages/extension/src/providers/ethereum/libs/assets-handlers/assetinfo-mew.ts index b37fb82bd..0b9196094 100644 --- a/packages/extension/src/providers/ethereum/libs/assets-handlers/assetinfo-mew.ts +++ b/packages/extension/src/providers/ethereum/libs/assets-handlers/assetinfo-mew.ts @@ -72,6 +72,7 @@ const supportedNetworks: Record = { [NetworkNames.Rootstock]: { tbName: 'rsk', cgPlatform: CoingeckoPlatform.Rootstock, + bsEndpoint: true, }, [NetworkNames.Arbitrum]: { tbName: 'arb', From b063e45e177786968997bb064cce6acf8cef30c6 Mon Sep 17 00:00:00 2001 From: Gamaliel Padillo Date: Mon, 10 Feb 2025 12:07:01 -0800 Subject: [PATCH 2/4] devop: update zerox api --- packages/swap/src/providers/zerox/index.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/swap/src/providers/zerox/index.ts b/packages/swap/src/providers/zerox/index.ts index bc2edfeac..0cf6b6317 100644 --- a/packages/swap/src/providers/zerox/index.ts +++ b/packages/swap/src/providers/zerox/index.ts @@ -70,7 +70,7 @@ const supportedNetworks: { }, }; -const BASE_URL = "https://partners.mewapi.io/zerox/"; +const BASE_URL = "https://partners.mewapi.io/zeroxv2/"; class ZeroX extends ProviderClass { tokenList: TokenType[]; @@ -165,9 +165,8 @@ class ZeroX extends ProviderClass { affiliateAddress: feeConfig ? feeConfig.referrer : "", }); return fetch( - `${BASE_URL}${ - supportedNetworks[this.network].chainId - }/swap/v1/quote?${params.toString()}`, + `${BASE_URL}/swap/permit2/quote?chainId=${supportedNetworks[this.network].chainId + }&${params.toString()}`, ) .then((res) => res.json()) .then(async (response: ZeroXResponseType) => { From c27e1cf84b72e6ed782d76b902a9703569507977 Mon Sep 17 00:00:00 2001 From: Gamaliel Padillo Date: Mon, 10 Feb 2025 12:37:46 -0800 Subject: [PATCH 3/4] fix: update path to allowance holder --- packages/swap/src/providers/zerox/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/swap/src/providers/zerox/index.ts b/packages/swap/src/providers/zerox/index.ts index 0cf6b6317..b101eace2 100644 --- a/packages/swap/src/providers/zerox/index.ts +++ b/packages/swap/src/providers/zerox/index.ts @@ -165,7 +165,7 @@ class ZeroX extends ProviderClass { affiliateAddress: feeConfig ? feeConfig.referrer : "", }); return fetch( - `${BASE_URL}/swap/permit2/quote?chainId=${supportedNetworks[this.network].chainId + `${BASE_URL}/swap/allowance-holder/quote?chainId=${supportedNetworks[this.network].chainId }&${params.toString()}`, ) .then((res) => res.json()) From 80d073df428f936bd0283e6e72cc0effb4a66f16 Mon Sep 17 00:00:00 2001 From: Gamaliel Padillo Date: Mon, 10 Feb 2025 14:28:27 -0800 Subject: [PATCH 4/4] devop: cleanup types based on what we use, fix parameters to fit v2 --- packages/swap/src/providers/zerox/index.ts | 10 +++++----- packages/swap/src/providers/zerox/types.ts | 16 +++++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/packages/swap/src/providers/zerox/index.ts b/packages/swap/src/providers/zerox/index.ts index b101eace2..7fcb63a31 100644 --- a/packages/swap/src/providers/zerox/index.ts +++ b/packages/swap/src/providers/zerox/index.ts @@ -70,7 +70,7 @@ const supportedNetworks: { }, }; -const BASE_URL = "https://partners.mewapi.io/zeroxv2/"; +const BASE_URL = "https://partners.mewapi.io/zeroxv2"; class ZeroX extends ProviderClass { tokenList: TokenType[]; @@ -154,7 +154,7 @@ class ZeroX extends ProviderClass { sellToken: options.fromToken.address, buyToken: options.toToken.address, sellAmount: options.amount.toString(), - takerAddress: options.fromAddress, + taker: options.fromAddress, slippagePercentage: ( parseFloat(meta.slippage ? meta.slippage : DEFAULT_SLIPPAGE) / 100 ).toString(), @@ -190,9 +190,9 @@ class ZeroX extends ProviderClass { transactions.push({ from: options.fromAddress, gasLimit: GAS_LIMITS.swap, - to: response.to, - value: numberToHex(response.value), - data: response.data, + to: response.transaction.to, + value: numberToHex(response.transaction.value), + data: response.transaction.data, type: TransactionType.evm, }); if (accurateEstimate) { diff --git a/packages/swap/src/providers/zerox/types.ts b/packages/swap/src/providers/zerox/types.ts index 9bd5c7b5f..923418dbe 100644 --- a/packages/swap/src/providers/zerox/types.ts +++ b/packages/swap/src/providers/zerox/types.ts @@ -1,16 +1,22 @@ import { BN, EVMTransaction } from "../../types"; + +export interface ZeroXResponseTransactionType { + to: string; + data: string; + gas: string; + gasPrice: string; + value: string; +} + export interface ZeroXResponseType { code?: number; reason?: string; - buyTokenAddress: string; - sellTokenAddress: string; buyAmount: string; sellAmount: string; - to: string; - data: string; - value: string; + transaction: ZeroXResponseTransactionType; } + export interface ZeroXSwapResponse { transactions: EVMTransaction[]; toTokenAmount: BN;