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 uniswapx v2 initial structs #213

Merged
merged 25 commits into from
Jan 23, 2024
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
0b5ec8c
fix: typos (#190)
marktoda Aug 21, 2023
d2e90d1
feat: remove native transfer gas limit (#189)
marktoda Aug 21, 2023
837b7b1
fix: remove unused imports (#191)
marktoda Aug 21, 2023
4c49016
fix: documentation (#193)
marktoda Aug 21, 2023
0d81086
fix: Add missing natspec (#192)
marktoda Aug 21, 2023
046fc20
fix: enforce dutch decay actually decays (#194)
marktoda Aug 22, 2023
ffceda5
fix: magic number documentation (#196)
marktoda Aug 22, 2023
6eae896
feat: improve test coverage (#197)
marktoda Aug 24, 2023
3399344
Remove unused return param names (#199)
hensha256 Oct 5, 2023
55826f3
Merge remote-tracking branch 'origin/main' into development
marktoda Dec 12, 2023
a5cb865
fix: fmt
marktoda Dec 12, 2023
f0172ec
fix: tests
marktoda Dec 14, 2023
bbcfd65
fix: lint
marktoda Dec 14, 2023
cd671bf
Merge remote-tracking branch 'origin/main' into add-uniswapx-v2-initi…
marktoda Dec 18, 2023
2e85cc3
fix: typos
marktoda Dec 18, 2023
2078f90
fix: revert if decay times are equal
marktoda Dec 18, 2023
74413bc
fix: check for 0 address signer
marktoda Dec 18, 2023
0ee8acd
fix: remove old exclusivityOverride for now
marktoda Dec 18, 2023
8c48003
feat: add tests for override and cosigner
marktoda Dec 20, 2023
142a319
fix: ensure output overrides length is correct
marktoda Dec 20, 2023
0d0a6d7
feat: tests with successful override
marktoda Dec 21, 2023
e50cb81
Merge remote-tracking branch 'origin/main' into add-uniswapx-v2-initi…
marktoda Dec 21, 2023
2d71272
feat: flatten v2 struct
marktoda Dec 21, 2023
7c9b5dd
fix: cleaup
marktoda Dec 21, 2023
eba83d6
fix: tests overrides
marktoda Jan 23, 2024
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
Prev Previous commit
Next Next commit
fix: check for 0 address signer
  • Loading branch information
marktoda committed Dec 18, 2023
commit 74413bc251ffd500e5f63e2d32671ab504f4f945
Original file line number Diff line number Diff line change
@@ -1 +1 @@
189606
189629
2 changes: 1 addition & 1 deletion .forge-snapshots/Base-V2DutchOrder-ExecuteBatch.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
212188
212234
Original file line number Diff line number Diff line change
@@ -1 +1 @@
222748
222794
Original file line number Diff line number Diff line change
@@ -1 +1 @@
277211
277257
Original file line number Diff line number Diff line change
@@ -1 +1 @@
205714
205760
2 changes: 1 addition & 1 deletion .forge-snapshots/Base-V2DutchOrder-ExecuteSingle.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
155794
155817
Original file line number Diff line number Diff line change
@@ -1 +1 @@
141360
141383
Original file line number Diff line number Diff line change
@@ -1 +1 @@
165115
165138
2 changes: 1 addition & 1 deletion src/reactors/V2DutchOrderReactor.sol
Original file line number Diff line number Diff line change
@@ -115,7 +115,7 @@ contract V2DutchOrderReactor is BaseReactor {
(bytes32 r, bytes32 s) = abi.decode(cosigned.signature, (bytes32, bytes32));
uint8 v = uint8(cosigned.signature[64]);
address signer = ecrecover(keccak256(abi.encode(order)), v, r, s);
hensha256 marked this conversation as resolved.
Show resolved Hide resolved
if (order.inner.cosigner != signer) {
if (order.inner.cosigner != signer && signer != address(0)) {
revert InvalidCosignature();
}