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

Seaport 1.2 #940

Draft
wants to merge 1,604 commits into
base: seaport-1.1
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1604 commits
Select commit Hold shift + click to select a range
995896b
add test for failing validation of signed order after counter is incr…
Jan 17, 2023
f1cc7b8
Merge pull request #883 from ProjectOpenSea/dan/2023/01/test-validate…
DJViau Jan 17, 2023
7dca0b0
add eth transfer to contract offerer
Jan 17, 2023
0b4472b
prog on test
Jan 17, 2023
5db6ca6
adds tests for the hardcoded selectors in consideration constants
Jan 18, 2023
589ead1
add a test for the constant that was in the transferrer const file
Jan 18, 2023
a72907c
document table sweeping
Jan 18, 2023
3fdaf7c
document revert behavior where incorrect conduit key is provided
Jan 18, 2023
920129b
Merge pull request #885 from ProjectOpenSea/dan/2023/01/add-selector-…
0age Jan 18, 2023
95355d7
Merge pull request #886 from ProjectOpenSea/dan/2023/01/document-tabl…
0age Jan 18, 2023
778b5e3
Merge pull request #887 from ProjectOpenSea/dan/2023/01/document-non-…
0age Jan 18, 2023
58f519b
add ETH <=> ERC721 test
Jan 18, 2023
00cf18c
skip test file for coverage
Jan 18, 2023
0442e6a
add test contract to shim
Jan 18, 2023
70268fa
start on forge test
Jan 18, 2023
e682cca
add initial forge tests
Jan 19, 2023
692b4e6
getMetadata => getSeaportMetadata (with Schema array)
0age Jan 19, 2023
ba5d2ab
Merge branch '1.2' into 1.2-native-token-tests
0age Jan 19, 2023
c42788f
add missing import
0age Jan 19, 2023
bf74be6
one more forge test
0age Jan 19, 2023
ffb93a3
Merge pull request #889 from ProjectOpenSea/1.2-metadata-revision
0age Jan 19, 2023
1e6ad9a
implement payable functionality on reference
0age Jan 19, 2023
d2cfd6d
add invalid msg value error to reentrancy guard
Jan 19, 2023
f4bbd4c
Merge branch '1.2' into 1.2-native-token-tests
0age Jan 19, 2023
4e003c7
bump
Jan 19, 2023
b3637ff
Merge branch '1.2-native-token-tests' of https://github.com/ProjectOp…
Jan 19, 2023
f15cc72
update contract offerer for new metadata interface
0age Jan 19, 2023
6a343fc
Merge pull request #888 from ProjectOpenSea/1.2-native-token-tests
0age Jan 19, 2023
cd3998b
remove only
0age Jan 19, 2023
38b34e1
Merge pull request #890 from ProjectOpenSea/1.2-native-token-tests
0age Jan 19, 2023
5db7edd
bump vulnerable dependencies
0age Jan 19, 2023
2dbdf79
Merge pull request #891 from ProjectOpenSea/1.2-dependency-bump
0age Jan 19, 2023
8ffcbcf
add coverage for invalid native token receipt
0age Jan 19, 2023
8eb2594
Merge pull request #892 from ProjectOpenSea/1.2-coverage-reentrant
0age Jan 19, 2023
976956d
add some contracts to codecov ignore
0age Jan 19, 2023
2f945de
add test agg missing item amounts
Jan 20, 2023
2e6e046
rm value
Jan 20, 2023
50f4e76
Merge pull request #894 from ProjectOpenSea/1.2-missing-item-amount
stephankmin Jan 20, 2023
411cae9
add agg missing item amounts test
Jan 20, 2023
92a432a
add agg consideration items test
Jan 20, 2023
08a3b58
Merge pull request #896 from ProjectOpenSea/1.2-forge-missing-item-am…
0age Jan 20, 2023
90be1e2
don't skip ref
Jan 20, 2023
87cc06f
add test for supplying criteria proof for collection-wide criteria item
Jan 20, 2023
506ad1a
lint
Jan 20, 2023
ff80f9b
Merge pull request #897 from ProjectOpenSea/1.2-hh-invalid-proof
stephankmin Jan 20, 2023
94655db
update signBulkOrder to take in extraCheap param, add test
Jan 20, 2023
9c87826
Merge pull request #898 from ProjectOpenSea/1.2-compact-bulk-signature
stephankmin Jan 20, 2023
984adbd
add remaining coverage tests
Jan 20, 2023
5a71304
Merge pull request #899 from ProjectOpenSea/1.2-branch-coverage
stephankmin Jan 20, 2023
18e301e
Document itemType
AdminStatusFinance Jan 21, 2023
148eccd
fix zero amount test
stephankmin Jan 23, 2023
5d4b346
add missing item amount test for basic order
stephankmin Jan 23, 2023
6e4fec5
Merge pull request #902 from ProjectOpenSea/1.2-lowlevelhelpers
stephankmin Jan 23, 2023
772e934
use higher versions for contracts not needed in reference contracts
0age Jan 23, 2023
a6195c0
bump PointerLibraries back down
0age Jan 23, 2023
a1f3daa
Merge pull request #903 from ProjectOpenSea/1.2-version-fix
0age Jan 23, 2023
4de1050
fix some typos
0age Jan 24, 2023
73d4530
Merge pull request #904 from ProjectOpenSea/1.2-typos
0age Jan 24, 2023
e6a6802
remove unused imports
0age Jan 24, 2023
7236194
remove version bump that snuck in
0age Jan 24, 2023
2f8e737
a few more nits
0age Jan 24, 2023
5320bdb
one more unused import
0age Jan 24, 2023
049828e
Merge pull request #905 from ProjectOpenSea/1.2-unused-imports
0age Jan 24, 2023
bee9fb4
docs: clarify what `size` means in `_encodeBytes`
hrkrshnn Jan 24, 2023
aad1e8f
Code4rena finding: Using XOR (`^`) and OR (`|`) bitwise equivalents
JustDravee Jan 24, 2023
69a6bba
Code4rena gas finding: Shift left by 5 instead of multiplying by 32
JustDravee Jan 24, 2023
31680ac
Merge pull request #908 from JustDravee/1.2-gas-xor-or
0age Jan 24, 2023
32d5cc7
Merge pull request #906 from hrkrshnn/abi-encode-bytes
0age Jan 24, 2023
21a89f4
Merge pull request #909 from JustDravee/1.2-gas-shift-left-5-vs-32
0age Jan 24, 2023
8e3424e
Merge pull request #901 from AdminStatusFinance/patch-1
0age Jan 24, 2023
c07e275
Code4rena gas finding: Using a positive conditional flow to save a NO…
JustDravee Jan 24, 2023
b5d838d
Code4rena gas finding: Optimized operations
JustDravee Jan 24, 2023
1a92152
Code4rena gas finding: Swap conditions for a better happy path
JustDravee Jan 24, 2023
576a897
Code4rena gas finding: Pre-decrements cost less than post-decrements
JustDravee Jan 24, 2023
d7c6c78
Adding Dravee as a contributoooooor
JustDravee Jan 24, 2023
6d64fe0
Merge pull request #910 from JustDravee/1.2-gas-saveNOT
0age Jan 24, 2023
977f7ec
Merge pull request #911 from JustDravee/1.2-gas-lggt-vs-eqeq
0age Jan 24, 2023
8c9d761
Merge pull request #914 from JustDravee/1.2
0age Jan 24, 2023
a2eb7dd
Merge pull request #913 from JustDravee/1.2-pre-decrement
0age Jan 24, 2023
97caada
Merge pull request #912 from JustDravee/1.2-gas-happy-path
0age Jan 24, 2023
035f4ea
add basic order fulfiller test
stephankmin Jan 24, 2023
1b35efd
rm hardhat console
stephankmin Jan 24, 2023
0c29270
Merge pull request #915 from ProjectOpenSea/1.2-basicorderfulfiller
stephankmin Jan 24, 2023
7da83ce
compile optimized when running forge coverage
stephankmin Jan 24, 2023
07c81d9
update readme
stephankmin Jan 24, 2023
058819d
rm precomile and update readme
stephankmin Jan 24, 2023
f87e4a3
update readme w running coverage
stephankmin Jan 24, 2023
fa98428
readme
stephankmin Jan 24, 2023
f2fbca7
add logic for conditional deployment
stephankmin Jan 24, 2023
ec45ac7
Merge pull request #916 from ProjectOpenSea/1.2-workflow
stephankmin Jan 24, 2023
a75bd69
add test for inexact fraction
stephankmin Jan 24, 2023
d7f0052
update test for missing consideration item amount
stephankmin Jan 24, 2023
d29871e
fix test
stephankmin Jan 24, 2023
28f33c7
Merge pull request #917 from ProjectOpenSea/1.2-amountderiver
stephankmin Jan 24, 2023
8c0348a
fix orderHashes encoding and add some tests
0age Jan 24, 2023
5370554
use pure fn visibility
0age Jan 24, 2023
3f1a3b2
Merge pull request #918 from ProjectOpenSea/1.2-order-hashes-encoding
0age Jan 24, 2023
1fd515f
bump a dependency
0age Jan 25, 2023
b877c18
Merge pull request #919 from ProjectOpenSea/bump-dep
0age Jan 25, 2023
0191cda
replace ether with native token
Jan 25, 2023
3247bc8
clean up a few more instances of ETH
Jan 25, 2023
0471352
more ETH cleanup
Jan 25, 2023
fddf77f
use named constants
Jan 25, 2023
065e8ee
more QA and remove imports from library
Jan 25, 2023
3321c4e
use plural
Jan 25, 2023
2fe3291
rename almostoneword
Jan 25, 2023
a06b626
Update contracts/interfaces/ConsiderationEventsAndErrors.sol
0age Jan 25, 2023
258f4b0
Update contracts/zones/PausableZone.sol
0age Jan 25, 2023
8dc6268
Update reference/lib/ReferenceBasicOrderFulfiller.sol
0age Jan 25, 2023
75bc3e1
critical sev grammatical issue fix
Jan 25, 2023
2c9161e
use universal constants in typehashdirectory
Jan 25, 2023
700859f
Merge pull request #921 from ProjectOpenSea/dan/2023/01/replace-eth-w…
0age Jan 25, 2023
3ea454e
Merge pull request #922 from ProjectOpenSea/dan/2023/01/use-named-con…
0age Jan 25, 2023
b6ac15b
fix merge conflict
Jan 25, 2023
c2ff839
Merge pull request #923 from ProjectOpenSea/dan/2023/01/rename-almost…
0age Jan 25, 2023
aed336b
additional QA tasks
Jan 25, 2023
bea0416
move files, clean up imports
stephankmin Jan 25, 2023
8dbca74
fix typo
stephankmin Jan 25, 2023
c2dd7cb
bump
stephankmin Jan 25, 2023
5898966
Merge branch '1.2' into 1.2-ordervalidator
stephankmin Jan 25, 2023
451a02f
Merge pull request #925 from ProjectOpenSea/1.2-ordervalidator
stephankmin Jan 25, 2023
c10f936
Update contracts/interfaces/ContractOffererInterface.sol
DJViau Jan 26, 2023
9fc3f83
Update contracts/interfaces/ContractOffererInterface.sol
DJViau Jan 26, 2023
0036ced
Merge branch '1.2' of github.com:ProjectOpenSea/seaport into dan/2023…
Jan 26, 2023
3bee9b9
Merge branch 'dan/2023/01/more-qa-tasks' of github.com:ProjectOpenSea…
Jan 26, 2023
1fded91
change previeworder natspec description
Jan 26, 2023
29bd45a
tweak revert comment
Jan 26, 2023
08a89e4
name the params in the token interfaces
Jan 26, 2023
ebea4e9
more comment fine tuning
Jan 26, 2023
4751777
add more detail to previeworder natspec
Jan 26, 2023
7f8dbdc
Merge pull request #924 from ProjectOpenSea/dan/2023/01/more-qa-tasks
0age Jan 26, 2023
6055c76
lint
0age Jan 26, 2023
46c6c51
Merge pull request #926 from ProjectOpenSea/1.2-lint
0age Jan 26, 2023
181dae5
update profile
0age Jan 26, 2023
da90725
try efficient fulfillBasicOrder
0age Jan 26, 2023
dff0f33
it compiles on my machine
Jan 26, 2023
c452cee
cleanup
Jan 26, 2023
bbad017
do reference imports
Jan 26, 2023
e974944
Fix Typo
Karthik-Gupta Jan 26, 2023
1c2bb04
do token transferrer constants
Jan 26, 2023
12ae6bb
do conduit constants
Jan 26, 2023
6fbad0d
add transfer tests
stephankmin Jan 26, 2023
3207f7e
do consideration errors
Jan 26, 2023
d67eb64
clean up tests
stephankmin Jan 26, 2023
f247570
do various
Jan 26, 2023
23c61d3
do pointer libraries
Jan 26, 2023
ed1c43d
Merge branch '1.2' into 1.2-tokentransferrer
stephankmin Jan 26, 2023
75c481d
Merge branch '1.2' of github.com:ProjectOpenSea/seaport into dan/2023…
Jan 26, 2023
9e8b8c5
update reference, interfaces, and profile
0age Jan 26, 2023
fc293fd
Merge pull request #929 from ProjectOpenSea/1.2-tokentransferrer
stephankmin Jan 26, 2023
a9e9c80
re-run profile
0age Jan 26, 2023
0c4f3f3
split our error constants
Jan 26, 2023
ea04c57
Merge pull request #930 from ProjectOpenSea/dan/2023/01/clean-up-glob…
0age Jan 26, 2023
9b630a2
Merge pull request #928 from Karthik-Gupta/patch-1
0age Jan 26, 2023
b1c600a
weird merge fix
Jan 27, 2023
8dda9bf
further merge irregularity
Jan 27, 2023
ad8a230
clean up global imports in tests
Jan 27, 2023
80881d1
some light cleanup on consideration constants
Jan 27, 2023
0c59c71
a bit more cleanup
Jan 27, 2023
381b178
clean up token transferrer constants
Jan 27, 2023
4baf1d6
decimal to hex for consistency
Jan 27, 2023
fb4b4b9
Merge pull request #932 from ProjectOpenSea/dan/2023/01/additional-im…
0age Jan 27, 2023
6636073
Merge pull request #927 from ProjectOpenSea/1.2-last-minute-gas-optim…
0age Jan 27, 2023
7ae0e33
inline some assembly on basic order fulfillment
0age Jan 27, 2023
d214681
add test contracts
stephankmin Jan 27, 2023
745cf83
document two contract order edge cases
Jan 27, 2023
e4038c8
use fixed calldata offsets in other places
0age Jan 27, 2023
49ce62a
move _transferIndividual into basic, more fixed cd offsets & inlining
0age Jan 27, 2023
f866bd0
Merge pull request #933 from ProjectOpenSea/1.2-small-gas-opt
0age Jan 27, 2023
bdab432
remove koda reference
Jan 27, 2023
b1a29e5
Merge pull request #934 from ProjectOpenSea/dan/2023/01/document-cont…
0age Jan 27, 2023
2ccdce1
remove unused imports
Jan 27, 2023
53265e9
address comment from issue 117
0age Jan 27, 2023
bb31f86
actually address the issue lol
0age Jan 27, 2023
e034bab
address issue #92
0age Jan 27, 2023
80bba4d
clean up unused imports and alphabetize in reference
Jan 27, 2023
2419d25
address issue #79
0age Jan 27, 2023
516a519
import constants
0age Jan 27, 2023
2fe41ac
import one more missing constant
0age Jan 27, 2023
716dacc
Merge pull request #935 from ProjectOpenSea/1.2-final-spearbit-comments
0age Jan 27, 2023
10ca2d8
add lowlevelhelpers test
stephankmin Jan 27, 2023
fd37c7e
clean up test imports
Jan 27, 2023
da2ea38
add activate
stephankmin Jan 27, 2023
3fb0ff7
alphabetize optimized
Jan 27, 2023
06eb02f
Merge pull request #936 from ProjectOpenSea/dan/2023/01/remove-unused…
0age Jan 27, 2023
a1e10e1
Merge branch '1.2' into 1.2-lowlevelhelpers
0age Jan 27, 2023
f7004de
Merge pull request #937 from ProjectOpenSea/1.2-lowlevelhelpers
0age Jan 27, 2023
c68c8de
clear old snapshots, add fresh one
0age Jan 27, 2023
17641f2
run linter
0age Jan 27, 2023
0e73754
pin solidity version
0age Jan 27, 2023
4e01a53
adhere to 80-char line limit and strip prettier-ignore
0age Jan 27, 2023
1830700
use shorter constant name
0age Jan 27, 2023
2a69a90
update README & LICENSE year
0age Jan 27, 2023
f630a1f
update contributors
0age Jan 27, 2023
de4c646
Merge pull request #938 from ProjectOpenSea/1.2-snapshot
0age Jan 27, 2023
4b2c048
Merge pull request #939 from ProjectOpenSea/1.2
0age Jan 28, 2023
83b08bf
add legacy interfaces
jameswenzel Jan 28, 2023
098c81a
fix basic order fulfiller test
stephankmin Jan 30, 2023
8dd4386
increase size of revert
stephankmin Jan 30, 2023
a1a9486
Merge pull request #941 from ProjectOpenSea/legacy-interfaces
0age Jan 30, 2023
fc9cdcc
Merge pull request #942 from ProjectOpenSea/1.2-basicorderfulfiller
0age Jan 30, 2023
6aba8e4
prevent dirty upper bits on basic order addrs & etc
0age Jan 30, 2023
9f3ebda
add missing import
0age Jan 30, 2023
c5a69e9
add invalid time test
stephankmin Jan 30, 2023
32c026b
update gas report
0age Jan 30, 2023
e021bd9
Merge pull request #943 from ProjectOpenSea/1.2-tiny-tweaks
0age Jan 30, 2023
146b5cc
Merge pull request #944 from ProjectOpenSea/main
0age Jan 30, 2023
4c29d26
add missing orig consideration items test
stephankmin Jan 30, 2023
374278b
include additional recipients in dirty upper bits check
0age Jan 30, 2023
8fb16dc
Merge pull request #945 from ProjectOpenSea/1.2-forgetests
0age Jan 30, 2023
c3c314b
update gas report and fix imports
0age Jan 30, 2023
c0fd74b
Merge pull request #946 from ProjectOpenSea/1.2-last-tweaks-cont
0age Jan 31, 2023
e819b8e
Merge pull request #947 from ProjectOpenSea/main
0age Jan 31, 2023
e257fd5
revise a few comments
0age Jan 31, 2023
6c54969
Merge pull request #948 from ProjectOpenSea/update-comment
0age Jan 31, 2023
908adbf
Merge pull request #949 from ProjectOpenSea/main
0age Jan 31, 2023
f58c57a
inc revert size for coverage
stephankmin Jan 31, 2023
f822231
Merge pull request #951 from ProjectOpenSea/seaport-1.2
0age Jan 31, 2023
e8307db
add useConduit
stephankmin Jan 31, 2023
528d58c
Merge branch 'main' into 1.2-morecoverage
stephankmin Jan 31, 2023
9b05e6e
rm unused variables
stephankmin Jan 31, 2023
3358ef7
use conduitkeyone for additional recipients
stephankmin Jan 31, 2023
187a71d
test against optimized
stephankmin Jan 31, 2023
07301b7
add test sell one wildcard
stephankmin Jan 31, 2023
2ba02b7
Merge pull request #952 from ProjectOpenSea/1.2-morecoverage
0age Jan 31, 2023
4e48247
add wildcard consideration test
stephankmin Jan 31, 2023
c4a5d00
add reentrancy test for efficient fulfill basic
stephankmin Jan 31, 2023
3435a17
add bulk sig helper functions
stephankmin Feb 1, 2023
672b453
bump
stephankmin Feb 1, 2023
d646132
first stab
jameswenzel Feb 1, 2023
b0f312e
rsv
jameswenzel Feb 1, 2023
16319c0
add compact bulk signatures
jameswenzel Feb 1, 2023
ea84202
add comments
jameswenzel Feb 1, 2023
fcb3288
add sparse signature generation and fuzz test
jameswenzel Feb 1, 2023
040c479
add canonical 1.2 deployment address and instructions
0age Feb 1, 2023
e3be2d4
update function signatures
0age Feb 1, 2023
d54c22d
Merge pull request #953 from ProjectOpenSea/deployment-info-update
0age Feb 1, 2023
e8c3f4b
Merge branch 'main' into 1.2-bulksigs
stephankmin Feb 1, 2023
9ebae1c
Merge pull request #954 from ProjectOpenSea/1.2-bulksigs
0age Feb 1, 2023
ca465ce
add test for dirty bits
stephankmin Feb 1, 2023
a93c243
Merge branch 'main' into 1.2-dirtybits
stephankmin Feb 1, 2023
e2ec377
add basic efficient eth to 721 test
stephankmin Feb 1, 2023
cf4ea07
add a test for a bulk signature with an out of bounds index
Feb 1, 2023
0ee7f5b
minor natspec adjustments
0age Feb 1, 2023
db30187
Merge pull request #956 from ProjectOpenSea/1.2-dirtybits
0age Feb 1, 2023
9762f59
Merge pull request #955 from ProjectOpenSea/bulk-signature-tests
0age Feb 1, 2023
3d7bbe8
Merge pull request #957 from ProjectOpenSea/main
0age Feb 1, 2023
4046e03
add one last test
0age Feb 1, 2023
c78e83d
Merge pull request #959 from ProjectOpenSea/one-last-test
0age Feb 1, 2023
001a347
Merge pull request #960 from ProjectOpenSea/main
0age Feb 1, 2023
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
8 changes: 8 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
node_modules
.eslintrc*
artifacts
cache
constants
coverage
lib/murky
lib/openzeppelin-contracts
57 changes: 57 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
module.exports = {
env: {
browser: false,
es2021: true,
mocha: true,
node: true,
},
plugins: ["@typescript-eslint", "import"],
extends: [
"standard",
"plugin:prettier/recommended",
"eslint:recommended",
"plugin:import/recommended",
"plugin:import/typescript",
],
parser: "@typescript-eslint/parser",
parserOptions: {
ecmaVersion: 12,
project: "./tsconfig.json",
},
rules: {
"@typescript-eslint/consistent-type-imports": "error",
"@typescript-eslint/prefer-nullish-coalescing": "error",
camelcase: [
"error",
{ allow: ["Conduit__factory", "EIP1271Wallet__factory"] },
],
"import/order": [
"error",
{
alphabetize: {
order: "asc",
},
groups: [
"object",
["builtin", "external"],
"parent",
"sibling",
"index",
"type",
],
"newlines-between": "always",
},
],
"object-shorthand": "error",
"prefer-const": "error",
"sort-imports": ["error", { ignoreDeclarationSort: true }],
},
overrides: [
{
files: ["test/**/*.spec.ts"],
rules: {
"no-unused-expressions": "off",
},
},
],
};
Loading