Skip to content

Commit e2e1d10

Browse files
authored
feat: Add TraderJoeV2 MixIn to Arbitrum BridgeAdapter (#723)
* Add TraderJoeV2 MixIn to ArbitrumBridgeAdapter
1 parent 6a15dc3 commit e2e1d10

6 files changed

Lines changed: 29 additions & 6 deletions

File tree

contracts/zero-ex/CHANGELOG.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
[
2+
{
3+
"version": "0.44.0",
4+
"changes": [
5+
{
6+
"note": "Add Trader Joe V2 MixIn to Arbitrum"
7+
}
8+
]
9+
},
210
{
311
"version": "0.43.0",
412
"changes": [

contracts/zero-ex/contracts/src/transformers/bridges/ArbitrumBridgeAdapter.sol

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import "./mixins/MixinKyberDmm.sol";
2626
import "./mixins/MixinKyberElastic.sol";
2727
import "./mixins/MixinGMX.sol";
2828
import "./mixins/MixinNerve.sol";
29+
import "./mixins/MixinTraderJoeV2.sol";
2930
import "./mixins/MixinUniswapV3.sol";
3031
import "./mixins/MixinUniswapV2.sol";
3132
import "./mixins/MixinWOOFi.sol";
@@ -42,6 +43,7 @@ contract ArbitrumBridgeAdapter is
4243
MixinKyberElastic,
4344
MixinGMX,
4445
MixinNerve,
46+
MixinTraderJoeV2,
4547
MixinUniswapV3,
4648
MixinUniswapV2,
4749
MixinWOOFi,
@@ -97,6 +99,11 @@ contract ArbitrumBridgeAdapter is
9799
return (0, true);
98100
}
99101
boughtAmount = _tradeUniswapV2(buyToken, sellAmount, order.bridgeData);
102+
} else if (protocolId == BridgeProtocols.TRADERJOEV2) {
103+
if (dryRun) {
104+
return (0, true);
105+
}
106+
boughtAmount = _tradeTraderJoeV2(buyToken, sellAmount, order.bridgeData);
100107
} else if (protocolId == BridgeProtocols.GMX) {
101108
if (dryRun) {
102109
return (0, true);

contracts/zero-ex/tests/addresses/SourceAddresses.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"KyberElasticQuoter": "0x0d125c15d54ca1f8a813c74a81aee34ebb508c1f",
3333
"KyberElasticRouter": "0xc1e7dfe73e1598e3910ef4c7845b68a9ab6f4c83",
3434
"KyberElasticPool": "0x6038373de7f64da99b2a31951628b7d778b2c3cf",
35-
"TraderJoeV2Quoter": "0x3660268Ed43583a2cdd09e3fC7079ff07DBD4Caa",
35+
"TraderJoeV2Quoter": "0x64b57F4249aA99a812212cee7DAEFEDC40B203cD",
3636
"TraderJoeV2Router": "0xb4315e873dBcf96Ffd0acd8EA43f689D8c20fB30"
3737
},
3838
"250": {
@@ -59,7 +59,7 @@
5959
"KyberElasticQuoter": "0x0d125c15d54ca1f8a813c74a81aee34ebb508c1f",
6060
"KyberElasticRouter": "0xc1e7dfe73e1598e3910ef4c7845b68a9ab6f4c83",
6161
"KyberElasticPool": "0x087abaab9cd85025a8b3916948c69fe173c837ea",
62-
"TraderJoeV2Quoter": "0x0000000000000000000000000000000000000000",
63-
"TraderJoeV2Router": "0x0000000000000000000000000000000000000000"
62+
"TraderJoeV2Quoter": "0x64b57F4249aA99a812212cee7DAEFEDC40B203cD",
63+
"TraderJoeV2Router": "0xb4315e873dBcf96Ffd0acd8EA43f689D8c20fB30"
6464
}
6565
}

contracts/zero-ex/tests/forked/SwapERC20ForERC20Test.t.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ contract SwapERC20ForERC20Test is Test, ForkUtils, TestUtils {
5656

5757
function test_swapERC20ForERC20OnTraderJoeV2() public {
5858
for (uint256 i = 0; i < chains.length; i++) {
59-
// TraderJoeV2 mixin only enabled on Avalanche
60-
if (i != 3) {
59+
// TraderJoeV2 mixin only enabled on Avalanche and Arbitrum
60+
if (i != 3 && i != 6) {
6161
continue;
6262
}
6363
vm.selectFork(forkIds[chains[i]]);

packages/contract-addresses/CHANGELOG.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
[
2+
{
3+
"version": "8.7.0",
4+
"changes": [
5+
{
6+
"note": "Add Trader Joe V2 MixIn to Arbitrum"
7+
}
8+
]
9+
},
210
{
311
"version": "8.6.0",
412
"changes": [

packages/contract-addresses/addresses.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@
248248
"wethTransformer": "0x10e968968f49dd66a5efeebbb2edcb9c49c4fc49",
249249
"payTakerTransformer": "0xd81e65fc9bb7323bdbef8b2cdddd3b83fe41d630",
250250
"affiliateFeeTransformer": "0x970e318b8f074c20bf0cee06970f01dc7a761e50",
251-
"fillQuoteTransformer": "0x5d3a221bad31c3f3c07bea2f1de9b3ec17664b69",
251+
"fillQuoteTransformer": "0x4a8815c2fc605e3b01aee52aade4d096c4e862c6",
252252
"positiveSlippageFeeTransformer": "0x20f935b037e8490d8027f2751f9452725eee01ad"
253253
}
254254
}

0 commit comments

Comments
 (0)