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

feat: Invalidate nonce #8

Merged
merged 3 commits into from
Feb 16, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
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
9 changes: 8 additions & 1 deletion src/NftReward.sol
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,16 @@ contract NftReward is Initializable, ERC721Upgradeable, OwnableUpgradeable, Paus
* @notice Upgrades contract to new implementation
* @param newImplementation New implementation address
*/

function _authorizeUpgrade(address newImplementation) internal override onlyOwner {}

/**
* @notice Invalidates nonce value to prevent mint request reusage
* @param _nonceValue Nonce value to invalidate
*/
function invalidateNonce(uint256 _nonceValue) external onlyOwner {
nonceRedeemed[_nonceValue] = true;
}

//====================
// Internal methods
//====================
Expand Down
44 changes: 44 additions & 0 deletions test/NftReward.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -527,4 +527,48 @@ contract NftRewardTest is Test {
// after
assertFalse(nftReward.paused());
}

function testInvalidateNonce_ShouldInvalidateNonce() public {
// prepare arbitrary data keys
bytes32[] memory keys = new bytes32[](1);
keys[0] = keccak256("GITHUB_ORGANIZATION_NAME");
// prepare arbitrary data values
string[] memory values = new string[](1);
values[0] = "ubiquity";
// prepare mint request
NftReward.MintRequest memory mintRequest = NftReward.MintRequest({
beneficiary: user1,
deadline: block.timestamp + 1,
keys: keys,
nonce: 1,
values: values
});
// get mint request digest which should be signed
bytes32 digest = nftReward.getMintRequestDigest(mintRequest);
// minter signs mint request digest
(uint8 v, bytes32 r, bytes32 s) = vm.sign(minterPrivateKey, digest);
// get minter's signature
bytes memory signature = abi.encodePacked(r, s, v);

uint tokenId = 0;

// before
vm.expectRevert();
nftReward.ownerOf(tokenId);
assertEq(nftReward.nonceRedeemed(1), false);
assertEq(nftReward.tokenDataKeyExists(keccak256("GITHUB_ORGANIZATION_NAME")), false);

// owner invalidates
vm.prank(owner);
nftReward.invalidateNonce(1);

// user try to mint
vm.prank(user1);
vm.expectRevert("Already minted");
nftReward.safeMint(mintRequest, signature);

// after
assertEq(nftReward.nonceRedeemed(1), true);
assertEq(nftReward.tokenIdCounter(), 0);
}
}