query rate limit duration

Author: kev1n-peters

wormhole-connect/src/routes/ntt/consts.ts

@@ -294,6 +294,13 @@ export abstract class NttBase extends BaseRoute {
     ).getCurrentInboundCapacity(fromChain);
   }
 
+  async getRateLimitDuration(
+    chain: ChainId | ChainName,
+    nttManagerAddress: string,
+  ): Promise<number> {
+    return await getNttManager(chain, nttManagerAddress).getRateLimitDuration();
+  }
+
   async getInboundQueuedTransfer(
     chain: ChainName | ChainId,
     nttManagerAddress: string,

wormhole-connect/src/routes/ntt/nttBase.ts

@@ -16,7 +16,6 @@ import {
   NotEnoughCapacityError,
   ContractIsPausedError,
 } from '../../errors';
-import { RATE_LIMIT_DURATION } from 'routes/ntt/consts';
 import {
   encodeTransceiverInstructions,
   encodeWormholeTransceiverInstruction,
@@ -137,6 +136,10 @@ export class NttManagerEvm {
     ).toString();
   }
 
+  async getRateLimitDuration(): Promise<number> {
+    return (await this.nttManager.rateLimitDuration()).toNumber();
+  }
+
   async getInboundQueuedTransfer(
     emitterChain: ChainName | ChainId,
     nttManagerMessage: NttManagerMessage<NativeTokenTransfer>,
@@ -147,12 +150,11 @@ export class NttManagerEvm {
     );
     if (queuedTransfer.txTimestamp.gt(0)) {
       const { recipient, amount, txTimestamp } = queuedTransfer;
+      const duration = await this.getRateLimitDuration();
       return {
         recipient: wh.parseAddress(recipient, this.chain),
         amount: amount.toString(),
-        rateLimitExpiryTimestamp: txTimestamp
-          .add(RATE_LIMIT_DURATION)
-          .toNumber(),
+        rateLimitExpiryTimestamp: txTimestamp.add(duration).toNumber(),
       };
     }
     return undefined;

wormhole-connect/src/routes/ntt/platforms/evm/nttManager.ts

@@ -14,13 +14,15 @@ import {
   createAssociatedTokenAccountInstruction,
 } from '@solana/spl-token';
 import { BN } from '@coral-xyz/anchor';
-import { RATE_LIMIT_DURATION } from 'routes/ntt/consts';
 import { parseVaa } from '@certusone/wormhole-sdk/lib/esm';
 import { utils } from 'ethers';
 import { WormholeTransceiverMessage } from '../../payloads/wormhole';
 import { NttManagerMessage } from '../../payloads/common';
 import { NativeTokenTransfer } from '../../payloads/transfers';
 
+// TODO: make sure this is in sync with the contract
+const RATE_LIMIT_DURATION = 24 * 60 * 60;
+
 export class NttManagerSolana {
   readonly ntt: NTT;
   readonly connection: Connection;
@@ -198,7 +200,11 @@ export class NttManagerSolana {
     const {
       rateLimit: { limit, capacityAtLastTx, lastTxTimestamp },
     } = await this.ntt.getOutboxRateLimit();
-    return this.getCurrentCapacity(limit, capacityAtLastTx, lastTxTimestamp);
+    return await this.getCurrentCapacity(
+      limit,
+      capacityAtLastTx,
+      lastTxTimestamp,
+    );
   }
 
   async getCurrentInboundCapacity(
@@ -207,22 +213,38 @@ export class NttManagerSolana {
     const {
       rateLimit: { limit, capacityAtLastTx, lastTxTimestamp },
     } = await this.ntt.getInboxRateLimit(fromChain);
-    return this.getCurrentCapacity(limit, capacityAtLastTx, lastTxTimestamp);
+    return await this.getCurrentCapacity(
+      limit,
+      capacityAtLastTx,
+      lastTxTimestamp,
+    );
   }
 
-  getCurrentCapacity(limit: BN, capacityAtLastTx: BN, lastTxTimestamp: BN) {
+  async getCurrentCapacity(
+    limit: BN,
+    capacityAtLastTx: BN,
+    lastTxTimestamp: BN,
+  ) {
     const timePassed = BN.max(
       new BN(Date.now() / 1000).sub(lastTxTimestamp),
       new BN(0),
     );
+    const duration = await this.getRateLimitDuration();
     const calculatedCapacity = capacityAtLastTx.add(
-      timePassed.mul(limit).div(new BN(RATE_LIMIT_DURATION)),
+      timePassed.mul(limit).div(new BN(duration)),
     );
     return calculatedCapacity.lt(limit)
       ? calculatedCapacity.toString()
       : limit.toString();
   }
 
+  async getRateLimitDuration(): Promise<number> {
+    // TODO: how will solana implement this?
+    // const config = await this.ntt.getConfig();
+    // return config.rateLimitDuration.toNumber();
+    return RATE_LIMIT_DURATION;
+  }
+
   async getInboundQueuedTransfer(
     emitterChain: ChainName | ChainId,
     managerMessage: NttManagerMessage<NativeTokenTransfer>,

wormhole-connect/src/routes/ntt/platforms/solana/nttManager.ts

@@ -23,37 +23,52 @@ const NttInboundCapacityWarning = ({
   fromChain,
 }: Props) => {
   const [capacity, setCapacity] = useState<BigNumber | undefined>(undefined);
-  const managerAddress = TOKENS[token]?.ntt?.nttManager;
+  const [duration, setDuration] = useState<number>(0);
+  const nttManagerAddress = TOKENS[token]?.ntt?.nttManager;
 
   useEffect(() => {
-    if (!chain || !managerAddress || !fromChain) return;
+    if (!chain || !nttManagerAddress || !fromChain) return;
     let active = true;
     const fetchCapacity = async () => {
       try {
         const ntt = new NttManual();
+        const duration = await ntt.getRateLimitDuration(
+          chain,
+          nttManagerAddress,
+        );
+        // if the rate limit duration 0, then rate limiting is disabled
+        if (duration === 0) {
+          if (active) {
+            setCapacity(undefined);
+            setDuration(0);
+          }
+          return;
+        }
         const capacity = await ntt.getCurrentInboundCapacity(
           chain,
-          managerAddress,
+          nttManagerAddress,
           fromChain,
         );
         if (active) {
           setCapacity(capacity ? BigNumber.from(capacity) : undefined);
+          setDuration(duration);
         }
       } catch (error) {
         console.error('Failed to fetch capacity:', error);
         if (active) {
           setCapacity(undefined);
+          setDuration(0);
         }
       }
     };
     fetchCapacity();
     return () => {
       active = false;
     };
-  }, [chain, managerAddress, fromChain]);
+  }, [chain, nttManagerAddress, fromChain]);
 
   const showWarning = useMemo(() => {
-    if (!token || !amount || !chain || !capacity) return;
+    if (!token || !amount || !chain || !capacity || !duration) return;
     const destTokenKey = getNativeVersionOfToken(TOKENS[token].symbol, chain);
     const destToken = TOKENS[destTokenKey];
     if (!destToken) return;
@@ -68,6 +83,7 @@ const NttInboundCapacityWarning = ({
 
   if (!showWarning) return null;
 
+  // TODO: change 24 hours?
   const content = (
     <>
       {`Your transfer to ${