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

Allow NFT to be burned when number of offers is greater than 500 (part of NonFungibleTokensV1_2 amendment) #4346

Merged
merged 18 commits into from
Feb 2, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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: 2 additions & 2 deletions src/ripple/app/tx/impl/NFTokenBurn.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,12 @@ NFTokenBurn::doApply()
// Because the number of sell offers is likely to be less than
// the number of buy offers, we prioritize the deletion of sell
// offers in order to clean up sell offer directory
int const deletedSellOffers = nft::removeTokenOffersWithLimit(
std::size_t const deletedSellOffers = nft::removeTokenOffersWithLimit(
view(),
keylet::nft_sells(ctx_.tx[sfNFTokenID]),
maxDeletableTokenOfferEntries);

if (maxDeletableTokenOfferEntries - deletedSellOffers > 0)
if (maxDeletableTokenOfferEntries > deletedSellOffers)
intelliot marked this conversation as resolved.
Show resolved Hide resolved
{
nft::removeTokenOffersWithLimit(
view(),
Expand Down
6 changes: 3 additions & 3 deletions src/ripple/app/tx/impl/details/NFTokenUtils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -521,17 +521,17 @@ findTokenAndPage(
return std::nullopt;
}

int
std::size_t
removeTokenOffersWithLimit(
ApplyView& view,
Keylet const& directory,
int maxDeletableOffers)
std::size_t maxDeletableOffers)
{
if (maxDeletableOffers == 0)
return 0;

std::optional<std::uint64_t> pageIndex{0};
int deletedOffersCount = 0;
std::size_t deletedOffersCount = 0;

do
{
Expand Down
4 changes: 2 additions & 2 deletions src/ripple/app/tx/impl/details/NFTokenUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ constexpr std::uint16_t const flagTransferable = 0x0008;

/** Delete up to a specified number of offers from the specified token offer
* directory. */
int
std::size_t
removeTokenOffersWithLimit(
ApplyView& view,
Keylet const& directory,
int maxDeletableOffers);
std::size_t maxDeletableOffers);

/** Returns tesSUCCESS if NFToken has few enough offers that it can be burned */
TER
Expand Down
2 changes: 1 addition & 1 deletion src/ripple/protocol/Protocol.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ std::size_t constexpr maxDeletableDirEntries = 1000;
std::size_t constexpr maxTokenOfferCancelCount = 500;

/** The maximum number of offers in an offer directory for NFT to be burnable */
int constexpr maxDeletableTokenOfferEntries = 500;
std::size_t constexpr maxDeletableTokenOfferEntries = 500;

/** The maximum token transfer fee allowed.

Expand Down