evm: test quoteExecution and requestExecution

Author: evan-gray

evm/test/ExecutorQuoter.t.sol

@@ -2,6 +2,9 @@
 pragma solidity ^0.8.13;
 
 import {Test} from "forge-std/Test.sol";
+
+import {ExecutorMessages} from "../src/libraries/ExecutorMessages.sol";
+import {RelayInstructions} from "../src/libraries/RelayInstructions.sol";
 import {ExecutorQuoter} from "../src/ExecutorQuoter.sol";
 
 contract ExecutorQuoterTest is Test {
@@ -76,7 +79,11 @@ contract ExecutorQuoterTest is Test {
 
     function test_requestQuote() public view {
         executorQuoter.requestQuote(
-            DST_CHAIN, DST_ADDR, UPDATER, abi.encodePacked(""), abi.encodePacked(uint8(1), uint128(250000))
+            DST_CHAIN,
+            DST_ADDR,
+            UPDATER,
+            ExecutorMessages.makeVAAv1Request(10002, bytes32(uint256(uint160(address(this)))), 1),
+            RelayInstructions.encodeGas(250000, 0)
         );
     }
 }

evm/test/ExecutorQuoterRouter.t.sol

@@ -2,12 +2,20 @@
 pragma solidity ^0.8.13;
 
 import {Test} from "forge-std/Test.sol";
+import {ExecutorMessages} from "../src/libraries/ExecutorMessages.sol";
+import {RelayInstructions} from "../src/libraries/RelayInstructions.sol";
 import {Executor} from "../src/Executor.sol";
+import {ExecutorQuoter} from "../src/ExecutorQuoter.sol";
 import {ExecutorQuoterRouter} from "../src/ExecutorQuoterRouter.sol";
 
 contract ExecutorQuoterRouterTest is Test {
     Executor public executor;
+    ExecutorQuoter public executorQuoter;
     ExecutorQuoterRouter public executorQuoterRouter;
+    address public testQuoter;
+    uint256 public testQuoterPk;
+    ExecutorQuoter.Update[] public updates;
+    ExecutorQuoter.Update[] public chainInfoUpdates;
 
     uint16 constant OUR_CHAIN = 10002;
     bytes32 constant UPDATE_IMPLEMENTATION = 0x000000000000000000000000aaa039ee238299b23cb4f9cd40775589efa962fd;
@@ -16,9 +24,45 @@ contract ExecutorQuoterRouterTest is Test {
     bytes32 constant BAD_SENDER_ADDRESS = 0x0000000000000000000000007FA9385bE102ac3EAc297483Dd6233D62b3e1490;
     uint64 constant EXPIRY = 1762880900;
 
+    uint16 constant DST_CHAIN = 10003;
+    bytes32 constant DST_ADDR = bytes32(0);
+
+    function packUint64(uint64 a, uint64 b, uint64 c, uint64 d) public pure returns (bytes32) {
+        return bytes32((uint256(d) << 192) | (uint256(c) << 128) | (uint256(b) << 64) | uint256(a));
+    }
+
     function setUp() public {
         executor = new Executor(OUR_CHAIN);
+        (testQuoter, testQuoterPk) = makeAddrAndKey("test");
+        executorQuoter = new ExecutorQuoter(testQuoter, testQuoter, 18, bytes32(uint256(uint160(testQuoter))));
         executorQuoterRouter = new ExecutorQuoterRouter(address(executor));
+        vm.startPrank(testQuoter);
+        executorQuoterRouter.updateQuoterContract(
+            makeAndSignGovernance(
+                OUR_CHAIN,
+                testQuoter,
+                bytes32(uint256(uint160(address(executorQuoter)))),
+                bytes32(uint256(uint160(testQuoter))),
+                testQuoterPk
+            )
+        );
+        ExecutorQuoter.Update memory chainInfoUpdate;
+        chainInfoUpdate.chainId = 10003;
+        chainInfoUpdate.update = 0x0000000000000000000000000000000000000000000000000000000000121201;
+        chainInfoUpdates.push(chainInfoUpdate);
+        executorQuoter.chainInfoUpdate(chainInfoUpdates);
+        ExecutorQuoter.OnChainQuoteBody memory quote1;
+        quote1.baseFee = 27971;
+        quote1.dstGasPrice = 100000000;
+        quote1.srcPrice = 35751300000000;
+        quote1.dstPrice = 35751300000000;
+        ExecutorQuoter.Update memory update1;
+        update1.chainId = 10003;
+        update1.update = packUint64(quote1.baseFee, quote1.dstGasPrice, quote1.srcPrice, quote1.dstPrice);
+        updates.push(update1);
+        // store first so the gas metric is on a non-zero slot
+        executorQuoter.quoteUpdate(updates);
+        vm.stopPrank();
     }
 
     function makeAndSignGovernance(
@@ -93,4 +137,26 @@ contract ExecutorQuoterRouterTest is Test {
             makeAndSignGovernance(OUR_CHAIN, alice, UPDATE_IMPLEMENTATION, SENDER_ADDRESS, bobPk)
         );
     }
+
+    function test_quoteExecution() public view {
+        executorQuoterRouter.quoteExecution(
+            DST_CHAIN,
+            DST_ADDR,
+            testQuoter,
+            testQuoter,
+            ExecutorMessages.makeVAAv1Request(OUR_CHAIN, bytes32(uint256(uint160(address(this)))), 1),
+            RelayInstructions.encodeGas(250000, 0)
+        );
+    }
+
+    function test_requestExecution() public payable {
+        executorQuoterRouter.requestExecution{value: 27797100000000}(
+            DST_CHAIN,
+            DST_ADDR,
+            testQuoter,
+            testQuoter,
+            ExecutorMessages.makeVAAv1Request(OUR_CHAIN, bytes32(uint256(uint160(address(this)))), 1),
+            RelayInstructions.encodeGas(250000, 0)
+        );
+    }
 }