evm: Fix empty instructions for WH endpoint

wormhole-foundation · Feb 24, 2024 · 76b7efe · 76b7efe
1 parent 9c34a84
commit 76b7efe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/evm/src/WormholeEndpoint.sol b/evm/src/WormholeEndpoint.sol
@@ -385,6 +385,12 @@ contract WormholeEndpoint is Endpoint, IWormholeEndpoint, IWormholeReceiver {
         pure
         returns (WormholeEndpointInstruction memory instruction)
     {
+        // If the user doesn't pass in any endpoint instructions then the default is false
+        if (encoded.length == 0) {
+            instruction.shouldSkipRelayerSend = false;
+            return instruction;
+        }
+
         uint256 offset = 0;
         (instruction.shouldSkipRelayerSend, offset) = encoded.asBoolUnchecked(offset);
         encoded.checkLength(offset);

diff --git a/evm/test/IntegrationStandalone.t.sol b/evm/test/IntegrationStandalone.t.sol
@@ -147,13 +147,7 @@ contract TestEndToEndBase is Test, IManagerEvents, IRateLimiterEvents {
         {
             uint256 managerBalanceBefore = token1.balanceOf(address(managerChain1));
             uint256 userBalanceBefore = token1.balanceOf(address(userA));
-            managerChain1.transfer(
-                sendingAmount,
-                chainId2,
-                bytes32(uint256(uint160(userB))),
-                false,
-                encodeEndpointInstruction(true)
-            );
+            managerChain1.transfer(sendingAmount, chainId2, bytes32(uint256(uint160(userB))));
 
             // Balance check on funds going in and out working as expected
             uint256 managerBalanceAfter = token1.balanceOf(address(managerChain1));