chore: audited contract changes

Author: kev1n-peters

evm/ts/src/ethers-contracts/1_1_0/MultiTokenNtt.ts

@@ -91,12 +91,14 @@ export declare namespace IMultiTokenRateLimiter {
   export type InboundQueuedTransferStruct = {
     txTimestamp: BigNumberish;
     sourceChainId: BigNumberish;
+    transferDigest: BytesLike;
   };
 
   export type InboundQueuedTransferStructOutput = [
     txTimestamp: bigint,
-    sourceChainId: bigint
-  ] & { txTimestamp: bigint; sourceChainId: bigint };
+    sourceChainId: bigint,
+    transferDigest: string
+  ] & { txTimestamp: bigint; sourceChainId: bigint; transferDigest: string };
 
   export type OutboundQueuedTransferStruct = {
     recipient: BytesLike;
@@ -272,7 +274,7 @@ export interface MultiTokenNttInterface extends Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "completeInboundQueuedTransfer",
-    values: [NativeTokenTransferCodec.NativeTokenTransferStruct]
+    values: [BytesLike, NativeTokenTransferCodec.NativeTokenTransferStruct]
   ): string;
   encodeFunctionData(
     functionFragment: "completeOutboundQueuedTransfer",
@@ -341,7 +343,7 @@ export interface MultiTokenNttInterface extends Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "receiveMessage",
-    values: [BigNumberish, BytesLike, BytesLike]
+    values: [BytesLike, BigNumberish, BytesLike, BytesLike]
   ): string;
   encodeFunctionData(
     functionFragment: "setInboundLimit",
@@ -816,7 +818,10 @@ export interface MultiTokenNtt extends BaseContract {
   >;
 
   completeInboundQueuedTransfer: TypedContractMethod<
-    [nativeTokenTransfer: NativeTokenTransferCodec.NativeTokenTransferStruct],
+    [
+      digest: BytesLike,
+      nativeTokenTransfer: NativeTokenTransferCodec.NativeTokenTransferStruct
+    ],
     [void],
     "nonpayable"
   >;
@@ -902,7 +907,12 @@ export interface MultiTokenNtt extends BaseContract {
   rateLimitDuration: TypedContractMethod<[], [bigint], "view">;
 
   receiveMessage: TypedContractMethod<
-    [sourceChainId: BigNumberish, sender: BytesLike, data: BytesLike],
+    [
+      digest: BytesLike,
+      sourceChainId: BigNumberish,
+      sender: BytesLike,
+      data: BytesLike
+    ],
     [void],
     "nonpayable"
   >;
@@ -977,7 +987,10 @@ export interface MultiTokenNtt extends BaseContract {
   getFunction(
     nameOrSignature: "completeInboundQueuedTransfer"
   ): TypedContractMethod<
-    [nativeTokenTransfer: NativeTokenTransferCodec.NativeTokenTransferStruct],
+    [
+      digest: BytesLike,
+      nativeTokenTransfer: NativeTokenTransferCodec.NativeTokenTransferStruct
+    ],
     [void],
     "nonpayable"
   >;
@@ -1076,7 +1089,12 @@ export interface MultiTokenNtt extends BaseContract {
   getFunction(
     nameOrSignature: "receiveMessage"
   ): TypedContractMethod<
-    [sourceChainId: BigNumberish, sender: BytesLike, data: BytesLike],
+    [
+      digest: BytesLike,
+      sourceChainId: BigNumberish,
+      sender: BytesLike,
+      data: BytesLike
+    ],
     [void],
     "nonpayable"
   >;

evm/ts/src/ethers-contracts/1_1_0/factories/GmpManager__factory.ts

@@ -295,7 +295,7 @@ export class EvmMultiTokenNtt<N extends Network, C extends EvmChains>
       })
     );
 
-    // The contract expects the instructions to be sorted by transceiver index.
+    // The contract requires the instructions to be sorted by transceiver index in ascending order.
     instructions.sort((a, b) => a.index - b.index);
 
     return instructions;
@@ -537,11 +537,14 @@ export class EvmMultiTokenNtt<N extends Network, C extends EvmChains>
   }
 
   async *completeInboundQueuedTransfer(
+    fromChain: Chain,
     transceiverMessage: MultiTokenNtt.Message
   ) {
     const { trimmedAmount, token, sender, to } =
       transceiverMessage.payload.data;
 
+    const digest = MultiTokenNtt.messageDigest(fromChain, transceiverMessage);
+
     const transfer: NativeTokenTransferCodec.NativeTokenTransferStruct = {
       amount: trimmedAmount.amount,
       token: {
@@ -558,6 +561,7 @@ export class EvmMultiTokenNtt<N extends Network, C extends EvmChains>
 
     const tx =
       await this.multiTokenNtt.completeInboundQueuedTransfer.populateTransaction(
+        digest,
         transfer
       );
 

evm/ts/src/ethers-contracts/1_1_0/factories/MultiTokenNtt__factory.ts

@@ -39,7 +39,8 @@ export const tokenInfoLayoutItem = {
 } as const;
 
 export const multiTokenNativeTokenTransferLayout = [
-  prefixItem([0x99, 0x4e, 0x54, 0x54]),
+  // bytes4 constant MTT_PREFIX = 0x994D5454;
+  prefixItem([0x99, 0x4d, 0x54, 0x54]),
   { name: "trimmedAmount", ...trimmedAmountItem },
   { name: "token", ...tokenInfoLayoutItem },
   { name: "sender", ...layoutItems.universalAddressItem },

evm/ts/src/multiTokenNtt.ts

@@ -150,6 +150,7 @@ export interface MultiTokenNtt<N extends Network, C extends Chain> {
   ): Promise<MultiTokenNtt.InboundQueuedTransfer | null>;
 
   completeInboundQueuedTransfer(
+    fromChain: Chain,
     transceiverMessage: MultiTokenNtt.Message
   ): AsyncGenerator<UnsignedTransaction<N, C>>;
 

sdk/definitions/src/layouts/multiToken.ts

@@ -597,6 +597,7 @@ export namespace MultiTokenNttRoute {
       multiTokenNtt: receipt.params.normalizedParams.destinationContracts,
     });
     const completeTransfer = ntt.completeInboundQueuedTransfer(
+      receipt.from,
       vaa.payload.nttManagerPayload
     );
     const finalizeTxids = await signSendWait(chain, completeTransfer, signer);
@@ -852,8 +853,8 @@ export namespace MultiTokenNttRoute {
 
       yield receipt;
 
-      // sleep for a few seconds so we don't spam the endpoints
-      await new Promise((resolve) => setTimeout(resolve, 3000));
+      // Sleep for a bit so we don't spam requests
+      await new Promise((resolve) => setTimeout(resolve, 5000));
       leftover -= Date.now() - start;
     }