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

check EIP1271 signatures #635

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

check EIP1271 signatures #635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1edeae5
check EIP1271 signatures
kumaryash90 Apr 2, 2024
f3d42bf
remove state check1271 etc
kumaryash90 Apr 2, 2024
1912283
revert changes to Ownable
kumaryash90 Apr 2, 2024
84278e1
rename local variable
kumaryash90 Apr 2, 2024
fff8db4
use SignatureCheckerLib
kumaryash90 Apr 2, 2024
897e4bf
cleanup
kumaryash90 Apr 2, 2024
1a97413
cleanup
kumaryash90 Apr 2, 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
13 changes: 7 additions & 6 deletions contracts/prebuilts/unaudited/airdrop/Airdrop.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import "@solady/src/utils/MerkleProofLib.sol";
import "@solady/src/utils/ECDSA.sol";
import "@solady/src/utils/EIP712.sol";
import "@solady/src/utils/SafeTransferLib.sol";
import "@solady/src/utils/SignatureCheckerLib.sol";

import { Initializable } from "../../../extension/Initializable.sol";
import { Ownable } from "../../../extension/Ownable.sol";
Expand Down Expand Up @@ -485,8 +486,8 @@ contract Airdrop is EIP712, Initializable, Ownable {
);

bytes32 digest = _hashTypedData(structHash);
address recovered = digest.recover(signature);
return recovered == owner();

return SignatureCheckerLib.isValidSignatureNowCalldata(owner(), digest, signature);
}

function _verifyRequestSignerERC721(
Expand All @@ -499,8 +500,8 @@ contract Airdrop is EIP712, Initializable, Ownable {
);

bytes32 digest = _hashTypedData(structHash);
address recovered = digest.recover(signature);
return recovered == owner();

return SignatureCheckerLib.isValidSignatureNowCalldata(owner(), digest, signature);
}

function _verifyRequestSignerERC1155(
Expand All @@ -513,7 +514,7 @@ contract Airdrop is EIP712, Initializable, Ownable {
);

bytes32 digest = _hashTypedData(structHash);
address recovered = digest.recover(signature);
return recovered == owner();

return SignatureCheckerLib.isValidSignatureNowCalldata(owner(), digest, signature);
}
}
202 changes: 201 additions & 1 deletion src/test/airdrop/Airdrop.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,50 @@
// SPDX-License-Identifier: Apache-2.0
pragma solidity ^0.8.0;

import { Airdrop } from "contracts/prebuilts/unaudited/airdrop/Airdrop.sol";
import { Airdrop, ECDSA } from "contracts/prebuilts/unaudited/airdrop/Airdrop.sol";

// Test imports
import { TWProxy } from "contracts/infra/TWProxy.sol";
import "../utils/BaseTest.sol";

contract MockSmartWallet {
using ECDSA for bytes32;

bytes4 private constant EIP1271_MAGIC_VALUE = 0x1626ba7e;
address private admin;

constructor(address _admin) {
admin = _admin;
}

function isValidSignature(bytes32 _hash, bytes memory _signature) public view returns (bytes4) {
if (_hash.recover(_signature) == admin) {
return EIP1271_MAGIC_VALUE;
}
}

function onERC721Received(address, address, uint256, bytes memory) external pure returns (bytes4) {
return this.onERC721Received.selector;
}

function onERC1155Received(address, address, uint256, uint256, bytes memory) external pure returns (bytes4) {
return this.onERC1155Received.selector;
}

function onERC1155BatchReceived(
address,
address,
uint256[] memory,
uint256[] memory,
bytes memory
) external pure returns (bytes4) {
return this.onERC1155BatchReceived.selector;
}
}

