evm: EG01 add senderAddress

Author: evan-gray

design/02_On_Chain_Quotes.md

@@ -82,10 +82,11 @@ On EVM, two new contracts will be introduced.
    1. `updateQuoterContract(bytes calldata gov)` allows a Quoter to set their `ExecutorQuoter` contract via signed governance (detailed below). This MUST
       1. Verify the chain ID matches the Executor’s `ourChain`.
       2. Verify the contract address is an EVM address.
-      3. Verify the governance has not expired.
-      4. Verify the signature `ecrecover`s to the quoter address on the governance.
-      5. Assign the specified contract address to that quoter address.
-      6. Emit a `QuoterContractUpdate` event.
+      3. Verify the sender matches the sender on the governance.
+      4. Verify the governance has not expired.
+      5. Verify the signature `ecrecover`s to the quoter address on the governance.
+      6. Assign the specified contract address to that quoter address.
+      7. Emit a `QuoterContractUpdate` event.
    2. `quoteExecution` allows an integrator to quote the cost of an execution for a given quoter in place of a signed quote. This MUST call `requestQuote` from that Quoter’s registered contract.
    3. `requestExecution` allows an integrator to request execution via Executor providing a quoter address in place of a signed quote. This MUST
       1. Call `requestQuote` from that Quoter’s registered contract.
@@ -143,13 +144,16 @@ Relay Providers will need to change their verification for Executor requests. If
 
 ### Governance
 
-This design introduces a new concept of a Quoter’s on-chain governance
+This design introduces a new concept of a Quoter’s on-chain governance.
+
+The governance includes a sender address and expiry time in order to prevent replay attacks in lieu of a nonce and hash storage. The intention being that a short enough expiry time along with a pre-designated submitter mitigates the event where a quoter could be rolled back to a previous implementation by replaying their governance even when two governance messages are generated in short succession.
 
 ```solidity
 bytes4  prefix = "EG01";  // 4-byte prefix for this struct
 uint16  sourceChain;      // Wormhole Chain ID
 address quoterAddress;    // The public key of the quoter. Used to identify an execution provider.
 bytes32 contractAddress;  // UniversalAddress the quote contract to assign.
+bytes32 senderAddress;    // The public key of address expected to submit this governance.
 uint64  expiryTime;       // The unix time, in seconds, after which this quote should no longer be considered valid for requesting an execution
 [65]byte signature        // Quoter's signature of the previous bytes
 ```

evm/src/ExecutorQuoterRouter.sol

