Rename tbr vaa util function (#86)

* Rename tbr vaa util function

* Add unchecked math

Author: AgusVelez5

src/libraries/VaaLib.sol

@@ -436,23 +436,28 @@ library VaaLib {
     ) = decodeVaaBodyMemUnchecked(encodedVaa, 0, encodedVaa.length);
   }
 
-  function decodeEmitterChainIdCdUnchecked(
+  // Convinience decoding function for token bridge Vaas
+  function decodeEmitterChainAndPayloadCdUnchecked(
     bytes calldata encodedVaa
-  ) internal pure returns (uint16 emitterChainId) {
+  ) internal pure returns (uint16 emitterChainId, bytes calldata payload) { unchecked {
     checkVaaVersionCd(encodedVaa);
     uint envelopeOffset = skipVaaHeaderCd(encodedVaa);
     uint offset = envelopeOffset + ENVELOPE_EMITTER_CHAIN_ID_OFFSET;
-    (emitterChainId, ) = encodedVaa.asUint16CdUnchecked(offset);
-  }
+    (emitterChainId, offset) = encodedVaa.asUint16CdUnchecked(offset);
+    offset += ENVELOPE_EMITTER_ADDRESS_SIZE + ENVELOPE_SEQUENCE_SIZE + ENVELOPE_CONSISTENCY_LEVEL_SIZE;
+    payload = decodeVaaPayloadCd(encodedVaa, offset);
+  }}
 
-  function decodeEmitterChainIdMemUnchecked(
+  function decodeEmitterChainAndPayloadMemUnchecked(
     bytes memory encodedVaa
-  ) internal pure returns (uint16 emitterChainId) {
+  ) internal pure returns (uint16 emitterChainId, bytes memory payload) { unchecked {
     checkVaaVersionMemUnchecked(encodedVaa, 0);
     uint envelopeOffset = skipVaaHeaderMemUnchecked(encodedVaa, 0);
     uint offset = envelopeOffset + ENVELOPE_EMITTER_CHAIN_ID_OFFSET;
-    (emitterChainId, ) = encodedVaa.asUint16MemUnchecked(offset);
-  }
+    (emitterChainId, offset) = encodedVaa.asUint16MemUnchecked(offset);
+    offset += ENVELOPE_EMITTER_ADDRESS_SIZE + ENVELOPE_SEQUENCE_SIZE + ENVELOPE_CONSISTENCY_LEVEL_SIZE;
+    (payload, ) = decodeVaaPayloadMemUnchecked(encodedVaa, offset, encodedVaa.length);
+  }}
 
   // ------------ Advanced Decoding Functions ------------
 
@@ -868,11 +873,11 @@ library VaaLib {
     bytes memory encoded,
     uint payloadOffset,
     uint vaaLength
-  ) internal pure returns (bytes memory payload, uint newOffset) {
+  ) internal pure returns (bytes memory payload, uint newOffset) { unchecked {
     //check to avoid underflow in following subtraction
     payloadOffset.checkBound(vaaLength);
     (payload, newOffset) = encoded.sliceMemUnchecked(payloadOffset, vaaLength - payloadOffset);
-  }
+  }}
 
   // ------------ Encoding ------------
 
@@ -1013,11 +1018,11 @@ library VaaLib {
   function _decodeRemainderCd(
     bytes calldata encodedVaa,
     uint offset
-  ) private pure returns (bytes calldata remainder) {
+  ) private pure returns (bytes calldata remainder) { unchecked {
     //check to avoid underflow in following subtraction
     offset.checkBound(encodedVaa.length);
     (remainder, ) = encodedVaa.sliceCdUnchecked(offset, encodedVaa.length - offset);
-  }
+  }}
 }
 
 using VaaLib for VaaHeader global;

test/WormholeMessages.t.sol

@@ -593,13 +593,16 @@ contract WormholeMessagesTest is Test {
   }
   function testDecodingAmPayload() public { runBoth(decodingAmPayload); }
 
-  function decodingEmitterChainId(bool cd) internal {
-    uint16 emitterChainId = abi.decode(
-      callWithBytes(vaaLibWrapper, "decodeEmitterChainId", cd, true, amVaa(), true),
-      (uint16)
+  function decodingEmitterChainAndPayload(bool cd) internal {
+    uint16 emitterChainId;
+    bytes memory payload; 
+    (emitterChainId, payload) = abi.decode(
+      callWithBytes(vaaLibWrapper, "decodeEmitterChainAndPayload", cd, true, amVaa(), true),
+      (uint16, bytes)
     );
 
     assertEq(emitterChainId, amVaaVm().emitterChainId);
+    assertEq(payload, amVaaVm().payload);
   }
-  function testDecodingEmitterChainId() public { runBoth(decodingEmitterChainId); }
+  function testDecodingEmitterChainAndPayload() public { runBoth(decodingEmitterChainAndPayload); }
 }

test/generated/VaaLibTestWrapper.sol

@@ -102,12 +102,12 @@ contract VaaLibTestWrapper {
     return VaaLib.decodeVaaBodyStructMem(encodedVaa);
   }
 
-  function decodeEmitterChainIdCdUnchecked(bytes calldata encodedVaa) external pure returns (uint16 emitterChainId) {
-    return VaaLib.decodeEmitterChainIdCdUnchecked(encodedVaa);
+  function decodeEmitterChainAndPayloadCdUnchecked(bytes calldata encodedVaa) external pure returns (uint16 emitterChainId, bytes calldata payload) {
+    return VaaLib.decodeEmitterChainAndPayloadCdUnchecked(encodedVaa);
   }
 
-  function decodeEmitterChainIdMemUnchecked(bytes calldata encodedVaa) external pure returns (uint16 emitterChainId) {
-    return VaaLib.decodeEmitterChainIdMemUnchecked(encodedVaa);
+  function decodeEmitterChainAndPayloadMemUnchecked(bytes calldata encodedVaa) external pure returns (uint16 emitterChainId, bytes memory payload) {
+    return VaaLib.decodeEmitterChainAndPayloadMemUnchecked(encodedVaa);
   }
 
   function asIWormholeSignatures(GuardianSignature[] calldata signatures) external pure returns (IWormhole.Signature[] memory vmSignatures) {