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/q2 add state change event #597

Open
wants to merge 18 commits into
base: main
Choose a base branch
from
Open

Feat/q2 add state change event #597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7a58f4b
Init Mintra update
hexlivelive Nov 20, 2023
3b83ff1
Add ability to update marketplace fee
hexlivelive Nov 20, 2023
4edc98a
Remove erc2271
hexlivelive Nov 21, 2023
311d13d
Add ability to add or update a mintra native royalty
hexlivelive Nov 22, 2023
0e7a5bf
Fix issue with payout. Start with some foundry tests
hexlivelive Nov 22, 2023
2bd180a
Remove some not needed tests
hexlivelive Nov 24, 2023
cae9a34
All tests passing
hexlivelive Nov 28, 2023
ee1311d
Code coverage to 100%. Removed not needed import. Removed indexed att…
hexlivelive Nov 29, 2023
5fb9cbb
Updated Events. Changed the Names of overridden events because the ab…
hexlivelive Dec 1, 2023
8e35ee2
Fix spelling error on event name
hexlivelive Dec 4, 2023
689ed9e
Merge pull request #1 from thirdweb-dev/main
hexlivelive Dec 7, 2023
4761aec
Added bulk but method.
hexlivelive Dec 26, 2023
35cf993
Update how funds are transferred. Start getting the tests to pass for…
hexlivelive Dec 31, 2023
4032d7b
Completed updating all tests to use the bulk buy function
hexlivelive Jan 1, 2024
b62b5ed
added some more tests for the bulk function
hexlivelive Jan 2, 2024
96f014f
Add a simple fuzz test
hexlivelive Jan 2, 2024
226d8dd
Q1 - Rename contract to a more accurate name
hexlivelive Jan 5, 2024
4e88343
Add platformfee event. Remove not needed files
hexlivelive Jan 7, 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
4 changes: 4 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"solidity.packageDefaultDependenciesContractsDirectory": "src",
"solidity.packageDefaultDependenciesDirectory": "lib"
}
17 changes: 0 additions & 17 deletions contracts/prebuilts/marketplace/IMarketplace.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,23 +159,6 @@ interface IDirectListings {
uint256 _pricePerTokenInCurrency
) external;

/**
* @notice Buy NFTs from a listing.
*
* @param _listingId The ID of the listing to update.
* @param _buyFor The recipient of the NFTs being bought.
* @param _quantity The quantity of NFTs to buy from the listing.
* @param _currency The currency to use to pay for NFTs.
* @param _expectedTotalPrice The expected total price to pay for the NFTs being bought.
*/
function buyFromListing(
uint256 _listingId,
address _buyFor,
uint256 _quantity,
address _currency,
uint256 _expectedTotalPrice
) external payable;

/**
* @notice Returns the total number of listings created.
* @dev At any point, the return value is the ID of the next listing created.
Expand Down
Loading