Skip to content

Buy It Now + Starting price #21

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

Open
Nokhal wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Buy It Now + Starting price #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5486a00
Buy It Now + Starting price
Nokhal Jan 10, 2024
0f461e8
Adding deprecation revert as well as preventing self outbid
Nokhal Jan 12, 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
14 changes: 7 additions & 7 deletions contracts/facets/GBMFacet.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ contract GBMFacet is IGBM, IERC1155TokenReceiver, IERC721TokenReceiver, Modifier
uint256 _tokenID,
uint256 _amount,
bytes memory _signature
) external {
) external virtual {
bytes32 messageHash = keccak256(abi.encodePacked(msg.sender, _auctionID, _bidAmount, _highestBid));
require(LibSignature.isValid(messageHash, _signature, s.backendPubKey), "bid: Invalid signature");

Expand Down Expand Up @@ -118,7 +118,7 @@ contract GBMFacet is IGBM, IERC1155TokenReceiver, IERC721TokenReceiver, Modifier
}
}

function batchClaim(uint256[] memory _auctionIDs) external {
function batchClaim(uint256[] memory _auctionIDs) external virtual {
for (uint256 index = 0; index < _auctionIDs.length; index++) {
claim(_auctionIDs[index]);
}
Expand All @@ -127,7 +127,7 @@ contract GBMFacet is IGBM, IERC1155TokenReceiver, IERC721TokenReceiver, Modifier
/// @notice Attribute a token to the winner of the auction and distribute the proceeds to the owner of this contract.
/// throw if bidding is disabled or if the auction is not finished.
/// @param _auctionID The auctionId of the auction to complete
function claim(uint256 _auctionID) public {
function claim(uint256 _auctionID) public virtual {
Auction storage a = s.auctions[_auctionID];
if (a.owner == address(0)) revert("NoAuction");
if (a.claimed == true) revert("AuctionClaimed");
Expand Down Expand Up @@ -212,7 +212,7 @@ contract GBMFacet is IGBM, IERC1155TokenReceiver, IERC721TokenReceiver, Modifier
InitiatorInfo calldata _info,
address _tokenContract,
uint256 _auctionPresetID
) public returns (uint256) {
) public virtual returns (uint256) {
if (s.auctionPresets[_auctionPresetID].incMin < 1) revert("UndefinedPreset");
uint256 id = _info.tokenID;
uint256 amount = _info.tokenAmount;
Expand Down Expand Up @@ -254,7 +254,7 @@ contract GBMFacet is IGBM, IERC1155TokenReceiver, IERC721TokenReceiver, Modifier
InitiatorInfo[] calldata _info,
address[] calldata _tokenContracts,
uint256[] calldata _auctionPresetIDs
) external {
) external virtual {
for (uint256 i = 0; i < _info.length; i++) {
createAuction(_info[i], _tokenContracts[i], _auctionPresetIDs[i]);
}
Expand Down Expand Up @@ -338,7 +338,7 @@ contract GBMFacet is IGBM, IERC1155TokenReceiver, IERC721TokenReceiver, Modifier
/// @notice Seller can cancel an auction during the cancellation time
/// Throw if the token owner is not the caller of the function
/// @param _auctionID The auctionId of the auction to cancel
function cancelAuction(uint256 _auctionID) public {
function cancelAuction(uint256 _auctionID) public virtual {
Auction storage a = s.auctions[_auctionID];
//verify existence
if (a.owner == address(0)) revert("NoAuction");
Expand Down Expand Up @@ -405,7 +405,7 @@ contract GBMFacet is IGBM, IERC1155TokenReceiver, IERC721TokenReceiver, Modifier
uint256 _total,
address[] memory _royaltyRecipients,
uint256[] memory _royaltyShares
) internal returns (uint256 rem_) {
) internal virtual returns (uint256 rem_) {
//settle royalties if any
uint256 totalRoyalty = 0;
if (_royaltyRecipients.length > 0) {
Expand Down
Loading