@@ -28,6 +28,7 @@ contract ExecutorQuoterRouter is IExecutorQuoterRouter {
     /// @param refundAddr The refund address.
     error RefundFailed(address refundAddr);
     error ChainIdMismatch(uint16 govChain, uint16 ourChain);
+    error InvalidSender();
     error InvalidSignature();
     error GovernanceExpired(uint64 expiryTime);
     error NotAnEvmAddress(bytes32);
@@ -43,6 +44,7 @@ contract ExecutorQuoterRouter is IExecutorQuoterRouter {
         uint160 quoter;
         address quoterAddr;
         bytes32 universalContractAddress;
+        bytes32 universalSenderAddress;
         uint64 expiryTime;
         bytes32 r;
         bytes32 s;
@@ -52,10 +54,11 @@ contract ExecutorQuoterRouter is IExecutorQuoterRouter {
             chainId := shr(240, calldataload(add(gov.offset, 4)))
             quoter := shr(96, calldataload(add(gov.offset, 6)))
             universalContractAddress := calldataload(add(gov.offset, 26))
-            expiryTime := shr(192, calldataload(add(gov.offset, 58)))
-            r := calldataload(add(gov.offset, 66))
-            s := calldataload(add(gov.offset, 98))
-            v := shr(248, calldataload(add(gov.offset, 130)))
+            universalSenderAddress := calldataload(add(gov.offset, 58))
+            expiryTime := shr(192, calldataload(add(gov.offset, 90)))
+            r := calldataload(add(gov.offset, 98))
+            s := calldataload(add(gov.offset, 130))
+            v := shr(248, calldataload(add(gov.offset, 162)))
         }
         if (chainId != OUR_CHAIN) {
             revert ChainIdMismatch(chainId, OUR_CHAIN);
@@ -64,11 +67,19 @@ contract ExecutorQuoterRouter is IExecutorQuoterRouter {
         if (uint256(universalContractAddress) >> 160 != 0) {
             revert NotAnEvmAddress(universalContractAddress);
         }
+        // Check if the higher 96 bits (left-most 12 bytes) are non-zero
+        if (uint256(universalSenderAddress) >> 160 != 0) {
+            revert NotAnEvmAddress(universalSenderAddress);
+        }
+        address senderAddress = address(uint160(uint256(universalSenderAddress)));
+        if (msg.sender != senderAddress) {
+            revert InvalidSender();
+        }
         if (expiryTime <= block.timestamp) {
             revert GovernanceExpired(expiryTime);
         }
         quoterAddr = address(quoter);
-        bytes32 hash = keccak256(gov[0:66]);
+        bytes32 hash = keccak256(gov[0:98]);
         address signer = ecrecover(hash, v, r, s);
         if (signer == address(0)) {
             revert InvalidSignature();

evm/test/ExecutorQuoterRouter.t.sol

@@ -12,19 +12,24 @@ contract ExecutorQuoterRouterTest is Test {
     uint16 constant OUR_CHAIN = 10002;
     bytes32 constant UPDATE_IMPLEMENTATION = 0x000000000000000000000000aaa039ee238299b23cb4f9cd40775589efa962fd;
     bytes32 constant BAD_UPDATE_IMPLEMENTATION = 0x100000000000000000000000aaa039ee238299b23cb4f9cd40775589efa962fd;
+    bytes32 constant SENDER_ADDRESS = 0x0000000000000000000000007FA9385bE102ac3EAc297483Dd6233D62b3e1496;
+    bytes32 constant BAD_SENDER_ADDRESS = 0x0000000000000000000000007FA9385bE102ac3EAc297483Dd6233D62b3e1490;
     uint64 constant EXPIRY = 1762880900;
 
     function setUp() public {
         executor = new Executor(OUR_CHAIN);
         executorQuoterRouter = new ExecutorQuoterRouter(address(executor));
     }
 
-    function makeAndSignGovernance(uint16 chainId, address quoterAddr, bytes32 updateImplementation, uint256 quoterPk)
-        private
-        pure
-        returns (bytes memory)
-    {
-        bytes memory govBody = abi.encodePacked(hex"45473031", chainId, quoterAddr, updateImplementation, EXPIRY);
+    function makeAndSignGovernance(
+        uint16 chainId,
+        address quoterAddr,
+        bytes32 updateImplementation,
+        bytes32 senderAddress,
+        uint256 quoterPk
+    ) private pure returns (bytes memory) {
+        bytes memory govBody =
+            abi.encodePacked(hex"45473031", chainId, quoterAddr, updateImplementation, senderAddress, EXPIRY);
         bytes32 digest = keccak256(govBody);
         (uint8 v, bytes32 r, bytes32 s) = vm.sign(quoterPk, digest);
         return abi.encodePacked(govBody, r, s, v);
@@ -33,7 +38,7 @@ contract ExecutorQuoterRouterTest is Test {
     function test_updateQuoterContract() public {
         (address alice, uint256 alicePk) = makeAddrAndKey("alice");
         executorQuoterRouter.updateQuoterContract(
-            makeAndSignGovernance(OUR_CHAIN, alice, UPDATE_IMPLEMENTATION, alicePk)
+            makeAndSignGovernance(OUR_CHAIN, alice, UPDATE_IMPLEMENTATION, SENDER_ADDRESS, alicePk)
         );
     }
 
@@ -42,7 +47,7 @@ contract ExecutorQuoterRouterTest is Test {
         uint16 badChain = OUR_CHAIN + 1;
         vm.expectRevert(abi.encodeWithSelector(ExecutorQuoterRouter.ChainIdMismatch.selector, badChain, OUR_CHAIN));
         executorQuoterRouter.updateQuoterContract(
-            makeAndSignGovernance(badChain, alice, UPDATE_IMPLEMENTATION, alicePk)
+            makeAndSignGovernance(badChain, alice, UPDATE_IMPLEMENTATION, SENDER_ADDRESS, alicePk)
         );
     }
 
@@ -52,7 +57,15 @@ contract ExecutorQuoterRouterTest is Test {
             abi.encodeWithSelector(ExecutorQuoterRouter.NotAnEvmAddress.selector, BAD_UPDATE_IMPLEMENTATION)
         );
         executorQuoterRouter.updateQuoterContract(
-            makeAndSignGovernance(OUR_CHAIN, alice, BAD_UPDATE_IMPLEMENTATION, alicePk)
+            makeAndSignGovernance(OUR_CHAIN, alice, BAD_UPDATE_IMPLEMENTATION, SENDER_ADDRESS, alicePk)
+        );
+    }
+
+    function test_updateQuoterContractInvalidSender() public {
+        vm.expectRevert(abi.encodeWithSelector(ExecutorQuoterRouter.InvalidSender.selector));
+        (address alice, uint256 alicePk) = makeAddrAndKey("alice");
+        executorQuoterRouter.updateQuoterContract(
+            makeAndSignGovernance(OUR_CHAIN, alice, UPDATE_IMPLEMENTATION, BAD_SENDER_ADDRESS, alicePk)
         );
     }
 
@@ -61,21 +74,23 @@ contract ExecutorQuoterRouterTest is Test {
         vm.expectRevert(abi.encodeWithSelector(ExecutorQuoterRouter.GovernanceExpired.selector, EXPIRY));
         (address alice, uint256 alicePk) = makeAddrAndKey("alice");
         executorQuoterRouter.updateQuoterContract(
-            makeAndSignGovernance(OUR_CHAIN, alice, UPDATE_IMPLEMENTATION, alicePk)
+            makeAndSignGovernance(OUR_CHAIN, alice, UPDATE_IMPLEMENTATION, SENDER_ADDRESS, alicePk)
         );
     }
 
     function test_updateQuoterContractBadSignature() public {
         vm.expectRevert(abi.encodeWithSelector(ExecutorQuoterRouter.InvalidSignature.selector));
         executorQuoterRouter.updateQuoterContract(
-            hex"4547303127125241c9276698439fef2780dbab76fec90b633fbd000000000000000000000000aaa039ee238299b23cb4f9cd40775589efa962fd00000000691248922111b9ac29b0d785d41e8f8c66980f4651c9a35c066e875cab67fd625e5e59c62fc65912c14a2c2ee99acdd809397f932bcf35ba7d269f02f96e8688588145701b"
+            hex"4547303127125241c9276698439fef2780dbab76fec90b633fbd000000000000000000000000aaa039ee238299b23cb4f9cd40775589efa962fd0000000000000000000000007FA9385bE102ac3EAc297483Dd6233D62b3e149600000000691248922111b9ac29b0d785d41e8f8c66980f4651c9a35c066e875cab67fd625e5e59c62fc65912c14a2c2ee99acdd809397f932bcf35ba7d269f02f96e8688588145701b"
         );
     }
 
     function test_updateQuoterContractQuoterMismatch() public {
         (address alice,) = makeAddrAndKey("alice");
         (, uint256 bobPk) = makeAddrAndKey("bob");
         vm.expectRevert(abi.encodeWithSelector(ExecutorQuoterRouter.InvalidSignature.selector));
-        executorQuoterRouter.updateQuoterContract(makeAndSignGovernance(OUR_CHAIN, alice, UPDATE_IMPLEMENTATION, bobPk));
+        executorQuoterRouter.updateQuoterContract(
+            makeAndSignGovernance(OUR_CHAIN, alice, UPDATE_IMPLEMENTATION, SENDER_ADDRESS, bobPk)
+        );
     }
 }