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

Fix Marketplace mock Land contracts and test #1577

Closed
wants to merge 47 commits into from
Closed

Fix Marketplace mock Land contracts and test #1577

wants to merge 47 commits into from

Conversation

capedcrusader21
Copy link
Contributor

Description

  • added entire Land contract as mock in MarketPlace package

  • fixed failing test cases

atkinsonholly and others added 30 commits August 15, 2024 15:04
@atkinsonholly
add: bundle as AssetType
940c9a0
@atkinsonholly
fix: temp fix bundle any type
c79d1c4
@atkinsonholly
fix: typo in error TransferManager
d0e52b5
@atkinsonholly
add: note on bundle asset value
df9a0f7
@atkinsonholly
add: whitelist validation added for bundles
8f9343f
@atkinsonholly
fix: whitelist validation added for bundles
340240e
@atkinsonholly
add: bundle tests for fill and partial fill
28a797c
@atkinsonholly
add: test for ERC721 scenario + Bundle ERC20 reverse
09dcf9d
@atkinsonholly
add: WIP add QUADS so marketplace can batch transfer LANDs
343f908
@atkinsonholly
fix: yarn.lock
37cb523
@atkinsonholly
add: quad struct added to bundle
001ddf0
@atkinsonholly
fix: format
f0c9d3a
@atkinsonholly
add: hardhat config updated for land package compiler version
8a40524
@atkinsonholly
add: mock land contracts for testing Bundles with Quads
7c5e52d
@atkinsonholly
add: Bundles working with Quads
617f045
@atkinsonholly
add: update OZ contracts version to 5.0.2 to align with packages/land
5948325
@atkinsonholly
fix: update mocks for OZ contracts v5.0.2 and fix failing tests
42f9f36
@atkinsonholly
fix: format
f1e6e50
@atkinsonholly
add: update hardhat.config incl mocha object
56acf4b
@wojciech-turek
Marketplace fee whitelists
adc8af6
@wojciech-turek
Update documentation
d4d988f
@capedcrusader21
feat: added Bundle price distribution
f15020a
@capedcrusader21
feat: royalty distribution for quad
ea30199
@capedcrusader21
fix: royalty distribution for bundle
1ade4c6
@capedcrusader21
feat: added test with royalty on bundle
0082e5c
@capedcrusader21
fix: Marketplace contracts
b028fc4
@capedcrusader21
fix: access control tests
1d5d555
@capedcrusader21
feat: updated doc with Bundle info
961a996
@capedcrusader21
refactor: remove redundant import
e49d7cd
@capedcrusader21
feat: added upgrade scripts for marketplace contracts
ba5ed01
@capedcrusader21 capedcrusader21 requested a review from a team as a code owner August 22, 2024 09:21
@capedcrusader21 capedcrusader21 requested review from atkinsonholly and adjisb and removed request for a team August 22, 2024 09:21
@openzeppelin-code OpenZeppelin Code
Copy link

openzeppelin-code bot commented Aug 22, 2024 •
edited
Loading

Fix Marketplace mock Land contracts and test

Generated at commit: 7d7ce31d1e6cd079ac2cb38d31b807ed836c672b

🚨 Report Summary

Severity Level Results
Contracts Critical
High
Medium
Low
Note
Total		 2
1
0
7
30
40

For more details view the full report in OpenZeppelin Code Inspector

@capedcrusader21 capedcrusader21 requested review from atkinsonholly and wojciech-turek and removed request for atkinsonholly August 22, 2024 18:58
@capedcrusader21 capedcrusader21 changed the base branch from feat/marketplace-bundle-type to master August 27, 2024 12:36
@capedcrusader21 capedcrusader21 changed the base branch from master to feat/marketplace-bundle-type August 27, 2024 12:37
adjisb
adjisb reviewed Aug 29, 2024
View reviewed changes
Copy link
Contributor

@adjisb adjisb left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is completely necessary to add the whole land contract as a mock ?
I also think that we need to discuss the asset modifications.

@wojciech-turek
Copy link
Member

I don't like the whole land import and we should find a way how to avoid it.

@capedcrusader21 capedcrusader21 force-pushed the feat/marketplace-bundle-type branch 2 times, most recently from 375d1ee to 2a20690 Compare September 9, 2024 12:44
@capedcrusader21 capedcrusader21 deleted the fix/marketplace-mock-contracts-and-tests branch September 9, 2024 12:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adjisb adjisb adjisb left review comments

@wojciech-turek wojciech-turek Awaiting requested review from wojciech-turek

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@capedcrusader21 @wojciech-turek @adjisb @atkinsonholly