Merge branch 'main' into paul/fix-slipppage-on-error

coinbase · Sep 12, 2024 · dc3c5b4 · dc3c5b4
2 parents 255f18c + 95acc71
commit dc3c5b4
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 2 deletions.
diff --git a/.changeset/shy-foxes-jog.md b/.changeset/shy-foxes-jog.md
@@ -4,4 +4,4 @@
 
 - **feat**: introduced `config` for the `Swap` component, with the first option for `maxSlippage`. By @zizzamia & @cpcramer #1242
 - **fix**: added spacing between swap input and token select. By @alessey #1229 
-- **feat**: added slippage support in `Swap` component with settings UI. This combined feat incorporates slippage functionality into the Swap component, including a dedicated settings section with a title, description, and input field for configuring slippage tolerance. By @cpcramer #1187 #1192 #1191 #1189 #1195 #1196 #1206 #1250
+- **feat**: added slippage support in `Swap` component with settings UI. This combined feat incorporates slippage functionality into the Swap component, including a dedicated settings section with a title, description, and input field for configuring slippage tolerance. By @cpcramer #1187 #1192 #1191 #1189 #1195 #1196 #1206 #1248
diff --git a/src/api/getSwapQuote.test.ts b/src/api/getSwapQuote.test.ts
@@ -160,4 +160,77 @@ describe('getSwapQuote', () => {
  message: '',
  });
  });
+
+ it('should adjust slippage for V1 API when useAggregator is true', async () => {
+ const mockParams = {
+ useAggregator: true,
+ maxSlippage: '3',
+ amountReference: testAmountReference,
+ from: ETH_TOKEN,
+ to: DEGEN_TOKEN,
+ amount: testAmount,
+ };
+ const mockApiParams = getAPIParamsForToken(mockParams);
+ const mockResponse = {
+ id: 1,
+ jsonrpc: '2.0',
+ result: {
+ from: ETH_TOKEN,
+ to: DEGEN_TOKEN,
+ fromAmount: '100000000000000000',
+ toAmount: '16732157880511600003860',
+ amountReference: 'from',
+ priceImpact: '0.07',
+ chainId: 8453,
+ hasHighPriceImpact: false,
+ slippage: '30',
+ },
+ };
+ (sendRequest as vi.Mock).mockResolvedValue(mockResponse);
+ await getSwapQuote(mockParams);
+ expect(sendRequest).toHaveBeenCalledTimes(1);
+ expect(sendRequest).toHaveBeenCalledWith(CDP_GET_SWAP_QUOTE, [
+ {
+ ...mockApiParams,
+ slippagePercentage: '30',
+ },
+ ]);
+ });
+
+ it('should not adjust slippage when useAggregator is false', async () => {
+ const mockParams = {
+ useAggregator: false,
+ maxSlippage: '3',
+ amountReference: testAmountReference,
+ from: ETH_TOKEN,
+ to: DEGEN_TOKEN,
+ amount: testAmount,
+ };
+ const mockApiParams = getAPIParamsForToken(mockParams);
+ const mockResponse = {
+ id: 1,
+ jsonrpc: '2.0',
+ result: {
+ from: ETH_TOKEN,
+ to: DEGEN_TOKEN,
+ fromAmount: '100000000000000000',
+ toAmount: '16732157880511600003860',
+ amountReference: 'from',
+ priceImpact: '0.07',
+ chainId: 8453,
+ hasHighPriceImpact: false,
+ slippage: '3',
+ },
+ };
+ (sendRequest as vi.Mock).mockResolvedValue(mockResponse);
+ await getSwapQuote(mockParams);
+ expect(sendRequest).toHaveBeenCalledTimes(1);
+ expect(sendRequest).toHaveBeenCalledWith(CDP_GET_SWAP_QUOTE, [
+ {
+ ...mockApiParams,
+ v2Enabled: true,
+ slippagePercentage: '3',
+ },
+ ]);
+ });
 });
diff --git a/src/api/getSwapQuote.ts b/src/api/getSwapQuote.ts
@@ -37,8 +37,14 @@ export async function getSwapQuote(
  };
  }
  if (params.maxSlippage) {
+ let slippagePercentage = params.maxSlippage;
+ // Adjust slippage for V1 API (aggregator)
+ // V1 expects slippage in tenths of a percent (e.g., 30 = 3%)
+ if (params.useAggregator) {
+ slippagePercentage = (Number(params.maxSlippage) * 10).toString();
+ }
  apiParams = {
- slippagePercentage: params.maxSlippage,
+ slippagePercentage: slippagePercentage,
  ...apiParams,
  };
  }