chore: resync epic branch with master

e2e/queries.e2e.ts

@@ -28,11 +28,7 @@ describe("Queries", function () {
       undefined,
       process.env.COINGECKO_PRO_API_KEY
     );
-    await Promise.all([
-      arbitrumQueries.getGasCosts(),
-      arbitrumQueries.getTokenDecimals("USDC"),
-      arbitrumQueries.getTokenPrice("USDC"),
-    ]);
+    await Promise.all([arbitrumQueries.getGasCosts(), arbitrumQueries.getTokenPrice("USDC")]);
   });
   it("Boba", async function () {
     const provider = new providers.JsonRpcProvider(process.env.NODE_URL_288);
@@ -44,11 +40,7 @@ describe("Queries", function () {
       undefined,
       process.env.COINGECKO_PRO_API_KEY
     );
-    await Promise.all([
-      bobaQueries.getGasCosts(),
-      bobaQueries.getTokenDecimals("USDC"),
-      bobaQueries.getTokenPrice("USDC"),
-    ]);
+    await Promise.all([bobaQueries.getGasCosts(), bobaQueries.getTokenPrice("USDC")]);
   });
   it("Ethereum", async function () {
     const provider = new providers.JsonRpcProvider(process.env.NODE_URL_1);
@@ -60,11 +52,7 @@ describe("Queries", function () {
       undefined,
       process.env.COINGECKO_PRO_API_KEY
     );
-    await Promise.all([
-      ethereumQueries.getGasCosts(),
-      ethereumQueries.getTokenDecimals("USDC"),
-      ethereumQueries.getTokenPrice("USDC"),
-    ]);
+    await Promise.all([ethereumQueries.getGasCosts(), ethereumQueries.getTokenPrice("USDC")]);
   });
   it("Optimism", async function () {
     const provider = new providers.JsonRpcProvider(process.env.NODE_URL_10);
@@ -76,11 +64,7 @@ describe("Queries", function () {
       undefined,
       process.env.COINGECKO_PRO_API_KEY
     );
-    await Promise.all([
-      optimismQueries.getGasCosts(),
-      optimismQueries.getTokenDecimals("USDC"),
-      optimismQueries.getTokenPrice("USDC"),
-    ]);
+    await Promise.all([optimismQueries.getGasCosts(), optimismQueries.getTokenPrice("USDC")]);
   });
   it("Polygon", async function () {
     const provider = new providers.JsonRpcProvider(process.env.NODE_URL_137);
@@ -92,10 +76,6 @@ describe("Queries", function () {
       undefined,
       process.env.COINGECKO_PRO_API_KEY
     );
-    await Promise.all([
-      polygonQueries.getGasCosts(),
-      polygonQueries.getTokenDecimals("USDC"),
-      polygonQueries.getTokenPrice("USDC"),
-    ]);
+    await Promise.all([polygonQueries.getGasCosts(), polygonQueries.getTokenPrice("USDC")]);
   });
 });

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@across-protocol/sdk",
   "author": "UMA Team",
-  "version": "4.1.44",
+  "version": "4.1.62",
   "license": "AGPL-3.0",
   "homepage": "https://docs.across.to/reference/sdk",
   "files": [
@@ -104,8 +104,8 @@
   },
   "dependencies": {
     "@across-protocol/across-token": "^1.0.0",
-    "@across-protocol/constants": "^3.1.51",
-    "@across-protocol/contracts": "^4.0.5",
+    "@across-protocol/constants": "^3.1.64",
+    "@across-protocol/contracts": "^4.0.9",
     "@coral-xyz/anchor": "^0.30.1",
     "@eth-optimism/sdk": "^3.3.1",
     "@ethersproject/bignumber": "^5.7.0",

src/arch/svm/SpokeUtils.ts

@@ -1,6 +1,5 @@
 import {
   SvmAddress,
-  getTokenInformationFromAddress,
   BigNumber,
   isDefined,
   isUnsafeDepositId,
@@ -10,6 +9,7 @@ import {
   keccak256,
   chainIsSvm,
   chunk,
+  getTokenInfo,
 } from "../../utils";
 import { SvmSpokeClient } from "@across-protocol/contracts";
 import { getStatePda, SvmCpiEventsClient, getFillStatusPda, unwrapEventData, getEventAuthority } from "./";
@@ -32,6 +32,7 @@ import assert from "assert";
 import { Logger } from "winston";
 import { fetchState, decodeFillStatusAccount } from "@across-protocol/contracts/dist/src/svm/clients/SvmSpoke";
 import { SVMEventNames, SVMProvider } from "./types";
+import { CHAIN_IDs } from "../../constants";
 
 /**
  * @param spokePool SpokePool Contract instance.
@@ -383,7 +384,7 @@ export async function createApproveInstruction(
 
   // If no mint decimals were supplied, then assign it to whatever value we have in TOKEN_SYMBOLS_MAP.
   // If this token is not in TOKEN_SYMBOLS_MAP, then throw an error.
-  mintDecimals ??= getTokenInformationFromAddress(mint.toBase58())?.decimals;
+  mintDecimals ??= getTokenInfo(mint.toBase58(), CHAIN_IDs.SOLANA)?.decimals;
   if (!isDefined(mintDecimals)) {
     throw new Error(`No mint decimals found for token ${mint.toBase58()}`);
   }

src/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.ts

@@ -24,7 +24,6 @@ import {
   DisabledChainsUpdate,
   GlobalConfigUpdate,
   LiteChainsIdListUpdate,
-  Log,
   ParsedTokenConfig,
   RateModelUpdate,
   RouteRateModelUpdate,
@@ -43,8 +42,8 @@ type ConfigStoreUpdateSuccess = {
   chainId: number;
   searchEndBlock: number;
   events: {
-    updatedTokenConfigEvents: Log[];
-    updatedGlobalConfigEvents: Log[];
+    updatedTokenConfigEvents: SortableEvent[];
+    updatedGlobalConfigEvents: SortableEvent[];
     globalConfigUpdateTimes: number[];
   };
 };
@@ -341,8 +340,13 @@ export class AcrossConfigStoreClient extends BaseAbstractClient {
       paginatedEventQuery(this.configStore, this.configStore.filters.UpdatedGlobalConfig(), searchConfig),
     ]);
 
+    const updatedTokenConfigSortableEvents = updatedTokenConfigEvents.map(spreadEventWithBlockNumber);
+    const updatedGlobalConfigSortableEvents = updatedGlobalConfigEvents.map(spreadEventWithBlockNumber);
+
     // Events *should* normally be received in ascending order, but explicitly enforce the ordering.
-    [updatedTokenConfigEvents, updatedGlobalConfigEvents].forEach((events) => sortEventsAscendingInPlace(events));
+    [updatedTokenConfigSortableEvents, updatedGlobalConfigSortableEvents].forEach((events) =>
+      sortEventsAscendingInPlace(events)
+    );
 
     const globalConfigUpdateTimes = (
       await Promise.all(updatedGlobalConfigEvents.map((event) => this.configStore.provider.getBlock(event.blockNumber)))
@@ -353,8 +357,8 @@ export class AcrossConfigStoreClient extends BaseAbstractClient {
       chainId,
       searchEndBlock: searchConfig.to,
       events: {
-        updatedTokenConfigEvents,
-        updatedGlobalConfigEvents,
+        updatedTokenConfigEvents: updatedTokenConfigSortableEvents,
+        updatedGlobalConfigEvents: updatedGlobalConfigSortableEvents,
         globalConfigUpdateTimes,
       },
     };
@@ -380,13 +384,11 @@ export class AcrossConfigStoreClient extends BaseAbstractClient {
     // Save new TokenConfig updates.
     for (const event of updatedTokenConfigEvents) {
       // If transaction hash is known to be invalid, skip it immediately to avoid creating extra logs.
-      if (KNOWN_INVALID_TOKEN_CONFIG_UPDATE_HASHES.includes(event.transactionHash.toLowerCase())) {
+      if (KNOWN_INVALID_TOKEN_CONFIG_UPDATE_HASHES.includes(event.txnRef.toLowerCase())) {
         continue;
       }
 
-      const args = {
-        ...(spreadEventWithBlockNumber(event) as TokenConfig),
-      };
+      const args = event as TokenConfig;
 
       try {
         const { rateModel, routeRateModel, spokeTargetBalances } = this.validateTokenConfigUpdate(args);
@@ -418,7 +420,7 @@ export class AcrossConfigStoreClient extends BaseAbstractClient {
           this.logger.debug({
             at: "ConfigStoreClient::update",
             message: `Skipping invalid historical update at block ${event.blockNumber}`,
-            transactionHash: event.transactionHash,
+            txnRef: event.txnRef,
           });
         }
         continue;
@@ -427,7 +429,7 @@ export class AcrossConfigStoreClient extends BaseAbstractClient {
 
     // Save new Global config updates.
     for (let i = 0; i < updatedGlobalConfigEvents.length; i++) {
-      const args = spreadEventWithBlockNumber(updatedGlobalConfigEvents[i]) as SortableEvent & {
+      const args = updatedGlobalConfigEvents[i] as SortableEvent & {
         key: string;
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         value: any;
@@ -562,7 +564,7 @@ export class AcrossConfigStoreClient extends BaseAbstractClient {
     rateModel: string | undefined;
     routeRateModel: RouteRateModelUpdate["routeRateModel"];
   } {
-    const { value, key, transactionHash } = args;
+    const { value, key, txnRef } = args;
     const parsedValue = parseJSONWithNumericString(value) as ParsedTokenConfig;
     const l1Token = key;
 
@@ -578,7 +580,7 @@ export class AcrossConfigStoreClient extends BaseAbstractClient {
       const rateModel = parsedValue.rateModel;
       assert(
         this.isValidRateModel(rateModel),
-        `Invalid rateModel UBar for ${l1Token} at transaction ${transactionHash}, ${JSON.stringify(rateModel)}`
+        `Invalid rateModel UBar for ${l1Token} at transaction ${txnRef}, ${JSON.stringify(rateModel)}`
       );
       rateModelForToken = JSON.stringify(rateModel);
 
@@ -601,7 +603,7 @@ export class AcrossConfigStoreClient extends BaseAbstractClient {
           Object.entries(parsedValue.routeRateModel).map(([path, routeRateModel]) => {
             assert(
               this.isValidRateModel(routeRateModel) &&
-                `Invalid routeRateModel UBar for ${path} for ${l1Token} at transaction ${transactionHash}, ${JSON.stringify(
+                `Invalid routeRateModel UBar for ${path} for ${l1Token} at transaction ${txnRef}, ${JSON.stringify(
                   routeRateModel
                 )}`
             );