Skip to content

Commit c78483a

Browse files
duncancmtduncancmt
committed
forge fmt
1 parent 66e3e24 commit c78483a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+440
-144
lines changed

‎src/chains/Abstract/TakerSubmitted.sol‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,12 @@ import {UniswapV3Fork} from "../../core/UniswapV3Fork.sol";
1919
contract AbstractSettler is Settler, AbstractMixin {
2020
constructor(bytes20 gitCommit) SettlerBase(gitCommit) {}
2121

22-
function _dispatchVIP(uint256 action, bytes calldata data, AllowedSlippage memory slippage) internal override DANGEROUS_freeMemory returns (bool) {
22+
function _dispatchVIP(uint256 action, bytes calldata data, AllowedSlippage memory slippage)
23+
internal
24+
override
25+
DANGEROUS_freeMemory
26+
returns (bool)
27+
{
2328
if (super._dispatchVIP(action, data, slippage)) {
2429
return true;
2530
} else {

‎src/chains/Arbitrum/Common.sol‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ abstract contract ArbitrumMixin is
8686
) = abi.decode(data, (address, IERC20, uint256, bool, uint256, uint256, bytes, uint256));
8787
IERC20 buyToken;
8888
(recipient, buyToken, minAmountOut) = _maybeSetSlippage(slippage, recipient, minAmountOut);
89-
(IERC20 actualBuyToken, uint256 actualAmountOut) = sellToUniswapV4(recipient, sellToken, bps, feeOnTransfer, hashMul, hashMod, fills);
89+
(IERC20 actualBuyToken, uint256 actualAmountOut) =
90+
sellToUniswapV4(recipient, sellToken, bps, feeOnTransfer, hashMul, hashMod, fills);
9091
_checkSlippage(buyToken, minAmountOut, actualBuyToken, actualAmountOut);
9192
} else if (action == uint32(ISettlerActions.BALANCERV3.selector)) {
9293
(
@@ -101,7 +102,8 @@ abstract contract ArbitrumMixin is
101102
) = abi.decode(data, (address, IERC20, uint256, bool, uint256, uint256, bytes, uint256));
102103
IERC20 buyToken;
103104
(recipient, buyToken, minAmountOut) = _maybeSetSlippage(slippage, recipient, minAmountOut);
104-
(IERC20 actualBuyToken, uint256 actualAmountOut) = sellToBalancerV3(recipient, sellToken, bps, feeOnTransfer, hashMul, hashMod, fills);
105+
(IERC20 actualBuyToken, uint256 actualAmountOut) =
106+
sellToBalancerV3(recipient, sellToken, bps, feeOnTransfer, hashMul, hashMod, fills);
105107
_checkSlippage(buyToken, minAmountOut, actualBuyToken, actualAmountOut);
106108
} else if (action == uint32(ISettlerActions.MAVERICKV2.selector)) {
107109
(
@@ -115,7 +117,8 @@ abstract contract ArbitrumMixin is
115117
) = abi.decode(data, (address, IERC20, uint256, IMaverickV2Pool, bool, int32, uint256));
116118
IERC20 buyToken;
117119
(recipient, buyToken, minAmountOut) = _maybeSetSlippage(slippage, recipient, minAmountOut);
118-
(IERC20 actualBuyToken, uint256 actualAmountOut) = sellToMaverickV2(recipient, sellToken, bps, pool, tokenAIn, tickLimit);
120+
(IERC20 actualBuyToken, uint256 actualAmountOut) =
121+
sellToMaverickV2(recipient, sellToken, bps, pool, tokenAIn, tickLimit);
119122
_checkSlippage(buyToken, minAmountOut, actualBuyToken, actualAmountOut);
120123
} else if (action == uint32(ISettlerActions.BEBOP.selector)) {
121124
(
@@ -132,11 +135,18 @@ abstract contract ArbitrumMixin is
132135
(IERC20 actualBuyToken, uint256 actualAmountOut) = sellToBebop(recipient, sellToken, order, makerSignature);
133136
_checkSlippage(buyToken, minAmountOut, actualBuyToken, actualAmountOut);
134137
} else if (action == uint32(ISettlerActions.DODOV2.selector)) {
135-
(address payable recipient, IERC20 sellToken, uint256 bps, IDodoV2 dodo, bool quoteForBase, uint256 minAmountOut) =
136-
abi.decode(data, (address, IERC20, uint256, IDodoV2, bool, uint256));
138+
(
139+
address payable recipient,
140+
IERC20 sellToken,
141+
uint256 bps,
142+
IDodoV2 dodo,
143+
bool quoteForBase,
144+
uint256 minAmountOut
145+
) = abi.decode(data, (address, IERC20, uint256, IDodoV2, bool, uint256));
137146
IERC20 buyToken;
138147
(recipient, buyToken, minAmountOut) = _maybeSetSlippage(slippage, recipient, minAmountOut);
139-
(IERC20 actualBuyToken, uint256 actualAmountOut) = sellToDodoV2(recipient, sellToken, bps, dodo, quoteForBase);
148+
(IERC20 actualBuyToken, uint256 actualAmountOut) =
149+
sellToDodoV2(recipient, sellToken, bps, dodo, quoteForBase);
140150
_checkSlippage(buyToken, minAmountOut, actualBuyToken, actualAmountOut);
141151
} else if (action == uint32(ISettlerActions.DODOV1.selector)) {
142152
(IERC20 sellToken, uint256 bps, IDodoV1 dodo, bool quoteForBase, uint256 minBuyAmount) =

‎src/chains/Arbitrum/MetaTxn.sol‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ contract ArbitrumSettlerMetaTxn is SettlerMetaTxn, ArbitrumMixin {
4040
);
4141
IERC20 buyToken;
4242
(recipient, buyToken, minAmountOut) = _maybeSetSlippage(slippage, recipient, minAmountOut);
43-
(IERC20 actualBuyToken, uint256 actualAmountOut) = sellToUniswapV4VIP(recipient, feeOnTransfer, hashMul, hashMod, fills, permit, sig);
43+
(IERC20 actualBuyToken, uint256 actualAmountOut) =
44+
sellToUniswapV4VIP(recipient, feeOnTransfer, hashMul, hashMod, fills, permit, sig);
4445
_checkSlippage(buyToken, minAmountOut, actualBuyToken, actualAmountOut);
4546
} else if (action == uint32(ISettlerActions.METATXN_BALANCERV3_VIP.selector)) {
4647
(
@@ -56,7 +57,8 @@ contract ArbitrumSettlerMetaTxn is SettlerMetaTxn, ArbitrumMixin {
5657
);
5758
IERC20 buyToken;
5859
(recipient, buyToken, minAmountOut) = _maybeSetSlippage(slippage, recipient, minAmountOut);
59-
(IERC20 actualBuyToken, uint256 actualAmountOut) = sellToBalancerV3VIP(recipient, feeOnTransfer, hashMul, hashMod, fills, permit, sig);
60+
(IERC20 actualBuyToken, uint256 actualAmountOut) =
61+
sellToBalancerV3VIP(recipient, feeOnTransfer, hashMul, hashMod, fills, permit, sig);
6062
_checkSlippage(buyToken, minAmountOut, actualBuyToken, actualAmountOut);
6163
} else if (action == uint32(ISettlerActions.METATXN_MAVERICKV2_VIP.selector)) {
6264
(
@@ -69,7 +71,8 @@ contract ArbitrumSettlerMetaTxn is SettlerMetaTxn, ArbitrumMixin {
6971
) = abi.decode(data, (address, ISignatureTransfer.PermitTransferFrom, bytes32, bool, int32, uint256));
7072
IERC20 buyToken;
7173
(recipient, buyToken, minAmountOut) = _maybeSetSlippage(slippage, recipient, minAmountOut);
72-
(IERC20 actualBuyToken, uint256 actualAmountOut) = sellToMaverickV2VIP(recipient, salt, tokenAIn, permit, sig, tickLimit);
74+
(IERC20 actualBuyToken, uint256 actualAmountOut) =
75+
sellToMaverickV2VIP(recipient, salt, tokenAIn, permit, sig, tickLimit);
7376
_checkSlippage(buyToken, minAmountOut, actualBuyToken, actualAmountOut);
7477
} else if (action == uint32(ISettlerActions.METATXN_CURVE_TRICRYPTO_VIP.selector)) {
7578
(

‎src/chains/Arbitrum/TakerSubmitted.sol‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@ import {Permit2PaymentAbstract} from "../../core/Permit2PaymentAbstract.sol";
1818
contract ArbitrumSettler is Settler, ArbitrumMixin {
1919
constructor(bytes20 gitCommit) SettlerBase(gitCommit) {}
2020

21-
function _dispatchVIP(uint256 action, bytes calldata data, AllowedSlippage memory slippage) internal override DANGEROUS_freeMemory returns (bool) {
21+
function _dispatchVIP(uint256 action, bytes calldata data, AllowedSlippage memory slippage)
22+
internal
23+
override
24+
DANGEROUS_freeMemory
25+
returns (bool)
26+
{
2227
if (super._dispatchVIP(action, data, slippage)) {
2328
return true;
2429
} else if (action == uint32(ISettlerActions.UNISWAPV4_VIP.selector)) {
@@ -36,7 +41,8 @@ contract ArbitrumSettler is Settler, ArbitrumMixin {
3641
);
3742
IERC20 buyToken;
3843
(recipient, buyToken, minAmountOut) = _maybeSetSlippage(slippage, recipient, minAmountOut);
39-
(IERC20 actualBuyToken, uint256 actualAmountOut) = sellToUniswapV4VIP(recipient, feeOnTransfer, hashMul, hashMod, fills, permit, sig);
44+
(IERC20 actualBuyToken, uint256 actualAmountOut) =
45+
sellToUniswapV4VIP(recipient, feeOnTransfer, hashMul, hashMod, fills, permit, sig);
4046
_checkSlippage(buyToken, minAmountOut, actualBuyToken, actualAmountOut);
4147
} else if (action == uint32(ISettlerActions.BALANCERV3_VIP.selector)) {
4248
(
@@ -53,7 +59,8 @@ contract ArbitrumSettler is Settler, ArbitrumMixin {
5359
);
5460
IERC20 buyToken;
5561
(recipient, buyToken, minAmountOut) = _maybeSetSlippage(slippage, recipient, minAmountOut);
56-
(IERC20 actualBuyToken, uint256 actualAmountOut) = sellToBalancerV3VIP(recipient, feeOnTransfer, hashMul, hashMod, fills, permit, sig);
62+
(IERC20 actualBuyToken, uint256 actualAmountOut) =
63+
sellToBalancerV3VIP(recipient, feeOnTransfer, hashMul, hashMod, fills, permit, sig);
5764
_checkSlippage(buyToken, minAmountOut, actualBuyToken, actualAmountOut);
5865
} else if (action == uint32(ISettlerActions.MAVERICKV2_VIP.selector)) {
5966
(
@@ -67,7 +74,8 @@ contract ArbitrumSettler is Settler, ArbitrumMixin {
6774
) = abi.decode(data, (address, ISignatureTransfer.PermitTransferFrom, bytes32, bool, bytes, int32, uint256));
6875
IERC20 buyToken;
6976
(recipient, buyToken, minAmountOut) = _maybeSetSlippage(slippage, recipient, minAmountOut);
70-
(IERC20 actualBuyToken, uint256 actualAmountOut) = sellToMaverickV2VIP(recipient, salt, tokenAIn, permit, sig, tickLimit);
77+
(IERC20 actualBuyToken, uint256 actualAmountOut) =
78+
sellToMaverickV2VIP(recipient, salt, tokenAIn, permit, sig, tickLimit);
7179
_checkSlippage(buyToken, minAmountOut, actualBuyToken, actualAmountOut);
7280
} else if (action == uint32(ISettlerActions.CURVE_TRICRYPTO_VIP.selector)) {
7381
(

‎src/chains/Avalanche/Common.sol‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,22 @@ abstract contract AvalancheMixin is FreeMemory, SettlerBase, DodoV2, UniswapV4,
5656
) = abi.decode(data, (address, IERC20, uint256, bool, uint256, uint256, bytes, uint256));
5757
IERC20 buyToken;
5858
(recipient, buyToken, minAmountOut) = _maybeSetSlippage(slippage, recipient, minAmountOut);
59-
(IERC20 actualBuyToken, uint256 actualAmountOut) = sellToUniswapV4(recipient, sellToken, bps, feeOnTransfer, hashMul, hashMod, fills);
59+
(IERC20 actualBuyToken, uint256 actualAmountOut) =
60+
sellToUniswapV4(recipient, sellToken, bps, feeOnTransfer, hashMul, hashMod, fills);
6061
_checkSlippage(buyToken, minAmountOut, actualBuyToken, actualAmountOut);
6162
} else if (action == uint32(ISettlerActions.EULERSWAP.selector)) {
62-
(address payable recipient, IERC20 sellToken, uint256 bps, IEulerSwap pool, bool zeroForOne, uint256 minAmountOut) =
63-
abi.decode(data, (address, IERC20, uint256, IEulerSwap, bool, uint256));
63+
(
64+
address payable recipient,
65+
IERC20 sellToken,
66+
uint256 bps,
67+
IEulerSwap pool,
68+
bool zeroForOne,
69+
uint256 minAmountOut
70+
) = abi.decode(data, (address, IERC20, uint256, IEulerSwap, bool, uint256));
6471
IERC20 buyToken;
6572
(recipient, buyToken, minAmountOut) = _maybeSetSlippage(slippage, recipient, minAmountOut);
66-
(IERC20 actualBuyToken, uint256 actualAmountOut) = sellToEulerSwap(recipient, sellToken, bps, pool, zeroForOne);
73+
(IERC20 actualBuyToken, uint256 actualAmountOut) =
74+
sellToEulerSwap(recipient, sellToken, bps, pool, zeroForOne);
6775
_checkSlippage(buyToken, minAmountOut, actualBuyToken, actualAmountOut);
6876
} else if (action == uint32(ISettlerActions.BALANCERV3.selector)) {
6977
(
@@ -78,7 +86,8 @@ abstract contract AvalancheMixin is FreeMemory, SettlerBase, DodoV2, UniswapV4,
7886
) = abi.decode(data, (address, IERC20, uint256, bool, uint256, uint256, bytes, uint256));
7987
IERC20 buyToken;
8088
(recipient, buyToken, minAmountOut) = _maybeSetSlippage(slippage, recipient, minAmountOut);
81-
(IERC20 actualBuyToken, uint256 actualAmountOut) = sellToBalancerV3(recipient, sellToken, bps, feeOnTransfer, hashMul, hashMod, fills);
89+
(IERC20 actualBuyToken, uint256 actualAmountOut) =
90+
sellToBalancerV3(recipient, sellToken, bps, feeOnTransfer, hashMul, hashMod, fills);
8291
_checkSlippage(buyToken, minAmountOut, actualBuyToken, actualAmountOut);
8392
} else if (action == uint32(ISettlerActions.BEBOP.selector)) {
8493
(
@@ -95,11 +104,18 @@ abstract contract AvalancheMixin is FreeMemory, SettlerBase, DodoV2, UniswapV4,
95104
(IERC20 actualBuyToken, uint256 actualAmountOut) = sellToBebop(recipient, sellToken, order, makerSignature);
96105
_checkSlippage(buyToken, minAmountOut, actualBuyToken, actualAmountOut);
97106
} else if (action == uint32(ISettlerActions.DODOV2.selector)) {
98-
(address payable recipient, IERC20 sellToken, uint256 bps, IDodoV2 dodo, bool quoteForBase, uint256 minAmountOut) =
99-
abi.decode(data, (address, IERC20, uint256, IDodoV2, bool, uint256));
107+
(
108+
address payable recipient,
109+
IERC20 sellToken,
110+
uint256 bps,
111+
IDodoV2 dodo,
112+
bool quoteForBase,
113+
uint256 minAmountOut
114+
) = abi.decode(data, (address, IERC20, uint256, IDodoV2, bool, uint256));
100115
IERC20 buyToken;
101116
(recipient, buyToken, minAmountOut) = _maybeSetSlippage(slippage, recipient, minAmountOut);
102-
(IERC20 actualBuyToken, uint256 actualAmountOut) = sellToDodoV2(recipient, sellToken, bps, dodo, quoteForBase);
117+
(IERC20 actualBuyToken, uint256 actualAmountOut) =
118+
sellToDodoV2(recipient, sellToken, bps, dodo, quoteForBase);
103119
_checkSlippage(buyToken, minAmountOut, actualBuyToken, actualAmountOut);
104120
} else {
105121
return false;

‎src/chains/Avalanche/MetaTxn.sol‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ contract AvalancheSettlerMetaTxn is SettlerMetaTxn, AvalancheMixin {
4040
);
4141
IERC20 buyToken;
4242
(recipient, buyToken, minAmountOut) = _maybeSetSlippage(slippage, recipient, minAmountOut);
43-
(IERC20 actualBuyToken, uint256 actualAmountOut) = sellToUniswapV4VIP(recipient, feeOnTransfer, hashMul, hashMod, fills, permit, sig);
43+
(IERC20 actualBuyToken, uint256 actualAmountOut) =
44+
sellToUniswapV4VIP(recipient, feeOnTransfer, hashMul, hashMod, fills, permit, sig);
4445
_checkSlippage(buyToken, minAmountOut, actualBuyToken, actualAmountOut);
4546
} else if (action == uint32(ISettlerActions.METATXN_BALANCERV3_VIP.selector)) {
4647
(
@@ -56,7 +57,8 @@ contract AvalancheSettlerMetaTxn is SettlerMetaTxn, AvalancheMixin {
5657
);
5758
IERC20 buyToken;
5859
(recipient, buyToken, minAmountOut) = _maybeSetSlippage(slippage, recipient, minAmountOut);
59-
(IERC20 actualBuyToken, uint256 actualAmountOut) = sellToBalancerV3VIP(recipient, feeOnTransfer, hashMul, hashMod, fills, permit, sig);
60+
(IERC20 actualBuyToken, uint256 actualAmountOut) =
61+
sellToBalancerV3VIP(recipient, feeOnTransfer, hashMul, hashMod, fills, permit, sig);
6062
_checkSlippage(buyToken, minAmountOut, actualBuyToken, actualAmountOut);
6163
} else {
6264
return false;

‎src/chains/Avalanche/TakerSubmitted.sol‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@ import {Permit2PaymentAbstract} from "../../core/Permit2PaymentAbstract.sol";
1818
contract AvalancheSettler is Settler, AvalancheMixin {
1919
constructor(bytes20 gitCommit) SettlerBase(gitCommit) {}
2020

21-
function _dispatchVIP(uint256 action, bytes calldata data, AllowedSlippage memory slippage) internal override DANGEROUS_freeMemory returns (bool) {
21+
function _dispatchVIP(uint256 action, bytes calldata data, AllowedSlippage memory slippage)
22+
internal
23+
override
24+
DANGEROUS_freeMemory
25+
returns (bool)
26+
{
2227
if (super._dispatchVIP(action, data, slippage)) {
2328
return true;
2429
} else if (action == uint32(ISettlerActions.UNISWAPV4_VIP.selector)) {
@@ -36,7 +41,8 @@ contract AvalancheSettler is Settler, AvalancheMixin {
3641
);
3742
IERC20 buyToken;
3843
(recipient, buyToken, minAmountOut) = _maybeSetSlippage(slippage, recipient, minAmountOut);
39-
(IERC20 actualBuyToken, uint256 actualAmountOut) = sellToUniswapV4VIP(recipient, feeOnTransfer, hashMul, hashMod, fills, permit, sig);
44+
(IERC20 actualBuyToken, uint256 actualAmountOut) =
45+
sellToUniswapV4VIP(recipient, feeOnTransfer, hashMul, hashMod, fills, permit, sig);
4046
_checkSlippage(buyToken, minAmountOut, actualBuyToken, actualAmountOut);
4147
} else if (action == uint32(ISettlerActions.BALANCERV3_VIP.selector)) {
4248
(
@@ -53,7 +59,8 @@ contract AvalancheSettler is Settler, AvalancheMixin {
5359
);
5460
IERC20 buyToken;
5561
(recipient, buyToken, minAmountOut) = _maybeSetSlippage(slippage, recipient, minAmountOut);
56-
(IERC20 actualBuyToken, uint256 actualAmountOut) = sellToBalancerV3VIP(recipient, feeOnTransfer, hashMul, hashMod, fills, permit, sig);
62+
(IERC20 actualBuyToken, uint256 actualAmountOut) =
63+
sellToBalancerV3VIP(recipient, feeOnTransfer, hashMul, hashMod, fills, permit, sig);
5764
_checkSlippage(buyToken, minAmountOut, actualBuyToken, actualAmountOut);
5865
} else {
5966
return false;

0 commit comments

Comments
 (0)