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

Exclude EIP-7587 precompile address space from being a message signer #179

Merged
merged 1 commit into from
Nov 11, 2024
Merged

Exclude EIP-7587 precompile address space from being a message signer #179

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
4 changes: 3 additions & 1 deletion src/EthereumVaultConnector.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ contract EthereumVaultConnector is Events, Errors, TransientStorage, IEVC {
string public constant name = "Ethereum Vault Connector";

uint160 internal constant ACCOUNT_ID_OFFSET = 8;
address internal constant EIP_7587_PRECOMPILES = 0x0000000000000000000000000000000000000100;
address internal constant COMMON_PREDEPLOYS = 0x4200000000000000000000000000000000000000;
bytes32 internal constant HASHED_NAME = keccak256(bytes(name));

Expand Down Expand Up @@ -1046,7 +1047,8 @@ contract EthereumVaultConnector is Events, Errors, TransientStorage, IEVC {
function isSignerValid(address signer) internal pure virtual returns (bool) {
// not valid if the signer address falls into any of the precompiles/predeploys
// addresses space (depends on the chain ID).
return !haveCommonOwnerInternal(signer, address(0)) && !haveCommonOwnerInternal(signer, COMMON_PREDEPLOYS);
return !haveCommonOwnerInternal(signer, address(0)) && !haveCommonOwnerInternal(signer, EIP_7587_PRECOMPILES)
&& !haveCommonOwnerInternal(signer, COMMON_PREDEPLOYS);
}

/// @notice Computes the permit hash for a given set of parameters.
Expand Down
62 changes: 37 additions & 25 deletions test/unit/EthereumVaultConnector/Permit.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ contract EthereumVaultConnectorWithFallback is EthereumVaultConnectorHarness {
}

contract PermitTest is Test {
address internal constant EIP_7587_PRECOMPILES = 0x0000000000000000000000000000000000000100;
address internal constant COMMON_PREDEPLOYS = 0x4200000000000000000000000000000000000000;
EthereumVaultConnectorWithFallback internal evc;
SignerECDSA internal signerECDSA;
Expand Down Expand Up @@ -217,8 +218,8 @@ contract PermitTest is Test {
data = abi.encode(keccak256(data));

vm.assume(
!evc.haveCommonOwner(alice, address(0)) && !evc.haveCommonOwner(alice, COMMON_PREDEPLOYS)
&& alice != address(evc)
!evc.haveCommonOwner(alice, address(0)) && !evc.haveCommonOwner(alice, EIP_7587_PRECOMPILES)
&& !evc.haveCommonOwner(alice, COMMON_PREDEPLOYS) && alice != address(evc)
);
vm.assume(msgSender != address(evc));
vm.assume(nonce > 0 && nonce < type(uint256).max);
Expand Down Expand Up @@ -268,7 +269,10 @@ contract PermitTest is Test {
data = abi.encode(keccak256(data));

vm.assume(msgSender != address(evc));
vm.assume(!evc.haveCommonOwner(alice, address(0)) && !evc.haveCommonOwner(alice, COMMON_PREDEPLOYS));
vm.assume(
!evc.haveCommonOwner(alice, address(0)) && !evc.haveCommonOwner(alice, EIP_7587_PRECOMPILES)
&& !evc.haveCommonOwner(alice, COMMON_PREDEPLOYS) && alice != address(evc)
);
vm.assume(nonce > 0 && nonce < type(uint256).max);

vm.warp(deadline);
Expand Down Expand Up @@ -315,8 +319,8 @@ contract PermitTest is Test {
);
address alice = vm.addr(privateKey);
vm.assume(
!evc.haveCommonOwner(alice, address(0)) && !evc.haveCommonOwner(alice, COMMON_PREDEPLOYS)
&& alice != address(evc)
!evc.haveCommonOwner(alice, address(0)) && !evc.haveCommonOwner(alice, EIP_7587_PRECOMPILES)
&& !evc.haveCommonOwner(alice, COMMON_PREDEPLOYS) && alice != address(evc)
);
bytes19 addressPrefix = evc.getAddressPrefix(alice);
data2 = abi.encode(keccak256(data2));
Expand Down Expand Up @@ -359,8 +363,8 @@ contract PermitTest is Test {
);
address alice = vm.addr(privateKey);
vm.assume(
!evc.haveCommonOwner(alice, address(0)) && !evc.haveCommonOwner(alice, COMMON_PREDEPLOYS)
&& alice != address(evc)
!evc.haveCommonOwner(alice, address(0)) && !evc.haveCommonOwner(alice, EIP_7587_PRECOMPILES)
&& !evc.haveCommonOwner(alice, COMMON_PREDEPLOYS) && alice != address(evc)
);
bytes19 addressPrefix = evc.getAddressPrefix(alice);
data = abi.encode(keccak256(data));
Expand All @@ -379,7 +383,7 @@ contract PermitTest is Test {
}

function test_RevertIfSignerInvalid_Permit(
bool option,
uint256 option,
address alice,
uint256 nonceNamespace,
uint256 nonce,
Expand All @@ -388,8 +392,10 @@ contract PermitTest is Test {
bytes memory data,
bytes calldata signature
) public {
alice = option
? address(uint160(bound(uint160(alice), 0, 0xFF)))
alice = option % 3 == 0
? option % 2 == 0
? address(uint160(bound(uint160(alice), 0, 0xFF)))
: address(uint160(bound(uint160(alice), uint160(EIP_7587_PRECOMPILES), uint160(EIP_7587_PRECOMPILES) + 0xFF)))
: address(uint160(bound(uint160(alice), uint160(COMMON_PREDEPLOYS), uint160(COMMON_PREDEPLOYS) + 0xFF)));
bytes19 addressPrefix = evc.getAddressPrefix(alice);
data = abi.encode(keccak256(data));
Expand Down Expand Up @@ -418,8 +424,8 @@ contract PermitTest is Test {
bytes19 addressPrefix = evc.getAddressPrefix(alice);
data = abi.encode(keccak256(data));
vm.assume(
!evc.haveCommonOwner(alice, address(0)) && !evc.haveCommonOwner(alice, COMMON_PREDEPLOYS)
&& alice != address(evc)
!evc.haveCommonOwner(alice, address(0)) && !evc.haveCommonOwner(alice, EIP_7587_PRECOMPILES)
&& !evc.haveCommonOwner(alice, COMMON_PREDEPLOYS) && alice != address(evc)
);
vm.assume(nonce < type(uint256).max);
vm.warp(deadline);
Expand Down Expand Up @@ -453,8 +459,8 @@ contract PermitTest is Test {
bytes19 addressPrefix = evc.getAddressPrefix(alice);
data = abi.encode(keccak256(data));
vm.assume(
!evc.haveCommonOwner(alice, address(0)) && !evc.haveCommonOwner(alice, COMMON_PREDEPLOYS)
&& alice != address(evc)
!evc.haveCommonOwner(alice, address(0)) && !evc.haveCommonOwner(alice, EIP_7587_PRECOMPILES)
&& !evc.haveCommonOwner(alice, COMMON_PREDEPLOYS) && alice != address(evc)
);
vm.assume(nonce > 0 && nonce < type(uint256).max);
vm.assume(deadline < type(uint256).max);
Expand Down Expand Up @@ -486,8 +492,8 @@ contract PermitTest is Test {
bytes19 addressPrefix = evc.getAddressPrefix(alice);
data = abi.encode(keccak256(data));
vm.assume(
!evc.haveCommonOwner(alice, address(0)) && !evc.haveCommonOwner(alice, COMMON_PREDEPLOYS)
&& alice != address(evc)
!evc.haveCommonOwner(alice, address(0)) && !evc.haveCommonOwner(alice, EIP_7587_PRECOMPILES)
&& !evc.haveCommonOwner(alice, COMMON_PREDEPLOYS) && alice != address(evc)
);
vm.assume(nonce > 0 && nonce < type(uint256).max);
vm.assume(value > 0);
Expand Down Expand Up @@ -522,8 +528,8 @@ contract PermitTest is Test {
) public {
bytes19 addressPrefix = evc.getAddressPrefix(alice);
vm.assume(
!evc.haveCommonOwner(alice, address(0)) && !evc.haveCommonOwner(alice, COMMON_PREDEPLOYS)
&& alice != address(evc)
!evc.haveCommonOwner(alice, address(0)) && !evc.haveCommonOwner(alice, EIP_7587_PRECOMPILES)
&& !evc.haveCommonOwner(alice, COMMON_PREDEPLOYS) && alice != address(evc)
);
vm.assume(nonce > 0 && nonce < type(uint256).max);
vm.warp(deadline);
Expand Down Expand Up @@ -557,8 +563,8 @@ contract PermitTest is Test {
signerECDSA.setPrivateKey(privateKey);

vm.assume(
!evc.haveCommonOwner(alice, address(0)) && !evc.haveCommonOwner(alice, COMMON_PREDEPLOYS)
&& alice != address(evc)
!evc.haveCommonOwner(alice, address(0)) && !evc.haveCommonOwner(alice, EIP_7587_PRECOMPILES)
&& !evc.haveCommonOwner(alice, COMMON_PREDEPLOYS) && alice != address(evc)
);
vm.assume(nonce > 0 && nonce < type(uint256).max);
vm.warp(deadline);
Expand Down Expand Up @@ -598,8 +604,8 @@ contract PermitTest is Test {
uint16 value
) public {
vm.assume(
!evc.haveCommonOwner(signer, address(0)) && !evc.haveCommonOwner(signer, COMMON_PREDEPLOYS)
&& signer != address(evc)
!evc.haveCommonOwner(signer, address(0)) && !evc.haveCommonOwner(signer, EIP_7587_PRECOMPILES)
&& !evc.haveCommonOwner(signer, COMMON_PREDEPLOYS) && signer != address(evc)
);
vm.assume(nonce > 0 && nonce < type(uint256).max);

Expand Down Expand Up @@ -628,7 +634,10 @@ contract PermitTest is Test {
address alice = vm.addr(privateKey);
signerECDSA.setPrivateKey(privateKey);

vm.assume(!evc.haveCommonOwner(alice, address(0)) && !evc.haveCommonOwner(alice, COMMON_PREDEPLOYS));
vm.assume(
!evc.haveCommonOwner(alice, address(0)) && !evc.haveCommonOwner(alice, EIP_7587_PRECOMPILES)
&& !evc.haveCommonOwner(alice, COMMON_PREDEPLOYS)
);
vm.warp(deadline);

// ECDSA signature invalid due to signer.
Expand Down Expand Up @@ -726,7 +735,10 @@ contract PermitTest is Test {
address alice = address(new SignerERC1271(evc));
SignerERC1271(alice).setSignatureHash(signature);

vm.assume(!evc.haveCommonOwner(alice, address(0)) && !evc.haveCommonOwner(alice, COMMON_PREDEPLOYS));
vm.assume(
!evc.haveCommonOwner(alice, address(0)) && !evc.haveCommonOwner(alice, EIP_7587_PRECOMPILES)
&& !evc.haveCommonOwner(alice, COMMON_PREDEPLOYS)
);
vm.warp(deadline);

// ECDSA signature is always invalid here hence we fall back to ERC-1271 signature
Expand Down Expand Up @@ -818,7 +830,7 @@ contract PermitTest is Test {

vm.assume(
!evc.haveCommonOwner(alice, address(0)) && !evc.haveCommonOwner(alice, bob)
&& !evc.haveCommonOwner(alice, COMMON_PREDEPLOYS)
&& !evc.haveCommonOwner(alice, EIP_7587_PRECOMPILES) && !evc.haveCommonOwner(alice, COMMON_PREDEPLOYS)
);
vm.deal(address(this), type(uint128).max);
signerECDSA.setPrivateKey(privateKey);
Expand Down
Loading