@across-protocol/sdk 4.1.46-beta.2 → 4.1.46-beta.4

package/src/clients/BundleDataClient/utils/SuperstructUtils.ts

@@ -48,15 +48,11 @@ const V3RelayDataSS = {
   message: string(),
 };
 
-export const SortableEventSS = {
+const SortableEventSS = {
   blockNumber: number(),
+  transactionIndex: number(),
   logIndex: number(),
-
-  txnRef: optional(string()),
-  txnIndex: optional(number()),
-
-  transactionHash: optional(string()),
-  transactionIndex: optional(number()),
+  transactionHash: string(),
 };
 
 const V3DepositSS = {

package/src/clients/HubPoolClient.ts

@@ -884,13 +884,11 @@ export class HubPoolClient extends BaseAbstractClient {
     if (eventsToQuery.includes("CrossChainContractsSet")) {
       for (const event of events["CrossChainContractsSet"]) {
         const args = spreadEventWithBlockNumber(event) as CrossChainContractsSet;
-        const dataToAdd: CrossChainContractsSet = {
+        const dataToAdd = {
           spokePool: args.spokePool,
           blockNumber: args.blockNumber,
-          txnRef: args.txnRef,
+          transactionIndex: args.transactionIndex,
           logIndex: args.logIndex,
-          txnIndex: args.txnIndex,
-          l2ChainId: args.l2ChainId,
         };
         // If the chain is SVM then our `args.spokePool` will be set to the `solanaSpokePool.toAddressUnchecked()` in the
         // hubpool event because our hub deals with `address` types and not byte32. Therefore, we should confirm that the
@@ -948,9 +946,9 @@ export class HubPoolClient extends BaseAbstractClient {
                 l1Token: args.l1Token,
                 l2Token: destinationToken,
                 blockNumber: args.blockNumber,
-                txnIndex: args.txnIndex,
+                transactionIndex: args.transactionIndex,
                 logIndex: args.logIndex,
-                txnRef: args.txnRef,
+                transactionHash: args.transactionHash,
               },
             ]
           );
@@ -996,7 +994,12 @@ export class HubPoolClient extends BaseAbstractClient {
       this.proposedRootBundles.push(
         ...events["ProposeRootBundle"]
           .filter((event) => !this.configOverride.ignoredHubProposedBundles.includes(event.blockNumber))
-          .map((event) => spreadEventWithBlockNumber(event) as ProposedRootBundle)
+          .map((event) => {
+            return {
+              ...spreadEventWithBlockNumber(event),
+              transactionHash: event.transactionHash,
+            } as ProposedRootBundle;
+          })
       );
     }
 

package/src/clients/SpokePoolClient/EVMSpokePoolClient.ts

@@ -19,7 +19,6 @@ import {
 } from "../../utils";
 import {
   EventSearchConfig,
-  logToSortableEvent,
   paginatedEventQuery,
   sortEventsAscendingInPlace,
   spreadEventWithBlockNumber,
@@ -128,7 +127,7 @@ export class EVMSpokePoolClient extends SpokePoolClient {
     }
 
     // Sort all events to ensure they are stored in a consistent order.
-    events.forEach((events) => sortEventsAscendingInPlace(events.map(logToSortableEvent)));
+    events.forEach((events) => sortEventsAscendingInPlace(events));
 
     return {
       success: true,

package/src/clients/SpokePoolClient/SpokePoolClient.ts

@@ -401,7 +401,7 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
 
     // Log any invalid deposits with same deposit id but different params.
     const invalidFillsForDeposit = invalidFills.filter((x) => {
-      const txnUid = `${x.txnRef}:${x.logIndex}`;
+      const txnUid = `${x.transactionHash}:${x.logIndex}`;
       // if txnUid doesn't exist in the invalidFills set, add it now, but log the corresponding fill.
       const newInvalidFill = x.depositId.eq(deposit.depositId) && !this.invalidFills.has(txnUid);
       if (newInvalidFill) {

package/src/clients/mocks/MockConfigStoreClient.ts

@@ -2,14 +2,7 @@ import assert from "assert";
 import winston from "winston";
 import { Contract, ethers } from "ethers";
 import { Log } from "../../interfaces";
-import {
-  getCurrentTime,
-  EventSearchConfig,
-  MakeOptional,
-  isDefined,
-  utf8ToHex,
-  spreadEventWithBlockNumber,
-} from "../../utils";
+import { getCurrentTime, EventSearchConfig, MakeOptional, isDefined, utf8ToHex } from "../../utils";
 import {
   AcrossConfigStoreClient,
   ConfigStoreUpdate,
@@ -99,9 +92,9 @@ export class MockConfigStoreClient extends AcrossConfigStoreClient {
       chainId: this.chainId as number,
       searchEndBlock: this.eventSearchConfig.toBlock || latestBlockSearched,
       events: {
-        updatedGlobalConfigEvents: events["UpdatedGlobalConfig"].map(spreadEventWithBlockNumber),
+        updatedGlobalConfigEvents: events["UpdatedGlobalConfig"],
         globalConfigUpdateTimes,
-        updatedTokenConfigEvents: events["UpdatedTokenConfig"].map(spreadEventWithBlockNumber),
+        updatedTokenConfigEvents: events["UpdatedTokenConfig"],
       },
     });
   }

package/src/clients/mocks/MockSpokePoolClient.ts

@@ -129,7 +129,7 @@ export class MockSpokePoolClient extends EVMSpokePoolClient {
   }
 
   protected _deposit(event: string, deposit: Omit<Deposit, "messageHash"> & Partial<SortableEvent>): Log {
-    const { blockNumber, txnIndex } = deposit;
+    const { blockNumber, transactionIndex } = deposit;
     let { depositId, destinationChainId, inputAmount, outputAmount } = deposit;
     depositId ??= this.numberOfDeposits;
     this.numberOfDeposits = depositId.add(bnOne);
@@ -171,7 +171,7 @@ export class MockSpokePoolClient extends EVMSpokePoolClient {
       topics: topics.map((topic) => topic.toString()),
       args,
       blockNumber,
-      transactionIndex: txnIndex,
+      transactionIndex,
     });
   }
 
@@ -187,7 +187,7 @@ export class MockSpokePoolClient extends EVMSpokePoolClient {
     event: string,
     fill: Omit<Fill, "messageHash"> & { message: string } & Partial<SortableEvent>
   ): Log {
-    const { blockNumber, txnIndex } = fill;
+    const { blockNumber, transactionIndex } = fill;
     let { originChainId, depositId, inputAmount, outputAmount, fillDeadline } = fill;
     originChainId ??= random(1, 42161, false);
     depositId ??= BigNumber.from(random(1, 100_000, false));
@@ -260,7 +260,7 @@ export class MockSpokePoolClient extends EVMSpokePoolClient {
       topics: topics.map((topic) => topic.toString()),
       args,
       blockNumber,
-      transactionIndex: txnIndex,
+      transactionIndex,
     });
   }
 
@@ -335,7 +335,7 @@ export class MockSpokePoolClient extends EVMSpokePoolClient {
         exclusiveRelayer: addressModifier(args.exclusiveRelayer ?? ZERO_ADDRESS),
       },
       blockNumber: request.blockNumber,
-      transactionIndex: request.txnIndex,
+      transactionIndex: request.transactionIndex,
     });
   }
 

package/src/interfaces/Common.ts

@@ -9,9 +9,9 @@ export type Log = _Log & {
 
 export interface SortableEvent {
   blockNumber: number;
-  txnIndex: number;
+  transactionIndex: number;
   logIndex: number;
-  txnRef: string;
+  transactionHash: string;
 }
 
 export interface BigNumberForToken {

package/src/utils/EventUtils.ts

@@ -204,19 +204,13 @@ export function getPaginatedBlockRanges({
   return ranges;
 }
 
-export function logToSortableEvent(log: Log): SortableEvent {
-  return {
-    txnIndex: log.transactionIndex,
-    txnRef: log.transactionHash,
-    logIndex: log.logIndex,
-    blockNumber: log.blockNumber,
-  };
-}
-
 export function spreadEventWithBlockNumber(event: Log): SortableEvent {
   return {
     ...spreadEvent(event.args),
-    ...logToSortableEvent(event),
+    blockNumber: event.blockNumber,
+    transactionIndex: event.transactionIndex,
+    logIndex: event.logIndex,
+    transactionHash: event.transactionHash,
   };
 }
 
@@ -232,8 +226,8 @@ export function sortEventsAscendingInPlace<T extends SortableEvent>(events: T[])
     if (ex.blockNumber !== ey.blockNumber) {
       return ex.blockNumber - ey.blockNumber;
     }
-    if (ex.txnIndex !== ey.txnIndex) {
-      return ex.txnIndex - ey.txnIndex;
+    if (ex.transactionIndex !== ey.transactionIndex) {
+      return ex.transactionIndex - ey.transactionIndex;
     }
     return ex.logIndex - ey.logIndex;
   });
@@ -251,8 +245,8 @@ export function sortEventsDescendingInPlace<T extends SortableEvent>(events: T[]
     if (ex.blockNumber !== ey.blockNumber) {
       return ey.blockNumber - ex.blockNumber;
     }
-    if (ex.txnIndex !== ey.txnIndex) {
-      return ey.txnIndex - ex.txnIndex;
+    if (ex.transactionIndex !== ey.transactionIndex) {
+      return ey.transactionIndex - ex.transactionIndex;
     }
     return ey.logIndex - ex.logIndex;
   });
@@ -263,16 +257,16 @@ export function isEventOlder<T extends SortableEvent>(ex: T, ey: T): boolean {
   if (ex.blockNumber !== ey.blockNumber) {
     return ex.blockNumber < ey.blockNumber;
   }
-  if (ex.txnIndex !== ey.txnIndex) {
-    return ex.txnIndex < ey.txnIndex;
+  if (ex.transactionIndex !== ey.transactionIndex) {
+    return ex.transactionIndex < ey.transactionIndex;
   }
   return ex.logIndex < ey.logIndex;
 }
 
-export function getTransactionRefs(events: SortableEvent[]): string[] {
-  return [...Array.from(new Set(events.map((e) => e.txnRef)))];
+export function getTransactionHashes(events: SortableEvent[]): string[] {
+  return [...Array.from(new Set(events.map((e) => e.transactionHash)))];
 }
 
 export function duplicateEvent(a: SortableEvent, b: SortableEvent): boolean {
-  return a.txnRef === b.txnRef && a.logIndex === b.logIndex;
+  return a.transactionHash === b.transactionHash && a.logIndex === b.logIndex;
 }