Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Trader Joe V2.2 #742

Closed
wants to merge 2 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add support for Trader Joe V2.2
Larsen Cundrič authored and Larsen Cundrič committed Jul 23, 2024
commit c717aa37d63ccabb5f553e159ea5cab199d71d7d
1,502 changes: 1,502 additions & 0 deletions src/abi/TraderJoeV22Router.json

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions src/dex/index.ts
Original file line number Diff line number Diff line change
@@ -67,6 +67,7 @@ import { QuickSwapV3 } from './quickswap/quickswap-v3';
import { ThenaFusion } from './quickswap/thena-fusion';
import { SwaapV2 } from './swaap-v2/swaap-v2';
import { TraderJoeV21 } from './trader-joe-v2.1/trader-joe-v2.1';
import { TraderJoeV22 } from './trader-joe-v2.2/trader-joe-v2.2';
import { PancakeswapV3 } from './pancakeswap-v3/pancakeswap-v3';
import { Algebra } from './algebra/algebra';
import { AngleTransmuter } from './angle-transmuter/angle-transmuter';
@@ -93,6 +94,7 @@ const LegacyDexes = [
QuickSwapV3,
ThenaFusion,
TraderJoeV21,
TraderJoeV22,
Lido,
AugustusRFQOrder,
EtherFi,
7 changes: 7 additions & 0 deletions src/dex/trader-joe-v2.2/config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { Address } from '@paraswap/core';
import { Network } from '../../constants';

export const TRADERJOE_V2_2_ROUTER_ADDRESS: { [network: number]: Address } = {
[Network.AVALANCHE]: '0x18556DA13313f3532c54711497A8FedAC273220E',
[Network.ARBITRUM]: '0x18556DA13313f3532c54711497A8FedAC273220E',
};
101 changes: 101 additions & 0 deletions src/dex/trader-joe-v2.2/trader-joe-v2.2-e2e.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
import dotenv from 'dotenv';
dotenv.config();

import { testE2E } from '../../../tests/utils-e2e';
import {
Tokens,
Holders,
NativeTokenSymbols,
} from '../../../tests/constants-e2e';

import { ContractMethod, Network, SwapSide } from '../../constants';
import { StaticJsonRpcProvider } from '@ethersproject/providers';
import { generateConfig } from '../../config';

const dexKey = 'traderjoev2.2';

const testForNetwork = (
network: Network,
swapMap: Map<SwapSide, ContractMethod[]>,
) => {
const tokens = Tokens[network];
const holders = Holders[network];

const nativeSymbol = NativeTokenSymbols[network];

const provider = new StaticJsonRpcProvider(
generateConfig(network).privateHttpProvider,
network,
);

const tokensToTest = [
[
{
symbol: 'USDC',
amount: (10 ** 8).toString(),
},
{
symbol: 'USDT',
amount: (10 ** 8).toString(),
},
],
[
{
symbol: 'USDT',
amount: (10 ** 8).toString(),
},
{
symbol: 'DAI',
amount: (10 ** 8).toString(),
},
],
];

swapMap.forEach((contractMethods, side) =>
contractMethods.forEach((contractMethod: string) => {
tokensToTest.forEach(pair => {
describe(`${contractMethod}`, () => {
it(`${pair[0].symbol} -> ${pair[1].symbol}`, async () => {
await testE2E(
tokens[pair[0].symbol],
tokens[pair[1].symbol],
holders[pair[0].symbol],
side === SwapSide.SELL ? pair[0].amount : pair[1].amount,
side,
dexKey,
contractMethod as any,
network,
provider,
);
});

it(`${nativeSymbol} -> ${pair[0].symbol}`, async () => {
await testE2E(
tokens[nativeSymbol],
tokens[pair[0].symbol],
holders[nativeSymbol],
side === SwapSide.SELL ? '1000000000000000000' : pair[0].amount,
side,
dexKey,
contractMethod as any,
network,
provider,
);
});
});
});
}),
);
};

// Ensure you have the E2E_ENDPOINT_URL env variable set.

describe('TraderJoe v2.2 E2E', () => {
describe('Mainnet V6', () => {
const swapMap = new Map<SwapSide, ContractMethod[]>([
[SwapSide.SELL, [ContractMethod.swapExactAmountIn]],
]);

testForNetwork(Network.MAINNET, swapMap);
});
});
180 changes: 180 additions & 0 deletions src/dex/trader-joe-v2.2/trader-joe-v2.2.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
import { SwapSide } from '../../constants';
import {
AdapterExchangeParam,
Address,
DexExchangeParam,
SimpleExchangeParam,
} from '../../types';
import { IDexTxBuilder } from '../idex';
import { IDexHelper } from '../../dex-helper';
import {
getLocalDeadlineAsFriendlyPlaceholder,
SimpleExchange,
} from '../simple-exchange';
import { NumberAsString } from '@paraswap/core';
import { AsyncOrSync } from 'ts-essentials';
import { Interface, JsonFragment } from '@ethersproject/abi';
import TraderJoeV22RouterABI from '../../abi/TraderJoeV21Router.json';
import {
TraderJoeV2Data,
TraderJoeV2RouterFunctions,
TraderJoeV2RouterParam,
} from './types';
import { TRADERJOE_V2_2_ROUTER_ADDRESS } from './config';
import { extractReturnAmountPosition } from '../../executor/utils';

export class TraderJoeV22
extends SimpleExchange
implements IDexTxBuilder<TraderJoeV2Data, TraderJoeV2RouterParam>
{
static dexKeys = ['traderjoev2.2'];
protected routerAddress: string;
exchangeRouterInterface: Interface;
needWrapNative = true;

constructor(dexHelper: IDexHelper) {
super(dexHelper, 'traderjoev2.2');

this.routerAddress =
TRADERJOE_V2_2_ROUTER_ADDRESS[dexHelper.config.data.network];

this.exchangeRouterInterface = new Interface(
TraderJoeV22RouterABI as JsonFragment[],
);
}

getAdapterParam(
srcToken: Address,
destToken: Address,
srcAmount: NumberAsString,
destAmount: NumberAsString,
data: TraderJoeV2Data,
side: SwapSide,
): AdapterExchangeParam {
let payload = this.abiCoder.encodeParameters(
['tuple(tuple(uint256[],uint8[],address[]),uint256)'],
[
[
[
[
data.binStep, // _pairBinSteps: uint256[]
],
[
2, // _versions: uint8[]
],
[
data.tokenIn,
data.tokenOut, // _tokenPath: address[]
],
],
getLocalDeadlineAsFriendlyPlaceholder(), // _deadline: uint256
],
],
);

return {
targetExchange: this.routerAddress,
payload,
networkFee: '0',
};
}

getSimpleParam(
srcToken: Address,
destToken: Address,
srcAmount: NumberAsString,
destAmount: NumberAsString,
data: TraderJoeV2Data,
side: SwapSide,
): AsyncOrSync<SimpleExchangeParam> {
const swapFunction =
side === SwapSide.SELL
? TraderJoeV2RouterFunctions.swapExactTokensForTokens
: TraderJoeV2RouterFunctions.swapTokensForExactTokens;

const swapFunctionParams: TraderJoeV2RouterParam =
side === SwapSide.SELL
? [
srcAmount,
destAmount,
[[data.binStep], ['2'], [srcToken, destToken]],
this.augustusAddress,
getLocalDeadlineAsFriendlyPlaceholder(),
]
: [
destAmount,
srcAmount,
[[data.binStep], ['2'], [srcToken, destToken]],
this.augustusAddress,
getLocalDeadlineAsFriendlyPlaceholder(),
];

const swapData = this.exchangeRouterInterface.encodeFunctionData(
swapFunction,
swapFunctionParams,
);

return this.buildSimpleParamWithoutWETHConversion(
srcToken,
srcAmount,
destToken,
destAmount,
swapData,
this.routerAddress,
);
}

getDexParam(
srcToken: Address,
destToken: Address,
srcAmount: NumberAsString,
destAmount: NumberAsString,
recipient: Address,
data: TraderJoeV2Data,
side: SwapSide,
): DexExchangeParam {
const swapFunction =
side === SwapSide.SELL
? TraderJoeV2RouterFunctions.swapExactTokensForTokens
: TraderJoeV2RouterFunctions.swapTokensForExactTokens;

const placeholder = getLocalDeadlineAsFriendlyPlaceholder();

const swapFunctionParams: TraderJoeV2RouterParam =
side === SwapSide.SELL
? [
srcAmount,
destAmount,
[[data.binStep], ['2'], [srcToken, destToken]],
recipient,
placeholder,
]
: [
destAmount,
srcAmount,
[[data.binStep], ['2'], [srcToken, destToken]],
recipient,
placeholder,
];

const swapData = this.exchangeRouterInterface.encodeFunctionData(
swapFunction,
swapFunctionParams,
);

return {
needWrapNative: this.needWrapNative,
dexFuncHasRecipient: true,
exchangeData: swapData,
targetExchange: this.routerAddress,
returnAmountPos:
side === SwapSide.SELL
? extractReturnAmountPosition(
this.exchangeRouterInterface,
swapFunction,
'amountOut',
)
: undefined,
};
}
}
38 changes: 38 additions & 0 deletions src/dex/trader-joe-v2.2/types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import { NumberAsString } from '@paraswap/core';
import { Address } from '@paraswap/sdk';

export type RouterPath = [
pairBinSteps: NumberAsString[],
versions: NumberAsString[],
tokenPath: Address[],
];
export type TraderJoeV2RouterSellParams = [
_amountIn: NumberAsString,
_amountOutMin: NumberAsString,
_routerPath: RouterPath,
to: Address,
_deadline: string,
];

export type TraderJoeV2RouterBuyParams = [
_amountOut: NumberAsString,
_amountInMax: NumberAsString,
_routerPath: RouterPath,
to: Address,
_deadline: string,
];

export type TraderJoeV2RouterParam =
| TraderJoeV2RouterSellParams
| TraderJoeV2RouterBuyParams;

export type TraderJoeV2Data = {
tokenIn: string; // redundant
tokenOut: string; // redundant
binStep: string;
};

export enum TraderJoeV2RouterFunctions {
swapExactTokensForTokens = 'swapExactTokensForTokens',
swapTokensForExactTokens = 'swapTokensForExactTokens',
}