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

[TD-1326] Immutable signed zone v2 #189

Merged
merged 80 commits into from
Apr 11, 2024
Merged
Show file tree
Hide file tree
Changes from 78 commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
d8a2525
Added skeleton and substandard 3
lfportal Mar 25, 2024
0c28886
Fix TS build
lfportal Mar 26, 2024
7b6ace6
Add substandard 4 and 6 validation
lfportal Mar 26, 2024
4aa138d
Safe maths
lfportal Mar 26, 2024
fadfb6e
Update array comparison
lfportal Mar 26, 2024
6517197
Re-order functions for clarity
lfportal Mar 26, 2024
f7ea5e6
Hardhat 0.8.20 compiler config
lfportal Mar 26, 2024
348fa15
Revert tsconfig change
lfportal Mar 27, 2024
06ff5df
Switch access control to AccessControlEnumerable
lfportal Mar 28, 2024
11b88a8
Forge install openzeppelin contracts 5.0.2
lfportal Mar 28, 2024
bdaa64c
Add openzeppelin contracts 5.0.2 remapping
lfportal Mar 28, 2024
f5aa6e5
Basic test for substandard 3
lfportal Apr 3, 2024
5d8cb50
Split work
lfportal Apr 3, 2024
4f3ba6e
Format with forge
lfportal Apr 3, 2024
79ea23a
Add signer tests
lfportal Apr 3, 2024
2660f60
Add removeSigner tests
lfportal Apr 3, 2024
24fa78d
TD-1326: chore: add tests for _validateSubstandard4
naveen-imtb Apr 3, 2024
d2c1b58
Merge remote-tracking branch 'origin/TD-1326-immutable-signed-zone-v2…
naveen-imtb Apr 3, 2024
3f43ff5
newline
lfportal Apr 3, 2024
ce47a09
use makeAddr
lfportal Apr 3, 2024
e5390f9
TD-1326: chore: fix _validateSubstandard4 logic and add tests
naveen-imtb Apr 3, 2024
1966bc2
TD-1326: style: forge fmt source contract
naveen-imtb Apr 3, 2024
87f27fd
TD-1326: style: forge fmt test contract
naveen-imtb Apr 3, 2024
edc8222
Add zone helper functions
lfportal Apr 3, 2024
d72fd3d
solhints
lfportal Apr 3, 2024
67005ac
Use TestHelper
lfportal Apr 3, 2024
b4ef4bb
Use zone helpers
lfportal Apr 3, 2024
7b025a8
Removed unused import
lfportal Apr 3, 2024
5372044
TD-1326: chore: add tests for _validateSubstandard6
naveen-imtb Apr 3, 2024
e84f19b
TD-1326: chore: add tests for _deriveReceivedItemsHash
naveen-imtb Apr 3, 2024
a4ada41
solhints
lfportal Apr 3, 2024
9d2590a
Add test for _getSupportedSubstandards
lfportal Apr 3, 2024
345f596
Add test for sip7Information
lfportal Apr 3, 2024
f3625a0
Add test for getSeaportMetadata
lfportal Apr 3, 2024
16d3100
Forge format
lfportal Apr 3, 2024
143b645
TD-1326: chore: add tests for _bytes32ArrayIncludes
naveen-imtb Apr 3, 2024
7ceb9f6
Add test for supportsInterface
lfportal Apr 3, 2024
a49aa29
TD-1326: chore: add tests for _domainSeparator and _deriveDomainSepar…
naveen-imtb Apr 3, 2024
70f72b3
TD-1326: chore: add tests for _updateAPIEndpoint and _deriveSignedOrd…
naveen-imtb Apr 4, 2024
7e09385
Revert "TD-1326: chore: add tests for _updateAPIEndpoint and _deriveS…
naveen-imtb Apr 4, 2024
418768b
TD-1326: chore: add tests for _updateAPIEndpoint and _deriveSignedOrd…
naveen-imtb Apr 4, 2024
632fd68
Fix bytes context initialisation
lfportal Apr 4, 2024
4aa943f
Fix all usages of bytes instantiation
lfportal Apr 4, 2024
cf6d060
Delegate tasks
lfportal Apr 4, 2024
37c360a
Add tests for _validateSubstandards
lfportal Apr 4, 2024
fc52c0b
TD-1326: chore: add tests for _validateOrder
naveen-imtb Apr 5, 2024
cdf9174
Forge format
lfportal Apr 5, 2024
bf451af
Formatting
lfportal Apr 5, 2024
06b3508
TD-1326: chore: add test for _deriveReceivedItemsHash
naveen-imtb Apr 5, 2024
8fe89c7
TD-1326: chore: add helper utility to build extradata
naveen-imtb Apr 5, 2024
0a4d502
TD-1326: chore: fix up large amount test
naveen-imtb Apr 5, 2024
55176a9
TD-1326: chore: fix up token types and amounts for received items.
naveen-imtb Apr 5, 2024
fc416b6
TD-1326: chore: fix up function signature
naveen-imtb Apr 5, 2024
d97783a
WIP integration test
lfportal Apr 5, 2024
305983a
Complete integration test
lfportal Apr 8, 2024
8ad95a0
revert solidity pragma
lfportal Apr 8, 2024
a7e5392
forge fmt
lfportal Apr 8, 2024
cf47025
Remove unused import
lfportal Apr 8, 2024
a1e685c
solhints
lfportal Apr 8, 2024
032cf1f
WIP
lfportal Apr 8, 2024
d20e73f
wip
lfportal Apr 8, 2024
d7a3e38
Getting it to compile
lfportal Apr 8, 2024
7233606
Test works
lfportal Apr 8, 2024
4565212
partial fill test
lfportal Apr 8, 2024
7660043
Add more partial fill tests
lfportal Apr 8, 2024
4ed227f
TD-1326: chore: add integration test for complete fulfilment with ERC721
naveen-imtb Apr 8, 2024
bdff9a8
Remove unused import
lfportal Apr 9, 2024
58b85d9
solhint fix
lfportal Apr 9, 2024
4897310
Add signing helper contract
lfportal Apr 9, 2024
b56837c
Refactor helper functions
lfportal Apr 9, 2024
bf9ddb6
Comment fix
lfportal Apr 9, 2024
b6ea082
Refactor errors
lfportal Apr 9, 2024
3235226
Refactor
lfportal Apr 9, 2024
a21cbaa
Comments
lfportal Apr 9, 2024
fad825e
Comments
lfportal Apr 9, 2024
0ce6af8
revert payment splitter changes
lfportal Apr 9, 2024
1d00530
Reorganise seaport zones folder structure
lfportal Apr 10, 2024
e73ff87
Add comments
lfportal Apr 10, 2024
26b132f
Format
lfportal Apr 11, 2024
eb5495a
Add additional clarification for each substandard
lfportal Apr 11, 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
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@
[submodule "lib/immutable-seaport-core-1.5.0+im1"]
path = lib/immutable-seaport-core-1.5.0+im1
url = https://github.com/immutable/seaport-core
[submodule "lib/openzeppelin-contracts-5.0.2"]
path = lib/openzeppelin-contracts-5.0.2
url = https://github.com/OpenZeppelin/openzeppelin-contracts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Copyright (c) Immutable Pty Ltd 2018 - 2023
// SPDX-License-Identifier: Apache-2
// solhint-disable compiler-version

// slither-disable-start missing-inheritance
// solhint-disable-next-line compiler-version
pragma solidity ^0.8.17;

import {ZoneParameters, Schema, ReceivedItem} from "seaport-types/src/lib/ConsiderationStructs.sol";
Expand Down
Loading
Loading