crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Add TraderJoeV2 MixIn to Arbitrum BridgeAdapter (#723)

Browse Source 
* Add TraderJoeV2 MixIn to ArbitrumBridgeAdapter
This commit is contained in:
Savarn Dontamsetti (Sav) 2023-05-10 15:40:36 -04:00 committed by GitHub
parent 6a15dc3f13
commit e2e1d1074c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contracts/zero-ex/CHANGELOG.json
View File

@ -1,4 +1,12 @@
[ [
{
"version": "0.44.0",
"changes": [
{
"note": "Add Trader Joe V2 MixIn to Arbitrum"
}
]
},
{ {
"version": "0.43.0", "version": "0.43.0",
"changes": [ "changes": [

7
contracts/zero-ex/contracts/src/transformers/bridges/ArbitrumBridgeAdapter.sol
View File

@ -26,6 +26,7 @@ import "./mixins/MixinKyberDmm.sol";
import "./mixins/MixinKyberElastic.sol"; import "./mixins/MixinKyberElastic.sol";
import "./mixins/MixinGMX.sol"; import "./mixins/MixinGMX.sol";
import "./mixins/MixinNerve.sol"; import "./mixins/MixinNerve.sol";
import "./mixins/MixinTraderJoeV2.sol";
import "./mixins/MixinUniswapV3.sol"; import "./mixins/MixinUniswapV3.sol";
import "./mixins/MixinUniswapV2.sol"; import "./mixins/MixinUniswapV2.sol";
import "./mixins/MixinWOOFi.sol"; import "./mixins/MixinWOOFi.sol";
@ -42,6 +43,7 @@ contract ArbitrumBridgeAdapter is
MixinKyberElastic, MixinKyberElastic,
MixinGMX, MixinGMX,
MixinNerve, MixinNerve,
MixinTraderJoeV2,
MixinUniswapV3, MixinUniswapV3,
MixinUniswapV2, MixinUniswapV2,
MixinWOOFi, MixinWOOFi,
@ -97,6 +99,11 @@ contract ArbitrumBridgeAdapter is
return (0, true); return (0, true);
} }
boughtAmount = _tradeUniswapV2(buyToken, sellAmount, order.bridgeData); boughtAmount = _tradeUniswapV2(buyToken, sellAmount, order.bridgeData);
} else if (protocolId == BridgeProtocols.TRADERJOEV2) {
if (dryRun) {
return (0, true);
}
boughtAmount = _tradeTraderJoeV2(buyToken, sellAmount, order.bridgeData);
} else if (protocolId == BridgeProtocols.GMX) { } else if (protocolId == BridgeProtocols.GMX) {
if (dryRun) { if (dryRun) {
return (0, true); return (0, true);

6
contracts/zero-ex/tests/addresses/SourceAddresses.json
View File

@ -32,7 +32,7 @@
"KyberElasticQuoter": "0x0d125c15d54ca1f8a813c74a81aee34ebb508c1f", "KyberElasticQuoter": "0x0d125c15d54ca1f8a813c74a81aee34ebb508c1f",
"KyberElasticRouter": "0xc1e7dfe73e1598e3910ef4c7845b68a9ab6f4c83", "KyberElasticRouter": "0xc1e7dfe73e1598e3910ef4c7845b68a9ab6f4c83",
"KyberElasticPool": "0x6038373de7f64da99b2a31951628b7d778b2c3cf", "KyberElasticPool": "0x6038373de7f64da99b2a31951628b7d778b2c3cf",
"TraderJoeV2Quoter": "0x3660268Ed43583a2cdd09e3fC7079ff07DBD4Caa", "TraderJoeV2Quoter": "0x64b57F4249aA99a812212cee7DAEFEDC40B203cD",
"TraderJoeV2Router": "0xb4315e873dBcf96Ffd0acd8EA43f689D8c20fB30" "TraderJoeV2Router": "0xb4315e873dBcf96Ffd0acd8EA43f689D8c20fB30"
}, },
"250": { "250": {
@ -59,7 +59,7 @@
"KyberElasticQuoter": "0x0d125c15d54ca1f8a813c74a81aee34ebb508c1f", "KyberElasticQuoter": "0x0d125c15d54ca1f8a813c74a81aee34ebb508c1f",
"KyberElasticRouter": "0xc1e7dfe73e1598e3910ef4c7845b68a9ab6f4c83", "KyberElasticRouter": "0xc1e7dfe73e1598e3910ef4c7845b68a9ab6f4c83",
"KyberElasticPool": "0x087abaab9cd85025a8b3916948c69fe173c837ea", "KyberElasticPool": "0x087abaab9cd85025a8b3916948c69fe173c837ea",
"TraderJoeV2Quoter": "0x0000000000000000000000000000000000000000", "TraderJoeV2Quoter": "0x64b57F4249aA99a812212cee7DAEFEDC40B203cD",
"TraderJoeV2Router": "0x0000000000000000000000000000000000000000" "TraderJoeV2Router": "0xb4315e873dBcf96Ffd0acd8EA43f689D8c20fB30"
} }
} }

4
contracts/zero-ex/tests/forked/SwapERC20ForERC20Test.t.sol
View File

@ -56,8 +56,8 @@ contract SwapERC20ForERC20Test is Test, ForkUtils, TestUtils {
function test_swapERC20ForERC20OnTraderJoeV2() public { function test_swapERC20ForERC20OnTraderJoeV2() public {
for (uint256 i = 0; i < chains.length; i++) { for (uint256 i = 0; i < chains.length; i++) {
// TraderJoeV2 mixin only enabled on Avalanche // TraderJoeV2 mixin only enabled on Avalanche and Arbitrum
if (i != 3) { if (i != 3 && i != 6) {
continue; continue;
} }
vm.selectFork(forkIds[chains[i]]); vm.selectFork(forkIds[chains[i]]);

8
packages/contract-addresses/CHANGELOG.json
View File

@ -1,4 +1,12 @@
[ [
{
"version": "8.7.0",
"changes": [
{
"note": "Add Trader Joe V2 MixIn to Arbitrum"
}
]
},
{ {
"version": "8.6.0", "version": "8.6.0",
"changes": [ "changes": [

2
packages/contract-addresses/addresses.json
View File

@ -248,7 +248,7 @@
"wethTransformer": "0x10e968968f49dd66a5efeebbb2edcb9c49c4fc49", "wethTransformer": "0x10e968968f49dd66a5efeebbb2edcb9c49c4fc49",
"payTakerTransformer": "0xd81e65fc9bb7323bdbef8b2cdddd3b83fe41d630", "payTakerTransformer": "0xd81e65fc9bb7323bdbef8b2cdddd3b83fe41d630",
"affiliateFeeTransformer": "0x970e318b8f074c20bf0cee06970f01dc7a761e50", "affiliateFeeTransformer": "0x970e318b8f074c20bf0cee06970f01dc7a761e50",
"fillQuoteTransformer": "0x5d3a221bad31c3f3c07bea2f1de9b3ec17664b69", "fillQuoteTransformer": "0x4a8815c2fc605e3b01aee52aade4d096c4e862c6",
"positiveSlippageFeeTransformer": "0x20f935b037e8490d8027f2751f9452725eee01ad" "positiveSlippageFeeTransformer": "0x20f935b037e8490d8027f2751f9452725eee01ad"
} }
} }