contract AirdropTest is BaseTest {
Airdrop internal airdrop;
MockSmartWallet internal mockSmartWallet;

bytes32 private constant CONTENT_TYPEHASH_ERC20 =
keccak256("AirdropContentERC20(address recipient,uint256 amount)");
Expand Down Expand Up @@ -48,6 +84,8 @@ contract AirdropTest is BaseTest {
domainSeparator = keccak256(
abi.encode(TYPE_HASH_EIP712, NAME_HASH, VERSION_HASH, block.chainid, address(airdrop))
);

mockSmartWallet = new MockSmartWallet(signer);
}

function _getContentsERC20(uint256 length) internal pure returns (Airdrop.AirdropContentERC20[] memory contents) {
Expand Down Expand Up @@ -272,6 +310,62 @@ contract AirdropTest is BaseTest {
assertEq(erc20.balanceOf(signer), 100 ether - totalAmount);
}

function test_state_airdropSignature_erc20_eip1271() public {
// set mockSmartWallet as contract owner
vm.prank(signer);
airdrop.setOwner(address(mockSmartWallet));

// mint tokens to mockSmartWallet
erc20.mint(address(mockSmartWallet), 100 ether);
vm.prank(address(mockSmartWallet));
erc20.approve(address(airdrop), 100 ether);

Airdrop.AirdropContentERC20[] memory contents = _getContentsERC20(10);
Airdrop.AirdropRequestERC20 memory req = Airdrop.AirdropRequestERC20({
uid: bytes32(uint256(1)),
tokenAddress: address(erc20),
expirationTimestamp: 1000,
contents: contents
});

// sign with original EOA signer private key
bytes memory signature = _signReqERC20(req, privateKey);

airdrop.airdropERC20WithSignature(req, signature);

uint256 totalAmount;
for (uint256 i = 0; i < contents.length; i++) {
totalAmount += contents[i].amount;
assertEq(erc20.balanceOf(contents[i].recipient), contents[i].amount);
}
assertEq(erc20.balanceOf(address(mockSmartWallet)), 100 ether - totalAmount);
}

function test_revert_airdropSignature_erc20_eip1271_invalidSignature() public {
// set mockSmartWallet as contract owner
vm.prank(signer);
airdrop.setOwner(address(mockSmartWallet));

// mint tokens to mockSmartWallet
erc20.mint(address(mockSmartWallet), 100 ether);
vm.prank(address(mockSmartWallet));
erc20.approve(address(airdrop), 100 ether);

Airdrop.AirdropContentERC20[] memory contents = _getContentsERC20(10);
Airdrop.AirdropRequestERC20 memory req = Airdrop.AirdropRequestERC20({
uid: bytes32(uint256(1)),
tokenAddress: address(erc20),
expirationTimestamp: 1000,
contents: contents
});

// sign with random private key
bytes memory signature = _signReqERC20(req, 123);

vm.expectRevert(abi.encodeWithSelector(Airdrop.AirdropRequestInvalidSigner.selector));
airdrop.airdropERC20WithSignature(req, signature);
}

function test_revert_airdropSignature_erc20_expired() public {
erc20.mint(signer, 100 ether);
vm.prank(signer);
Expand Down Expand Up @@ -490,6 +584,59 @@ contract AirdropTest is BaseTest {
}
}

function test_state_airdropSignature_erc721_eip1271() public {
// set mockSmartWallet as contract owner
vm.prank(signer);
airdrop.setOwner(address(mockSmartWallet));

// mint tokens to mockSmartWallet
erc721.mint(address(mockSmartWallet), 1000);
vm.prank(address(mockSmartWallet));
erc721.setApprovalForAll(address(airdrop), true);

Airdrop.AirdropContentERC721[] memory contents = _getContentsERC721(10);
Airdrop.AirdropRequestERC721 memory req = Airdrop.AirdropRequestERC721({
uid: bytes32(uint256(1)),
tokenAddress: address(erc721),
expirationTimestamp: 1000,
contents: contents
});

// sign with original EOA signer private key
bytes memory signature = _signReqERC721(req, privateKey);

airdrop.airdropERC721WithSignature(req, signature);

for (uint256 i = 0; i < contents.length; i++) {
assertEq(erc721.ownerOf(contents[i].tokenId), contents[i].recipient);
}
}

function test_revert_airdropSignature_erc721_eip1271_invalidSignature() public {
// set mockSmartWallet as contract owner
vm.prank(signer);
airdrop.setOwner(address(mockSmartWallet));

// mint tokens to mockSmartWallet
erc721.mint(address(mockSmartWallet), 1000);
vm.prank(address(mockSmartWallet));
erc721.setApprovalForAll(address(airdrop), true);

Airdrop.AirdropContentERC721[] memory contents = _getContentsERC721(10);
Airdrop.AirdropRequestERC721 memory req = Airdrop.AirdropRequestERC721({
uid: bytes32(uint256(1)),
tokenAddress: address(erc721),
expirationTimestamp: 1000,
contents: contents
});

// sign with random private key
bytes memory signature = _signReqERC721(req, 123);

vm.expectRevert(abi.encodeWithSelector(Airdrop.AirdropRequestInvalidSigner.selector));
airdrop.airdropERC721WithSignature(req, signature);
}

function test_revert_airdropSignature_erc721_expired() public {
erc721.mint(signer, 1000);
vm.prank(signer);
Expand Down Expand Up @@ -704,6 +851,59 @@ contract AirdropTest is BaseTest {
}
}

function test_state_airdropSignature_erc1155_eip1271() public {
// set mockSmartWallet as contract owner
vm.prank(signer);
airdrop.setOwner(address(mockSmartWallet));

// mint tokens to mockSmartWallet
erc1155.mint(address(mockSmartWallet), 0, 100 ether);
vm.prank(address(mockSmartWallet));
erc1155.setApprovalForAll(address(airdrop), true);

Airdrop.AirdropContentERC1155[] memory contents = _getContentsERC1155(10);
Airdrop.AirdropRequestERC1155 memory req = Airdrop.AirdropRequestERC1155({
uid: bytes32(uint256(1)),
tokenAddress: address(erc1155),
expirationTimestamp: 1000,
contents: contents
});

// sign with original EOA signer private key
bytes memory signature = _signReqERC1155(req, privateKey);

airdrop.airdropERC1155WithSignature(req, signature);

for (uint256 i = 0; i < contents.length; i++) {
assertEq(erc1155.balanceOf(contents[i].recipient, contents[i].tokenId), contents[i].amount);
}
}

function test_revert_airdropSignature_erc1155_eip1271_invalidSignature() public {
// set mockSmartWallet as contract owner
vm.prank(signer);
airdrop.setOwner(address(mockSmartWallet));

// mint tokens to mockSmartWallet
erc1155.mint(address(mockSmartWallet), 0, 100 ether);
vm.prank(address(mockSmartWallet));
erc1155.setApprovalForAll(address(airdrop), true);

Airdrop.AirdropContentERC1155[] memory contents = _getContentsERC1155(10);
Airdrop.AirdropRequestERC1155 memory req = Airdrop.AirdropRequestERC1155({
uid: bytes32(uint256(1)),
tokenAddress: address(erc1155),
expirationTimestamp: 1000,
contents: contents
});

// sign with random private key
bytes memory signature = _signReqERC1155(req, 123);

vm.expectRevert(abi.encodeWithSelector(Airdrop.AirdropRequestInvalidSigner.selector));
airdrop.airdropERC1155WithSignature(req, signature);
}

function test_revert_airdropSignature_erc115_expired() public {
erc1155.mint(signer, 0, 100 ether);
vm.prank(signer);
Expand Down
Loading