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

fix(story-badge): prevent signature replay in StoryBadgeNFT minting #182

Merged
merged 1 commit into from
Feb 12, 2025
Merged

fix(story-badge): prevent signature replay in StoryBadgeNFT minting #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion contracts/story-nft/StoryBadgeNFT.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ contract StoryBadgeNFT is IStoryBadgeNFT, BaseOrgStoryNFT, CachableNFT, ERC721Ho
$.usedSignatures[signature] = true;

// The given signature must be valid
bytes32 digest = keccak256(abi.encodePacked(msg.sender)).toEthSignedMessageHash();
bytes32 digest = keccak256(abi.encodePacked(msg.sender, address(this))).toEthSignedMessageHash();
if (!SignatureChecker.isValidSignatureNow($.signer, digest, signature))
revert StoryBadgeNFT__InvalidSignature();

Expand Down
20 changes: 10 additions & 10 deletions test/story-nft/StoryBadgeNFT.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ contract StoryBadgeNFTTest is BaseTest {
}

function test_StoryBadgeNFT_mint() public {
bytes memory signature = _signAddress(rootOrgStoryNftSignerSk, u.carl);
bytes memory signature = _signAddress(rootOrgStoryNftSignerSk, u.carl, address(rootOrgStoryNft));

uint256 totalSupplyBefore = rootOrgStoryNft.totalSupply();
vm.startPrank(u.carl);
Expand Down Expand Up @@ -195,7 +195,7 @@ contract StoryBadgeNFTTest is BaseTest {
vm.prank(rootOrgStoryNftOwner);
rootOrgStoryNft.setSigner(u.bob);

bytes memory signature = _signAddress(sk.bob, u.carl);
bytes memory signature = _signAddress(sk.bob, u.carl, address(rootOrgStoryNft));

vm.prank(u.carl);
rootOrgStoryNft.mint(u.carl, signature);
Expand All @@ -214,7 +214,7 @@ contract StoryBadgeNFTTest is BaseTest {
}

function test_StoryBadgeNFT_cachedMint() public {
bytes memory signature = _signAddress(rootOrgStoryNftSignerSk, u.alice);
bytes memory signature = _signAddress(rootOrgStoryNftSignerSk, u.alice, address(rootOrgStoryNft));
vm.startPrank(u.alice);
(uint256 tokenId, ) = rootOrgStoryNft.mint(u.alice, signature);
assertEq(rootOrgStoryNft.ownerOf(tokenId), u.alice); // minted directly
Expand All @@ -228,7 +228,7 @@ contract StoryBadgeNFTTest is BaseTest {
rootOrgStoryNft.setCacheMode(CachableNFT.CacheMode.Cache); // enable cache mode
vm.stopPrank();

signature = _signAddress(rootOrgStoryNftSignerSk, u.carl);
signature = _signAddress(rootOrgStoryNftSignerSk, u.carl, address(rootOrgStoryNft));
vm.startPrank(u.carl);
(tokenId, ) = rootOrgStoryNft.mint(u.carl, signature);
assertEq(rootOrgStoryNft.ownerOf(tokenId), u.carl); // minted from cache
Expand All @@ -239,7 +239,7 @@ contract StoryBadgeNFTTest is BaseTest {
rootOrgStoryNft.setCacheMode(CachableNFT.CacheMode.Passthrough); // disable cache mode
vm.stopPrank();

signature = _signAddress(rootOrgStoryNftSignerSk, u.bob);
signature = _signAddress(rootOrgStoryNftSignerSk, u.bob, address(rootOrgStoryNft));
vm.startPrank(u.bob);
(tokenId, ) = rootOrgStoryNft.mint(u.bob, signature);
assertEq(rootOrgStoryNft.ownerOf(tokenId), u.bob); // minted directly
Expand All @@ -252,7 +252,7 @@ contract StoryBadgeNFTTest is BaseTest {
vm.stopPrank();

vm.fee(20 gwei);
signature = _signAddress(rootOrgStoryNftSignerSk, u.dan);
signature = _signAddress(rootOrgStoryNftSignerSk, u.dan, address(rootOrgStoryNft));
vm.startPrank(u.dan);
(tokenId, ) = rootOrgStoryNft.mint(u.dan, signature);
assertEq(rootOrgStoryNft.ownerOf(tokenId), u.dan); // minted directly
Expand All @@ -261,7 +261,7 @@ contract StoryBadgeNFTTest is BaseTest {

vm.fee(200 gwei);
address eva = vm.addr(0x123456);
signature = _signAddress(rootOrgStoryNftSignerSk, eva);
signature = _signAddress(rootOrgStoryNftSignerSk, eva, address(rootOrgStoryNft));
vm.startPrank(eva);
(tokenId, ) = rootOrgStoryNft.mint(eva, signature);
assertEq(rootOrgStoryNft.ownerOf(tokenId), eva); // minted from cache
Expand All @@ -284,7 +284,7 @@ contract StoryBadgeNFTTest is BaseTest {
}

function test_StoryBadgeNFT_revert_mint_SignatureAlreadyUsed() public {
bytes memory signature = _signAddress(rootOrgStoryNftSignerSk, u.carl);
bytes memory signature = _signAddress(rootOrgStoryNftSignerSk, u.carl, address(rootOrgStoryNft));

vm.startPrank(u.carl);
rootOrgStoryNft.mint(u.carl, signature);
Expand All @@ -294,7 +294,7 @@ contract StoryBadgeNFTTest is BaseTest {
}

function test_StoryBadgeNFT_revert_mint_InvalidSignature() public {
bytes memory signature = _signAddress(sk.carl, u.carl);
bytes memory signature = _signAddress(sk.carl, u.carl, address(rootOrgStoryNft));

vm.startPrank(u.carl);
vm.expectRevert(IStoryBadgeNFT.StoryBadgeNFT__InvalidSignature.selector);
Expand All @@ -303,7 +303,7 @@ contract StoryBadgeNFTTest is BaseTest {
}

function test_StoryBadgeNFT_revert_TransferLocked() public {
bytes memory signature = _signAddress(rootOrgStoryNftSignerSk, u.carl);
bytes memory signature = _signAddress(rootOrgStoryNftSignerSk, u.carl, address(rootOrgStoryNft));

vm.startPrank(u.carl);
(uint256 tokenId, ) = rootOrgStoryNft.mint(u.carl, signature);
Expand Down
17 changes: 14 additions & 3 deletions test/utils/BaseTest.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,9 +512,20 @@ contract BaseTest is Test, DeployHelper {
signature = abi.encodePacked(r, s, v);
}

/// @dev Uses `signerSk` to sign `addr` and return the signature.
function _signAddress(uint256 signerSk, address addr) internal pure returns (bytes memory signature) {
bytes32 digest = keccak256(abi.encodePacked(addr)).toEthSignedMessageHash();
/// @dev Uses `signerSk` to sign `recipient` and return the signature.
function _signAddress(uint256 signerSk, address recipient) internal pure returns (bytes memory signature) {
bytes32 digest = keccak256(abi.encodePacked(recipient)).toEthSignedMessageHash();
(uint8 v, bytes32 r, bytes32 s) = vm.sign(signerSk, digest);
signature = abi.encodePacked(r, s, v);
}

/// @dev Uses `signerSk` to sign `recipient` and `badgeAddr` and return the signature.
function _signAddress(
uint256 signerSk,
address recipient,
address badgeAddr
) internal pure returns (bytes memory signature) {
bytes32 digest = keccak256(abi.encodePacked(recipient, badgeAddr)).toEthSignedMessageHash();
(uint8 v, bytes32 r, bytes32 s) = vm.sign(signerSk, digest);
signature = abi.encodePacked(r, s, v);
}
Expand Down
Loading