finish and test WormholeOverride, fix tests

wormhole-foundation · Sep 29, 2024 · c0565c7 · c0565c7
1 parent cdd6025
commit c0565c7
Show file tree

Hide file tree

Showing 11 changed files with 371 additions and 385 deletions.
diff --git a/src/WormholeRelayer/CCTPAndTokenBase.sol b/src/WormholeRelayer/CCTPAndTokenBase.sol
@@ -105,10 +105,7 @@ abstract contract CCTPAndTokenSender is CCTPAndTokenBase {
       USDC,
       targetAddressBytes32
     );
-    return MessageKey(
-      CCTPMessageLib.CCTP_KEY_TYPE,
-      abi.encodePacked(getCCTPDomain(wormhole.chainId()), nonce)
-    );
+    return MessageKey(CCTP_KEY_TYPE, abi.encodePacked(getCCTPDomain(wormhole.chainId()), nonce));
   }
 
   // Publishes a CCTP transfer of 'amount' of USDC

diff --git a/src/WormholeRelayer/CCTPBase.sol b/src/WormholeRelayer/CCTPBase.sol
@@ -11,16 +11,13 @@ import "wormhole-sdk/Utils.sol";
 import "./Base.sol";
 
 library CCTPMessageLib {
-  // The second standardized key type is a CCTP Key
-  // representing a CCTP transfer of USDC
+  // The second standardized key type is a CCTP Key representing a CCTP transfer of USDC
   // (on the IWormholeRelayer interface)
 
   // Note - the default delivery provider only will relay CCTP transfers that were sent
   // in the same transaction that this message was emitted!
   // (This will always be the case if 'CCTPSender' is used)
 
-  uint8 constant CCTP_KEY_TYPE = 2;
-
   // encoded using abi.encodePacked(domain, nonce)
   struct CCTPKey {
     uint32 domain;
@@ -117,10 +114,7 @@ abstract contract CCTPSender is CCTPBase {
       USDC,
       targetAddressBytes32
     );
-    return MessageKey(
-      CCTPMessageLib.CCTP_KEY_TYPE,
-      abi.encodePacked(getCCTPDomain(wormhole.chainId()), nonce)
-    );
+    return MessageKey(CCTP_KEY_TYPE, abi.encodePacked(getCCTPDomain(wormhole.chainId()), nonce));
   }
 
   // Publishes a CCTP transfer of 'amount' of USDC

diff --git a/src/interfaces/IWormholeRelayer.sol b/src/interfaces/IWormholeRelayer.sol
@@ -27,6 +27,7 @@ struct VaaKey {
 
 // 0-127 are reserved for standardized KeyTypes, 128-255 are for custom use
 uint8 constant VAA_KEY_TYPE = 1;
+uint8 constant CCTP_KEY_TYPE = 2;
 
 struct MessageKey {
   uint8 keyType; // 0-127 are reserved for standardized KeyTypes, 128-255 are for custom use

diff --git a/src/testing/WormholeCctpSimulator.sol b/src/testing/WormholeCctpSimulator.sol
@@ -75,8 +75,7 @@ contract WormholeCctpSimulator {
     wormhole.setUpOverride();
     messageTransmitter.setUpOverride();
 
-    foreignNonce    = 0xBBBBBBBBBBBBBBBB;
-    foreignSequence = 0xAAAAAAAAAAAAAAAA;
+    foreignNonce  = 0xBBBBBBBBBBBBBBBB;
     //default value - can be overridden if desired
     foreignCaller = 0xCA11E2000CA11E200CA11E200CA11E200CA11E200CA11E200CA11E2000CA11E2;
 
@@ -134,10 +133,9 @@ contract WormholeCctpSimulator {
     (burnMsg, encodedCctpMessage, cctpAttestation) = _craftCctpTokenBurnMessage(amount);
 
     //craft the associated VAA
-    (, encodedVaa) = wormhole.craftVaa(
+    encodedVaa = wormhole.craftVaa(
       foreignChain,
       foreignSender,
-      foreignSequence++,
       WormholeCctpMessages.encodeDeposit(
         burnMsg.burnToken,
         amount,