ntt_solana_watcher: normalize TrimmedAmount

Signed-off-by: bingyuyap <bingyu.yap.21@gmail.com>

Author: bingyuyap

watcher/src/watchers/NTTPayloads.ts

@@ -227,6 +227,16 @@ export class TrimmedAmount {
     buffer.writeBigUInt64BE(amount.amount, 1);
     return buffer;
   }
+
+  normalize(targetDecimals: number): bigint {
+    if (this.decimals === targetDecimals) {
+      return this.amount;
+    } else if (this.decimals > targetDecimals) {
+      return this.amount / BigInt(10 ** (this.decimals - targetDecimals));
+    } else {
+      return this.amount * BigInt(10 ** (targetDecimals - this.decimals));
+    }
+  }
 }
 
 // Another TransceiverMessage struct found in the TransceiverMessageAccount used in some instructions:

watcher/src/watchers/NTTSolanaWatcher.ts

@@ -41,6 +41,7 @@ import {
 import {
   NativeTokenTransfer,
   NttManagerMessage,
+  TrimmedAmount,
   ValidatedTransceiverMessage,
   WormholeTransceiverMessage,
 } from './NTTPayloads';
@@ -194,10 +195,10 @@ export class NTTSolanaWatcher extends SolanaWatcher {
       sender: outboxItemAccount.sender.toBuffer(),
       payload: {
         sourceToken: config.mint.toBuffer(),
-        trimmedAmount: {
-          amount: BigInt(outboxItemAccount.amount.amount.toString()),
-          decimals: outboxItemAccount.amount.decimals,
-        },
+        trimmedAmount: new TrimmedAmount(
+          BigInt(outboxItemAccount.amount.amount.toString()),
+          outboxItemAccount.amount.decimals
+        ),
         recipientChain: outboxItemAccount.recipientChain.id,
         recipientAddress: Buffer.from(outboxItemAccount.recipientAddress),
       },
@@ -213,7 +214,7 @@ export class NTTSolanaWatcher extends SolanaWatcher {
       srcChainId: coalesceChainId(this.chain),
       destChainId: coalesceChainId(nttManagerMessage.payload.recipientChain as ChainId),
       sourceToken: config.mint.toBuffer().toString('hex'),
-      tokenAmount: BigInt(outboxItemAccount.amount.amount.toString()),
+      tokenAmount: nttManagerMessage.payload.trimmedAmount.normalize(8),
       transferSentTxhash: '',
       transferBlockHeight: 0n,
       nttTransferKey: `${this.programId}/${nttManagerMessage.payload.recipientAddress.toString(
@@ -276,7 +277,7 @@ export class NTTSolanaWatcher extends SolanaWatcher {
       srcChainId: transceiverMessage.chainId,
       destChainId: coalesceChainId(this.chain),
       sourceToken: transceiverMessage.ntt_managerPayload.payload.sourceToken.toString('hex'),
-      tokenAmount: transceiverMessage.ntt_managerPayload.payload.trimmedAmount.amount,
+      tokenAmount: transceiverMessage.ntt_managerPayload.payload.trimmedAmount.normalize(8),
       transferSentTxhash: '',
       transferBlockHeight: 0n,
       nttTransferKey: '',
@@ -398,7 +399,7 @@ export class NTTSolanaWatcher extends SolanaWatcher {
         transceiverMessage.ntt_managerPayload.payload.recipientChain as ChainId
       ),
       sourceToken: transceiverMessage.ntt_managerPayload.payload.sourceToken.toString('hex'),
-      tokenAmount: transceiverMessage.ntt_managerPayload.payload.trimmedAmount.amount,
+      tokenAmount: transceiverMessage.ntt_managerPayload.payload.trimmedAmount.normalize(8),
       transferSentTxhash: '',
       transferBlockHeight: 0n,
       nttTransferKey: `${
@@ -455,7 +456,7 @@ export class NTTSolanaWatcher extends SolanaWatcher {
         transceiverMessage.ntt_managerPayload.payload.recipientChain as ChainId
       ),
       sourceToken: transceiverMessage.ntt_managerPayload.payload.sourceToken.toString('hex'),
-      tokenAmount: transceiverMessage.ntt_managerPayload.payload.trimmedAmount.amount,
+      tokenAmount: transceiverMessage.ntt_managerPayload.payload.trimmedAmount.normalize(8),
       transferSentTxhash: transaction.transaction.signatures[0],
       transferBlockHeight: BigInt(transaction.slot),
       nttTransferKey: `${this.programId}/${recipient}/${seq}`,

watcher/src/watchers/__tests__/NTTSolanaWatcher.test.ts

@@ -3,6 +3,7 @@ import { NTTSolanaWatcher } from '../NTTSolanaWatcher';
 import {
   NativeTokenTransfer,
   NttManagerMessage,
+  TrimmedAmount,
   ValidatedTransceiverMessage,
 } from '../NTTPayloads';
 
@@ -234,3 +235,29 @@ test.skip('parseRequestRelay', async () => {
   message = await watcher.parseInstruction(txs[0]!, ix);
   expect(message?.digest).toBe(digests[0]);
 });
+
+test('normalizeToDecimals', () => {
+  const testCases: { name: string; trimmedAmount: TrimmedAmount; expectedAmount: bigint }[] = [
+    {
+      name: 'currentDecimals < targetDecimals',
+      trimmedAmount: new TrimmedAmount(BigInt(1000), 6),
+      expectedAmount: 100000n,
+    },
+    {
+      name: 'currentDecimals > targetDecimals',
+      trimmedAmount: new TrimmedAmount(BigInt(1000000000), 10),
+      expectedAmount: 10000000n,
+    },
+    {
+      name: 'currentDecimals = targetDecimals',
+      trimmedAmount: new TrimmedAmount(BigInt(100000000), 8),
+      expectedAmount: 100000000n,
+    },
+  ];
+
+  for (const testCase of testCases) {
+    const { trimmedAmount, expectedAmount } = testCase;
+    const normalizedAmount = trimmedAmount.normalize(8);
+    expect(normalizedAmount).toBe(expectedAmount);
+  }
+});