@across-protocol/sdk 4.1.45 → 4.1.46-beta.1

package/src/utils/EventUtils.ts

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

package/src/utils/TokenUtils.ts

@@ -147,6 +147,8 @@ export function getUsdcSymbol(l2Token: string, chainId: number): string | undefi
 }
 
 export function getL1TokenInfo(l2TokenAddress: string, chainId: number): L1Token {
+  if (chainId === CHAIN_IDs.MAINNET)
+    throw new Error("chainId should be an L2 chainId because many mappings re-use the same L1 token address");
   const tokenObject = Object.values(TOKEN_SYMBOLS_MAP).find(({ addresses }) => addresses[chainId] === l2TokenAddress);
   const l1TokenAddress = tokenObject?.addresses[CHAIN_IDs.MAINNET];
   if (!l1TokenAddress) {