Fix mock forge generic relayer to not use vaa hashes

Author: derpy-duck

ethereum/forge-test/MockGenericRelayer.sol

@@ -17,6 +17,7 @@ contract MockGenericRelayer {
     IWormhole relayerWormhole;
     WormholeSimulator relayerWormholeSimulator;
     IWormholeRelayerInstructionParser parser;
+    uint256 transactionIndex;
 
     address private constant VM_ADDRESS = address(bytes20(uint160(uint256(keccak256("hevm cheat code")))));
 
@@ -38,14 +39,15 @@ contract MockGenericRelayer {
         relayerWormhole = IWormhole(_wormhole);
         relayerWormholeSimulator = WormholeSimulator(_wormholeSimulator);
         parser = IWormholeRelayerInstructionParser(wormholeRelayer);
+        transactionIndex = 0;
     }
 
-    function getPastEncodedVMs(bytes32 vaaHash) public view returns (bytes[] memory) {
-        return pastEncodedVMs[vaaHash];
+    function getPastEncodedVMs(uint16 chainId, uint64 deliveryVAASequence) public view returns (bytes[] memory) {
+        return pastEncodedVMs[keccak256(abi.encodePacked(chainId, deliveryVAASequence))];
     }
 
-    function getPastDeliveryVAA(bytes32 vaaHash) public view returns (bytes memory) {
-        return pastEncodedDeliveryVAA[vaaHash];
+    function getPastDeliveryVAA(uint16 chainId, uint64 deliveryVAASequence) public view returns (bytes memory) {
+        return pastEncodedDeliveryVAA[keccak256(abi.encodePacked(chainId, deliveryVAASequence))];
     }
 
     function setWormholeRelayerContract(uint16 chainId, address contractAddress) public {
@@ -102,8 +104,6 @@ contract MockGenericRelayer {
         }
     }
 
-    // TODO: Make the key 'txHash + sequence' instead of 'VAAHASH'
-
     function genericRelay(
         bytes memory encodedDeliveryVAA,
         bytes[] memory encodedVMs,
@@ -142,20 +142,22 @@ contract MockGenericRelayer {
                     }(package);
                 }
             }
-            pastEncodedVMs[parsedDeliveryVAA.hash] = encodedVMsToBeDelivered;
-            pastEncodedDeliveryVAA[parsedDeliveryVAA.hash] = encodedDeliveryVAA;
+            bytes32 key = keccak256(abi.encodePacked(parsedDeliveryVAA.emitterChainId, parsedDeliveryVAA.sequence));
+            pastEncodedVMs[key] = encodedVMsToBeDelivered;
+            pastEncodedDeliveryVAA[key] = encodedDeliveryVAA;
         } else if (payloadId == 2) {
             IWormholeRelayerInstructionParser.RedeliveryByTxHashInstruction memory instruction =
                 parser.decodeRedeliveryInstruction(parsedDeliveryVAA.payload);
-            bytes[] memory originalEncodedVMs = pastEncodedVMs[instruction.sourceTxHash];
+            bytes32 key = keccak256(abi.encodePacked(instruction.sourceChain, instruction.deliveryVAASequence));
+            bytes[] memory originalEncodedVMs = pastEncodedVMs[key];
             uint16 targetChain = instruction.targetChain;
             uint256 budget =
                 instruction.newMaximumRefundTarget + instruction.newReceiverValueTarget + wormholeFees[targetChain];
             IDelivery.TargetRedeliveryByTxHashParamsSingle memory package = IDelivery
                 .TargetRedeliveryByTxHashParamsSingle({
                 redeliveryVM: encodedDeliveryVAA,
                 sourceEncodedVMs: originalEncodedVMs,
-                originalEncodedDeliveryVAA: pastEncodedDeliveryVAA[instruction.sourceTxHash],
+                originalEncodedDeliveryVAA: pastEncodedDeliveryVAA[key],
                 relayerRefundAddress: payable(relayers[targetChain])
             });
             vm.prank(relayers[targetChain]);

ethereum/forge-test/WormholeRelayer.t.sol

@@ -837,7 +837,7 @@ contract WormholeRelayerTests is Test {
 
         stack.redeliveryRequest = IWormholeRelayer.ResendByTx({
             sourceChain: setup.sourceChainId,
-            sourceTxHash: stack.deliveryVaaHash,
+            sourceTxHash: 0,
             deliveryVAASequence: stack.sequence,
             targetChain: setup.targetChainId,
             multisendIndex: 0,
@@ -858,9 +858,9 @@ contract WormholeRelayerTests is Test {
             stack.entries[0], setup.sourceChainId, address(setup.source.coreRelayer)
         );
 
-        stack.originalEncodedVMs = genericRelayer.getPastEncodedVMs(stack.deliveryVaaHash);
+        stack.originalEncodedVMs = genericRelayer.getPastEncodedVMs(setup.sourceChainId, stack.sequence);
 
-        stack.originalDeliveryVAA = genericRelayer.getPastDeliveryVAA(stack.deliveryVaaHash);
+        stack.originalDeliveryVAA = genericRelayer.getPastDeliveryVAA(setup.sourceChainId, stack.sequence);
 
         stack.package = IDelivery.TargetRedeliveryByTxHashParamsSingle(
             stack.redeliveryVM, stack.originalEncodedVMs, stack.originalDeliveryVAA, payable(setup.target.relayer)
@@ -908,7 +908,7 @@ contract WormholeRelayerTests is Test {
 
         stack.redeliveryRequest = IWormholeRelayer.ResendByTx({
             sourceChain: setup.sourceChainId,
-            sourceTxHash: stack.deliveryVaaHash,
+            sourceTxHash: 0,
             deliveryVAASequence: stack.sequence,
             targetChain: setup.targetChainId,
             multisendIndex: 0,
@@ -1117,7 +1117,7 @@ contract WormholeRelayerTests is Test {
 
         stack.redeliveryRequest = IWormholeRelayer.ResendByTx({
             sourceChain: setup.sourceChainId,
-            sourceTxHash: stack.deliveryVaaHash,
+            sourceTxHash: 0,
             deliveryVAASequence: stack.sequence,
             targetChain: setup.targetChainId,
             multisendIndex: 0,
@@ -1163,7 +1163,7 @@ contract WormholeRelayerTests is Test {
 
         stack.redeliveryRequest = IWormholeRelayer.ResendByTx({
             sourceChain: setup.sourceChainId,
-            sourceTxHash: stack.deliveryVaaHash,
+            sourceTxHash: 0,
             deliveryVAASequence: stack.sequence,
             targetChain: setup.sourceChainId,
             multisendIndex: 0,
@@ -1230,7 +1230,7 @@ contract WormholeRelayerTests is Test {
 
         stack.redeliveryRequest = IWormholeRelayer.ResendByTx({
             sourceChain: setup.sourceChainId,
-            sourceTxHash: stack.deliveryVaaHash,
+            sourceTxHash: 0,
             deliveryVAASequence: sequence,
             targetChain: setup.targetChainId,
             multisendIndex: 0,
@@ -1274,7 +1274,7 @@ contract WormholeRelayerTests is Test {
 
         stack.redeliveryRequest = IWormholeRelayer.ResendByTx({
             sourceChain: setup.sourceChainId,
-            sourceTxHash: stack.deliveryVaaHash,
+            sourceTxHash: 0,
             deliveryVAASequence: stack.sequence,
             targetChain: setup.targetChainId,
             multisendIndex: 0,
@@ -1640,7 +1640,7 @@ contract WormholeRelayerTests is Test {
 
         stack.redeliveryRequest = IWormholeRelayer.ResendByTx({
             sourceChain: setup.sourceChainId,
-            sourceTxHash: stack.deliveryVaaHash,
+            sourceTxHash: 0,
             deliveryVAASequence: stack.sequence,
             targetChain: setup.targetChainId,
             multisendIndex: 0,
@@ -1678,7 +1678,7 @@ contract WormholeRelayerTests is Test {
 
         stack.redeliveryRequest = IWormholeRelayer.ResendByTx({
             sourceChain: setup.sourceChainId,
-            sourceTxHash: stack.deliveryVaaHash,
+            sourceTxHash: 0,
             deliveryVAASequence: stack.sequence,
             targetChain: setup.targetChainId,
             multisendIndex: 0,