@across-protocol/sdk 4.1.31 → 4.1.32-hotfix.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@across-protocol/sdk",
   "author": "UMA Team",
-  "version": "4.1.31",
+  "version": "4.1.32-hotfix.1",
   "license": "AGPL-3.0",
   "homepage": "https://docs.across.to/reference/sdk",
   "files": [

package/src/clients/BundleDataClient/BundleDataClient.ts

@@ -1551,8 +1551,8 @@ export class BundleDataClient {
           // there are no gaps in block timestamps between bundles.
           const endBlockForChain = Math.min(_endBlockForChain + 1, spokePoolClient.latestBlockSearched);
           const [startTime, _endTime] = [
-            await spokePoolClient.getTimeAt(startBlockForChain),
-            await spokePoolClient.getTimeAt(endBlockForChain),
+            await spokePoolClient.getTimestampForBlock(startBlockForChain),
+            await spokePoolClient.getTimestampForBlock(endBlockForChain),
           ];
           // @dev similar to reasoning above to ensure no gaps between bundle block range timestamps and also
           // no overlap, subtract 1 from the end time.

package/src/clients/SpokePoolClient.ts

@@ -48,6 +48,7 @@ import {
   findDepositBlock,
   getMaxFillDeadlineInRange as getMaxFillDeadline,
   getTimeAt as _getTimeAt,
+  getTimestampForBlock as _getTimestampForBlock,
   relayFillStatus,
 } from "../utils/SpokeUtils";
 import { BaseAbstractClient, isUpdateFailureReason, UpdateFailureReason } from "./BaseAbstractClient";
@@ -844,11 +845,11 @@ export class SpokePoolClient extends BaseAbstractClient {
   }
 
   /**
-   * Retrieves the SpokePool chain time at a particular block.
+   * Retrieves the time from the SpokePool contract at a particular block.
    * @returns The time at the specified block tag.
    */
   public getTimeAt(blockNumber: number): Promise<number> {
-    return _getTimeAt(this.spokePool.provider, blockNumber);
+    return _getTimeAt(this.spokePool, blockNumber);
   }
 
   /**
@@ -949,6 +950,10 @@ export class SpokePoolClient extends BaseAbstractClient {
     );
   }
 
+  public getTimestampForBlock(blockTag: number): Promise<number> {
+    return _getTimestampForBlock(this.spokePool.provider, blockTag);
+  }
+
   /**
    * Find the amount filled for a deposit at a particular block.
    * @param relayData Deposit information that is used to complete a fill.

package/src/utils/BundleUtils.ts

@@ -74,15 +74,15 @@ export function getImpliedBundleBlockRanges(
 
   // Load all chain indices in order to map bundle evaluation block numbers to enabled chains list.
   const chainIdIndices = configStoreClient.getChainIdIndicesForBlock(rootBundle.blockNumber);
-  const result = rootBundle.bundleEvaluationBlockNumbers.map((endBlock, i) => {
-    const fromBlock = prevRootBundle?.bundleEvaluationBlockNumbers?.[i]
-      ? prevRootBundle.bundleEvaluationBlockNumbers[i].toNumber() + 1
-      : 0;
+  const result = rootBundle.bundleEvaluationBlockNumbers.map((_endBlock, i) => {
+    const endBlock = _endBlock.toNumber();
+    const bundleEndBlock = prevRootBundle?.bundleEvaluationBlockNumbers?.[i]?.toNumber() ?? 0;
+    const fromBlock = bundleEndBlock === endBlock ? endBlock : bundleEndBlock + 1;
     const chainId = chainIdIndices[i];
     if (!enabledChainsAtMainnetStartBlock.includes(chainId)) {
-      return [endBlock.toNumber(), endBlock.toNumber()];
+      return [endBlock, endBlock];
     }
-    return [fromBlock, endBlock.toNumber()];
+    return [fromBlock, endBlock];
   });
 
   // Lastly, sanity check the results to catch errors early:
@@ -91,9 +91,9 @@ export function getImpliedBundleBlockRanges(
   result.forEach(([start, end], i) => {
     const chainId = chainIdIndices[i];
     if (enabledChainsAtMainnetStartBlock.includes(chainId)) {
-      if (start >= end) {
+      if (start > end) {
         throw new Error(
-          `Invalid block range for enabled chain ${chainId}: start block ${start} is greater than or equal to end block ${end}`
+          `Invalid block range for enabled chain ${chainId}: start block ${start} is greater than end block ${end}`
         );
       }
     } else {

package/src/utils/SpokeUtils.ts

@@ -3,7 +3,7 @@ import { BytesLike, Contract, PopulatedTransaction, providers, utils as ethersUt
 import { CHAIN_IDs, MAX_SAFE_DEPOSIT_ID, ZERO_ADDRESS, ZERO_BYTES } from "../constants";
 import { Deposit, FillStatus, FillWithBlock, RelayData } from "../interfaces";
 import { chunk } from "./ArrayUtils";
-import { BigNumber, toBN, bnZero } from "./BigNumberUtils";
+import { bnUint32Max, BigNumber, toBN, bnZero } from "./BigNumberUtils";
 import { keccak256 } from "./common";
 import { isMessageEmpty } from "./DepositUtils";
 import { isDefined } from "./TypeGuards";
@@ -59,10 +59,21 @@ export function populateV3Relay(
 }
 
 /**
- * Retrieves the chain time at a particular block.
+ * Retrieves the time from the SpokePool contract at a particular block.
  * @returns The time at the specified block tag.
  */
-export async function getTimeAt(provider: providers.Provider, blockNumber: number): Promise<number> {
+export async function getTimeAt(spokePool: Contract, blockNumber: number): Promise<number> {
+  const currentTime = await spokePool.getCurrentTime({ blockTag: blockNumber });
+  assert(BigNumber.isBigNumber(currentTime) && currentTime.lt(bnUint32Max));
+  return currentTime.toNumber();
+}
+
+/**
+ * Retrieves the chain time at a particular block.
+ * @note This should be the same as getTimeAt() but can differ in test. These two functions should be consolidated.
+ * @returns The chain time at the specified block tag.
+ */
+export async function getTimestampForBlock(provider: providers.Provider, blockNumber: number): Promise<number> {
   const block = await provider.getBlock(blockNumber);
   return block.timestamp;
 }