[WIP] Implement a conditional swap #304
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes to gas cost
🧾 Summary (20% most significant diffs)
Full diff report 👇
|
Changes to gas cost
🧾 Summary (20% most significant diffs)
Full diff report 👇
|
| bytes1 settlementType = settlementData[0]; | ||
| bytes memory strategyData = settlementData[1:]; | ||
|
|
||
| uint256 returnedAmount; |
There was a problem hiding this comment.
move declaration into the settlementType == 0x01 block
There was a problem hiding this comment.
As discussed, this should not be changed.
contracts/ConditionalSwap.sol
Outdated
| IStrategy(strategy).executeStrategy(order.takerToken, order.makerToken, takerTokenAmount, data); | ||
| returnedAmount = order.makerToken.getBalance(address(this)) - makerTokenBalanceBefore; | ||
|
|
||
| if (returnedAmount < minMakerTokenAmount) revert InsufficientOutput(); |
There was a problem hiding this comment.
I think compare with makerTokenAmount instead of minMakerTokenAmount is more appropriate here.
contracts/ConditionalSwap.sol
Outdated
| if (returnedAmount < minMakerTokenAmount) revert InsufficientOutput(); | ||
| order.makerToken.transferTo(order.recipient, returnedAmount); | ||
| } else { | ||
| revert(); // specific the error message1 |
There was a problem hiding this comment.
add error here, debug would be easier
There was a problem hiding this comment.
I add a new error InvalidSettlementType for this case.
| Snapshot memory recMakerToken = BalanceSnapshot.take({ owner: recipient, token: defaultOrder.makerToken }); | ||
|
|
||
| // craft the `flagAndPeriod` of the defaultOrder for BestBuy case | ||
| uint256 flags = 1 << 253; |
There was a problem hiding this comment.
Define flags constant first and use logic OR here to compose flags to have better semantic meaning.
| super.setUp(); | ||
| } | ||
|
|
||
| function testBestBuyOrder() external { |
There was a problem hiding this comment.
add comments for different scenario requirement and flags to help reader understanding
alex0207s
force-pushed
the
implement-conditional-swap
branch
from
297b2b5 to
48fbfef
Compare
contracts/ConditionalSwap.sol
Outdated
| } | ||
| } else revert InvalidSettlementType(); | ||
|
|
||
| _emitConOrderFilled(order, orderHash, takerTokenAmount, returnedAmount); |
There was a problem hiding this comment.
Should use returnedAmount in event instead.
alex0207s
commented
Mar 14, 2024
| order.takerTokenAmount, | ||
| order.makerToken, | ||
| order.makerTokenAmount, | ||
| keccak256(order.takerTokenPermit), |
There was a problem hiding this comment.
EIP712: The dynamic values
bytesandstringare encoded as a keccak256 hash of their contents.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fillConOrderfunction