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.3 #990

Draft
wants to merge 77 commits into
base: seaport-1.2
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
3222948
Merge pull request #958 from ProjectOpenSea/seaport-1.2
0age Feb 1, 2023
5a34035
Update .solcover.js
0age Feb 1, 2023
ba49fa6
readme: update deployed addresses
ryanio Feb 2, 2023
95212f3
Merge pull request #961 from ProjectOpenSea/ryan/deploy-1.2-across-ch…
0age Feb 2, 2023
ee295a3
add a test for index overflow with trees of different heights and ref…
Feb 2, 2023
9e145c0
fix stupid stupid bug
Feb 2, 2023
420687e
add a test that overflowing non-hits fail
Feb 2, 2023
c3c7227
fix bug
Feb 2, 2023
4f2210b
Merge pull request #962 from ProjectOpenSea/dan/2023/02/add-bulk-sig-…
0age Feb 2, 2023
06ad953
Bump http-cache-semantics from 4.1.0 to 4.1.1
dependabot[bot] Feb 4, 2023
11ab710
add SeaportRouter and tests
ryanio Dec 13, 2022
8a641c5
- only set reentrancy on main fn
ryanio Dec 16, 2022
418a6a1
test that seaport address can send ether to router contract
ryanio Dec 17, 2022
9d87b2d
remove fallback
ryanio Dec 17, 2022
2592433
fix lint warnings
ryanio Jan 4, 2023
7f5e6a2
optimization: use newAvailableOrders in place of availableOrders[i]
ryanio Jan 30, 2023
fbf805a
consolidate files into interface
ryanio Feb 5, 2023
206fd35
avoid stack too deep errors
ryanio Feb 7, 2023
20eefeb
remove unused constant
ryanio Feb 7, 2023
4ae2e23
skip router in ref tests
ryanio Feb 7, 2023
a3161e9
define empty memory vars instead of allocating arrays
ryanio Feb 7, 2023
0aadb03
add disclaimer that router only works for native consideration items
ryanio Feb 7, 2023
c873f2a
shorten comment to satisfy line length lint
ryanio Feb 8, 2023
59f6673
Merge pull request #966 from ProjectOpenSea/ryan/seaport-router
0age Feb 8, 2023
e99e1e3
Merge pull request #965 from ProjectOpenSea/dependabot/npm_and_yarn/h…
0age Feb 8, 2023
8a02c35
loop through orders again if restricted/contract present
0age Feb 13, 2023
91aed86
inline a memory read
0age Feb 13, 2023
2a19879
deal with stacc2thicc
0age Feb 13, 2023
cc9abe7
include updated gas report
0age Feb 13, 2023
1d7f2f9
Merge pull request #975 from ProjectOpenSea/second-loop-if-no-open
0age Feb 13, 2023
c687f0d
address compiler warning
0age Feb 13, 2023
fb93ce0
do not filter native token executions
0age Feb 14, 2023
84e7500
adjust tests accordingly
0age Feb 14, 2023
08c6618
remove only
0age Feb 14, 2023
6872214
fix lint issues
0age Feb 14, 2023
cddd085
update reference too
0age Feb 14, 2023
cbf8059
use ERC20 in place of Native on filtered on reference
0age Feb 14, 2023
8e6bb2b
Merge pull request #976 from ProjectOpenSea/no-skipping-native-token-…
0age Feb 14, 2023
73ec734
First commit
BCLeFevre Feb 14, 2023
a1051dc
Skip reference for now
BCLeFevre Feb 14, 2023
572489d
use big switch instead of typehash directory
0age Feb 14, 2023
9ad538d
update gas report
0age Feb 14, 2023
61d6d20
linting, cleanup, and a tiny refactor
Feb 14, 2023
89c9879
Merge pull request #980 from ProjectOpenSea/dan/2023/02/linting-etc-o…
BCLeFevre Feb 14, 2023
18bd267
Fix reference, rename test zone
BCLeFevre Feb 14, 2023
4b37cb3
Update contracts/lib/ConsiderationBase.sol
0age Feb 14, 2023
3695c90
Merge pull request #979 from ProjectOpenSea/1.3-typehash-optimization
0age Feb 14, 2023
b20d35e
update version to 1.3
0age Feb 14, 2023
e8ead7e
Merge pull request #982 from ProjectOpenSea/1.3-bump-version
0age Feb 14, 2023
8c54f89
move excess native token transfer to before post-execution checks
0age Feb 14, 2023
e3e791e
Merge pull request #983 from ProjectOpenSea/1.3-return-excess-native-…
0age Feb 14, 2023
84a6b12
Add failing test for 1.2->1.3
BCLeFevre Feb 14, 2023
bd335ca
Add switch based on version
BCLeFevre Feb 14, 2023
745ea67
refactor typehash lookup as while loop
0age Feb 14, 2023
c7ae394
add test (still need zone)
stephankmin Feb 14, 2023
436ce75
fix a constant
0age Feb 14, 2023
e1370ae
add zone, update abridged interfaces
stephankmin Feb 14, 2023
4c3a4de
Merge pull request #978 from ProjectOpenSea/ben/ZoneContractOrderVali…
0age Feb 14, 2023
6e6d006
Merge pull request #986 from ProjectOpenSea/1.3-typehash-while-loop
0age Feb 14, 2023
714cf8b
Merge branch '1.3' into stephan/1.3-forge-tests
stephankmin Feb 14, 2023
6bc735f
add seaport-sol
jameswenzel Feb 14, 2023
68fb478
test fulfillavailableorders with post-execution validation zone, add …
jameswenzel Feb 14, 2023
5129151
tweak comments
jameswenzel Feb 14, 2023
85f395a
Merge pull request #985 from ProjectOpenSea/james/fulfill-available-p…
0age Feb 14, 2023
718670a
Merge pull request #984 from ProjectOpenSea/1.3
0age Feb 14, 2023
28c657c
Merge pull request #987 from ProjectOpenSea/stephan/1.3-forge-tests
0age Feb 14, 2023
6560958
lint
0age Feb 14, 2023
ddea2c1
move TypehashDirectory to test/
0age Feb 14, 2023
47e5d84
reset gas profile
0age Feb 14, 2023
bbe5c77
bump package.json version
0age Feb 14, 2023
2560c03
Merge pull request #989 from ProjectOpenSea/1.3-final-cleanup
0age Feb 14, 2023
25c94ce
Use a ternary function for typehashes, replace for-break with functio…
d1ll0n Feb 15, 2023
ba151b7
Exit the loop -> Exit the function
d1ll0n Feb 15, 2023
ef24393
clean up a little more
0age Feb 15, 2023
059db17
Merge pull request #991 from ProjectOpenSea/typehash-lookup-readability
0age Feb 15, 2023
07ffaea
Merge pull request #992 from ProjectOpenSea/main
0age Feb 15, 2023
2b8103a
Add v1.3 deployment addresses
0age Feb 17, 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
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"commitHash": "374278b75e1acc08d85bfacef494b7cfe42fa2d9",
"commitHash": "ddea2c1285e31df6b46c36aaf72dbcff2d6e58a3",
"contractReports": {
"Conduit": {
"name": "Conduit",
"methods": [
{
"method": "execute",
"min": 77435,
"max": 2373103,
"avg": 483652,
"min": 77459,
"max": 2168532,
"avg": 449559,
"calls": 6
},
{
Expand All @@ -21,8 +21,8 @@
{
"method": "executeWithBatch1155",
"min": 97717,
"max": 361418,
"avg": 228764,
"max": 361430,
"avg": 228767,
"calls": 4
},
{
Expand Down Expand Up @@ -55,10 +55,10 @@
},
{
"method": "createConduit",
"min": 712802,
"min": 712826,
"max": 712970,
"avg": 712930,
"calls": 51
"avg": 712927,
"calls": 53
},
{
"method": "transferOwnership",
Expand All @@ -71,8 +71,8 @@
"method": "updateChannel",
"min": 34454,
"max": 121098,
"avg": 117184,
"calls": 69
"avg": 117294,
"calls": 71
}
],
"bytecodeSize": 12007,
Expand All @@ -85,7 +85,7 @@
"method": "createConduit",
"min": 226092,
"max": 231533,
"avg": 229598,
"avg": 229596,
"calls": 6
}
],
Expand Down Expand Up @@ -148,7 +148,7 @@
"method": "cancelOrders",
"min": null,
"max": null,
"avg": 65315,
"avg": 65339,
"calls": 1
}
],
Expand Down Expand Up @@ -195,30 +195,30 @@
},
{
"method": "createZone",
"min": null,
"max": null,
"avg": 1154314,
"min": 1154302,
"max": 1154314,
"avg": 1154312,
"calls": 31
},
{
"method": "executeMatchAdvancedOrders",
"min": null,
"max": null,
"avg": 288298,
"avg": 288785,
"calls": 2
},
{
"method": "executeMatchOrders",
"min": null,
"max": null,
"avg": 281862,
"avg": 282325,
"calls": 2
},
{
"method": "pause",
"min": 32851,
"min": 32875,
"max": 35006,
"avg": 33569,
"avg": 33585,
"calls": 3
},
{
Expand All @@ -237,14 +237,14 @@
"methods": [
{
"method": "prepare",
"min": 69404,
"max": 2350940,
"avg": 1171827,
"calls": 20
"min": 49267,
"max": 2351654,
"avg": 1061779,
"calls": 26
}
],
"bytecodeSize": 2459,
"deployedBytecodeSize": 2431
"bytecodeSize": 2726,
"deployedBytecodeSize": 2698
},
"Seaport": {
"name": "Seaport",
Expand All @@ -253,50 +253,50 @@
"method": "cancel",
"min": 41250,
"max": 58422,
"avg": 54035,
"avg": 54039,
"calls": 16
},
{
"method": "fulfillAdvancedOrder",
"min": 96312,
"max": 225169,
"avg": 159958,
"calls": 188
"min": 96288,
"max": 225181,
"avg": 159382,
"calls": 194
},
{
"method": "fulfillAvailableAdvancedOrders",
"min": 149979,
"max": 339949,
"avg": 207233,
"calls": 29
"min": 149626,
"max": 350749,
"avg": 214389,
"calls": 33
},
{
"method": "fulfillAvailableOrders",
"min": 165345,
"max": 216505,
"avg": 201935,
"min": 164998,
"max": 215740,
"avg": 201364,
"calls": 21
},
{
"method": "fulfillBasicOrder",
"min": 90639,
"max": 1621627,
"avg": 598708,
"avg": 598707,
"calls": 187
},
{
"method": "fulfillBasicOrder_efficient_6GL6yc",
"min": 90261,
"max": 111444,
"avg": 100853,
"max": 111456,
"avg": 100859,
"calls": 6
},
{
"method": "fulfillOrder",
"min": 119409,
"max": 225080,
"avg": 177756,
"calls": 105
"avg": 176772,
"calls": 108
},
{
"method": "incrementCounter",
Expand All @@ -307,37 +307,51 @@
},
{
"method": "matchAdvancedOrders",
"min": 180326,
"max": 299883,
"avg": 249683,
"min": 179574,
"max": 300213,
"avg": 248903,
"calls": 77
},
{
"method": "matchOrders",
"min": 158265,
"max": 349010,
"avg": 265283,
"min": 157474,
"max": 348243,
"avg": 264537,
"calls": 151
},
{
"method": "validate",
"min": 53201,
"max": 83886,
"avg": 73544,
"min": 53177,
"max": 83910,
"avg": 73542,
"calls": 29
}
],
"bytecodeSize": 26712,
"deployedBytecodeSize": 23553
"bytecodeSize": 26099,
"deployedBytecodeSize": 24374
},
"SeaportRouter": {
"name": "SeaportRouter",
"methods": [
{
"method": "fulfillAvailableAdvancedOrders",
"min": 183942,
"max": 311883,
"avg": 233578,
"calls": 6
}
],
"bytecodeSize": 6345,
"deployedBytecodeSize": 6158
},
"TestContractOfferer": {
"name": "TestContractOfferer",
"methods": [
{
"method": "activate",
"min": 201531,
"min": 201519,
"max": 246674,
"avg": 205514,
"avg": 205512,
"calls": 33
},
{
Expand Down Expand Up @@ -385,16 +399,16 @@
{
"method": "mint",
"min": 47235,
"max": 49915,
"avg": 49443,
"calls": 245
"max": 49903,
"avg": 49427,
"calls": 239
},
{
"method": "setApprovalForAll",
"min": 26102,
"max": 46002,
"avg": 45654,
"calls": 458
"avg": 45645,
"calls": 446
}
],
"bytecodeSize": 4173,
Expand All @@ -407,8 +421,8 @@
"method": "approve",
"min": 28881,
"max": 46245,
"avg": 45749,
"calls": 292
"avg": 45807,
"calls": 390
},
{
"method": "blockTransfer",
Expand All @@ -421,8 +435,8 @@
"method": "mint",
"min": 33994,
"max": 68458,
"avg": 67348,
"calls": 141
"avg": 67563,
"calls": 190
},
{
"method": "setNoReturnData",
Expand All @@ -442,15 +456,15 @@
"method": "mint",
"min": 51492,
"max": 68784,
"avg": 66201,
"calls": 307
"avg": 65745,
"calls": 282
},
{
"method": "setApprovalForAll",
"min": 26195,
"max": 46095,
"avg": 45560,
"calls": 522
"avg": 45506,
"calls": 474
}
],
"bytecodeSize": 5238,
Expand All @@ -461,9 +475,9 @@
"methods": [
{
"method": "activate",
"min": null,
"max": null,
"avg": 201567,
"min": 201543,
"max": 201567,
"avg": 201555,
"calls": 2
}
],
Expand All @@ -490,8 +504,8 @@
{
"method": "bulkTransfer",
"min": 77935,
"max": 1546854,
"avg": 673107,
"max": 1428982,
"avg": 633808,
"calls": 3
}
],
Expand Down
Loading