fix: complete inbound queued xfer fix

Author: kev1n-peters

evm/ts/src/multiTokenNtt.ts

@@ -31,6 +31,7 @@ import "@wormhole-foundation/sdk-evm-core";
 
 import {
   decodeTrimmedAmount,
+  encodeTrimmedAmount,
   EncodedTrimmedAmount,
   MultiTokenNtt,
   Ntt,
@@ -540,17 +541,21 @@ export class EvmMultiTokenNtt<N extends Network, C extends EvmChains>
     const digest = MultiTokenNtt.messageDigest(fromChain, transceiverMessage);
 
     const transfer: NativeTokenTransferCodec.NativeTokenTransferStruct = {
-      amount: trimmedAmount.amount,
+      amount: encodeTrimmedAmount(trimmedAmount),
       token: {
-        meta: token.meta,
+        meta: {
+          name: encoding.bytes.encode(token.meta.name),
+          symbol: encoding.bytes.encode(token.meta.symbol),
+          decimals: token.meta.decimals,
+        },
         token: {
           chainId: toChainId(token.token.chainId),
           tokenAddress: token.token.tokenAddress.toString(),
         },
       },
       sender: sender.toString(),
       to: to.toString(),
-      additionalPayload: transceiverMessage.payload.data.additionalPayload,
+      additionalPayload: "0x",
     };
 
     const tx =

sdk/definitions/src/trimmedAmount.ts

@@ -13,6 +13,19 @@ export function decodeTrimmedAmount(
   };
 }
 
+export function encodeTrimmedAmount(
+  trimmed: TrimmedAmount
+): EncodedTrimmedAmount {
+  const { amount, decimals } = trimmed;
+  if (decimals < 0 || decimals > 255) {
+    throw new Error("decimals out of range");
+  }
+  if (amount < 0n || amount >= 1n << 64n) {
+    throw new Error("amount out of range");
+  }
+  return (amount << 8n) | BigInt(decimals);
+}
+
 export function untrim(trimmed: TrimmedAmount, toDecimals: number): bigint {
   const { amount, decimals: fromDecimals } = trimmed;
   return scale(amount, fromDecimals, toDecimals);