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.

Sign up for GitHub

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

Jump to bottom

[feat] Collection Offers v1.0 #125

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
+1,945 −0
Open

[feat] Collection Offers v1.0 #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
469faf1
[feat] Collection Offers v1.0
Jan 25, 2022
f943878
[feat] update for community review
Feb 9, 2022
78ce19a
Merge branch 'main' into collection-offers
Feb 9, 2022
e3cb5a3
snapshot
joshieDo Feb 9, 2022
b5bd260
no need for uint32 on createOffers
joshieDo Feb 9, 2022
ddb8b45
use uint32 only for storage
joshieDo Feb 9, 2022
65e8d93
_offerCount to save sloads
joshieDo Feb 11, 2022
bd2daaf
Merge branch 'main' into collection-offers
Feb 23, 2022
f4a66d3
Merge pull request #143 from joshieDo/changes
kulkarohan Feb 28, 2022
7c3d955
Merge branch 'collection-offers' of https://github.com/ourzora/v3 int…
Feb 28, 2022
1cfeb54
[fix] add gas limit
Feb 28, 2022
ebbebd4
[fix] events param id -> offerId
Feb 28, 2022
4e6b08a
test: add assertions when protocol fee is non-zero
almndbtr Mar 1, 2022
04f674b
Merge pull request #144 from almndbtr/collection-offers-nonzero-proto…
kulkarohan Mar 3, 2022
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
108 changes: 108 additions & 0 deletions .gas-snapshot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
AsksV1_1IntegrationTest:test_ERC20Integration() (gas: 163154)
AsksV1_1IntegrationTest:test_ETHIntegration() (gas: 97044)
AsksV1_1Test:testFail_CannotUpdateCanceledAsk() (gas: 108617)
AsksV1_1Test:testFail_CannotUpdateFilledAsk() (gas: 194330)
AsksV1_1Test:testFail_MustBeTokenOwnerOrOperator() (gas: 6195)
AsksV1_1Test:testGas_CreateAsk() (gas: 99858)
AsksV1_1Test:testRevert_AskMustBeActiveToFill() (gas: 101656)
AsksV1_1Test:testRevert_AskMustExistToCancel() (gas: 4214)
AsksV1_1Test:testRevert_FillAmountMustMatchAsk() (gas: 103127)
AsksV1_1Test:testRevert_FillCurrencyMustMatchAsk() (gas: 103105)
AsksV1_1Test:testRevert_FindersFeeBPSCannotExceed10000() (gas: 7168)
AsksV1_1Test:testRevert_MsgSenderMustBeApprovedToCancelAsk() (gas: 106135)
AsksV1_1Test:testRevert_MustApproveERC721TransferHelper() (gas: 0)
AsksV1_1Test:testRevert_OnlySellerCanSetAskPrice() (gas: 102058)
AsksV1_1Test:testRevert_SellerFundsRecipientCannotBeZeroAddress() (gas: 7130)
AsksV1_1Test:test_CancelAsk() (gas: 32056)
AsksV1_1Test:test_CreateAskAndCancelPreviousOwners() (gas: 188232)
AsksV1_1Test:test_CreateAskFromTokenOperator() (gas: 155484)
AsksV1_1Test:test_CreateAskFromTokenOwner() (gas: 102351)
AsksV1_1Test:test_FillAsk() (gas: 93781)
AsksV1_1Test:test_UpdateAskPrice() (gas: 107953)
CollectionOffersV1IntegrationTest:test_ETHIntegration() (gas: 116439)
CollectionOffersV1IntegrationTest:test_RefundOfferDecreaseToSeller() (gas: 181929)
CollectionOffersV1IntegrationTest:test_WithdrawOfferFromSeller() (gas: 167276)
CollectionOffersV1IntegrationTest:test_WithdrawOfferIncreaseFromSeller() (gas: 179761)
CollectionOffersV1Test:testGas_CreateFirstCollectionOffer() (gas: 166247)
CollectionOffersV1Test:testRevert_CancelOfferMustBeMaker() (gas: 169216)
CollectionOffersV1Test:testRevert_FillMinimumTooHigh() (gas: 347178)
CollectionOffersV1Test:testRevert_FindersFeeCannotExceed10000() (gas: 2557)
CollectionOffersV1Test:testRevert_MustOwnCollectionToken() (gas: 346343)
CollectionOffersV1Test:testRevert_UpdateFindersFeeMustBeRegistrar() (gas: 1903)
CollectionOffersV1Test:testRevert_UpdateOfferMustBeMaker() (gas: 346024)
CollectionOffersV1Test:test_CancelCollectionOffer() (gas: 63366)
CollectionOffersV1Test:test_CreateCeilingOffer() (gas: 234040)
CollectionOffersV1Test:test_CreateCollectionOffer() (gas: 173619)
CollectionOffersV1Test:test_CreateFloorOffer() (gas: 294780)
CollectionOffersV1Test:test_CreateMiddleOffer() (gas: 347766)
CollectionOffersV1Test:test_DecreaseCeilingInPlace() (gas: 360810)
CollectionOffersV1Test:test_DecreaseCeilingToFloor() (gas: 365325)
CollectionOffersV1Test:test_DecreaseCeilingToMiddle() (gas: 368476)
CollectionOffersV1Test:test_DecreaseFloor() (gas: 363994)
CollectionOffersV1Test:test_DecreaseMiddleInPlace() (gas: 360499)
CollectionOffersV1Test:test_DecreaseMiddleToFloor() (gas: 365223)
CollectionOffersV1Test:test_DecreaseMiddleToMiddle() (gas: 365457)
CollectionOffersV1Test:test_FillCollectionOffer() (gas: 371999)
CollectionOffersV1Test:test_IncreaseCeiling() (gas: 363767)
CollectionOffersV1Test:test_IncreaseFloorInPlace() (gas: 359793)
CollectionOffersV1Test:test_IncreaseFloorToMiddle() (gas: 366346)
CollectionOffersV1Test:test_IncreaseFloorToNewCeiling() (gas: 362857)
CollectionOffersV1Test:test_IncreaseMiddleInPlace() (gas: 358259)
CollectionOffersV1Test:test_IncreaseMiddleToCeiling() (gas: 361625)
CollectionOffersV1Test:test_IncreaseMiddleToMiddle() (gas: 364422)
CollectionOffersV1Test:test_UpdateFindersFee() (gas: 5132)
ERC1155TransferHelperTest:testFail_UserMustApproveTransferHelperToTransferBatch() (gas: 43369)
ERC1155TransferHelperTest:testFail_UserMustApproveTransferHelperToTransferSingle() (gas: 37478)
ERC1155TransferHelperTest:testRevert_UserMustApproveModuleToTransferBatch() (gas: 39598)
ERC1155TransferHelperTest:testRevert_UserMustApproveModuleToTransferSingle() (gas: 35446)
ERC1155TransferHelperTest:test_ERC1155TransferBatch() (gas: 85262)
ERC1155TransferHelperTest:test_ERC1155TransferSingle() (gas: 70091)
ERC20TransferHelperTest:testFail_UserMustApproveTransferHelper() (gas: 35193)
ERC20TransferHelperTest:testRevert_UserMustApproveModule() (gas: 32416)
ERC20TransferHelperTest:test_ERC20Transfer() (gas: 86097)
ERC721TransferHelperTest:testFail_UserMustApproveTransferHelper() (gas: 39044)
ERC721TransferHelperTest:testRevert_UserMustApproveModule() (gas: 34878)
ERC721TransferHelperTest:test_ERC721Transfer() (gas: 71495)
OffersV1IntegrationTest:test_ERC20Integration() (gas: 222124)
OffersV1IntegrationTest:test_ETHIntegration() (gas: 156154)
OffersV1Test:testFail_CannotCreateOfferWithInvalidFindersFeeBps() (gas: 2227)
OffersV1Test:testFail_CannotCreateOfferWithoutAttachingFunds() (gas: 2306)
OffersV1Test:testGas_CreateOffer() (gas: 145889)
OffersV1Test:testRevert_AcceptAmountMustMatchOffer() (gas: 151021)
OffersV1Test:testRevert_AcceptCurrencyMustMatchOffer() (gas: 151105)
OffersV1Test:testRevert_CannotCancelInactiveOffer() (gas: 154680)
OffersV1Test:testRevert_CannotFillInactiveOffer() (gas: 155082)
OffersV1Test:testRevert_CannotIncreaseOfferWithoutAttachingFunds() (gas: 149825)
OffersV1Test:testRevert_CannotUpdateInactiveOffer() (gas: 154485)
OffersV1Test:testRevert_CannotUpdateOfferWithPreviousAmount() (gas: 156741)
OffersV1Test:testRevert_OnlySellerCanCancelOffer() (gas: 148964)
OffersV1Test:testRevert_OnlySellerCanUpdateOffer() (gas: 148729)
OffersV1Test:testRevert_OnlyTokenHolderCanFillOffer() (gas: 150339)
OffersV1Test:test_CancelNFTOffer() (gas: 106095)
OffersV1Test:test_CreateOffer() (gas: 148556)
OffersV1Test:test_DecreaseETHOffer() (gas: 164644)
OffersV1Test:test_DecreaseETHOfferWithERC20() (gas: 197810)
OffersV1Test:test_FillNFTOffer() (gas: 154124)
OffersV1Test:test_IncreaseETHOffer() (gas: 162310)
OffersV1Test:test_IncreaseETHOfferWithERC20() (gas: 197765)
ZoraModuleManagerTest:testFail_CannotApproveModuleNotRegistered() (gas: 4441)
ZoraModuleManagerTest:testRevert_CannotSetRegistrarToAddressZero() (gas: 5088)
ZoraModuleManagerTest:testRevert_ModuleAlreadyRegistered() (gas: 78514)
ZoraModuleManagerTest:test_RegisterModule() (gas: 74581)
ZoraModuleManagerTest:test_SetApproval() (gas: 101120)
ZoraModuleManagerTest:test_SetBatchApproval() (gas: 260206)
ZoraModuleManagerTest:test_SetRegistrar() (gas: 4166)
ZoraProtocolFeeSettingsTest:testRevert_AlreadyInitialized() (gas: 49106)
ZoraProtocolFeeSettingsTest:testRevert_InitOnlyOwner() (gas: 2078)
ZoraProtocolFeeSettingsTest:testRevert_OnlyMinter() (gas: 48369)
ZoraProtocolFeeSettingsTest:testRevert_SetMetadataOnlyOwner() (gas: 48084)
ZoraProtocolFeeSettingsTest:testRevert_SetOwnerOnlyOwner() (gas: 48040)
ZoraProtocolFeeSettingsTest:testRevert_SetParamsFeeRecipientMustBeNonZero() (gas: 97695)
ZoraProtocolFeeSettingsTest:testRevert_SetParamsMustBeLessThanHundred() (gas: 97728)
ZoraProtocolFeeSettingsTest:testRevert_SetParamsOnlyOwner() (gas: 97138)
ZoraProtocolFeeSettingsTest:test_Init() (gas: 48621)
ZoraProtocolFeeSettingsTest:test_MintToken() (gas: 97242)
ZoraProtocolFeeSettingsTest:test_ResetParamsToZero() (gas: 122751)
ZoraProtocolFeeSettingsTest:test_SetFeeParams() (gas: 122749)
ZoraProtocolFeeSettingsTest:test_SetMetadata() (gas: 50392)
ZoraProtocolFeeSettingsTest:test_SetOwner() (gas: 50391)
Loading