@across-protocol/sdk 4.2.2-alpha.0 → 4.2.2

package/src/clients/SpokePoolClient/SpokePoolClient.ts

@@ -19,6 +19,7 @@ import {
   validateFillForDeposit,
   chainIsEvm,
   chainIsProd,
+  Address,
 } from "../../utils";
 import { duplicateEvent, sortEventsAscendingInPlace } from "../../utils/EventUtils";
 import { ZERO_ADDRESS } from "../../constants";
@@ -86,6 +87,7 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
   protected relayerRefundExecutions: RelayerRefundExecutionWithBlock[] = [];
   protected configStoreClient: AcrossConfigStoreClient | undefined;
   protected invalidFills: Set<string> = new Set();
+  public spokePoolAddress: Address | undefined;
   public fills: { [OriginChainId: number]: FillWithBlock[] } = {};
 
   /**
@@ -300,10 +302,9 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
    * @param relayData RelayData field for the SlowFill request.
    * @returns The corresponding SlowFillRequest event if found, otherwise undefined.
    */
-  public getSlowFillRequest(
-    relayData: Omit<RelayData, "message"> & { messageHash: string }
-  ): SlowFillRequestWithBlock | undefined {
-    const hash = getRelayEventKey({ ...relayData, destinationChainId: this.chainId });
+  public getSlowFillRequest(relayData: RelayData): SlowFillRequestWithBlock | undefined {
+    const messageHash = getMessageHash(relayData.message);
+    const hash = getRelayEventKey({ ...relayData, messageHash, destinationChainId: this.chainId });
     return this.slowFillRequests[hash];
   }
 
@@ -554,7 +555,7 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
       }
     };
 
-    for (const event of ["FundsDeposited"]) {
+    for (const event of ["V3FundsDeposited", "FundsDeposited"]) {
       if (eventsToQuery.includes(event)) {
         await queryDepositEvents(event);
       }
@@ -582,7 +583,7 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
     };
 
     // Update deposits with speed up requests from depositor.
-    ["RequestedSpeedUpDeposit"].forEach((event) => {
+    ["RequestedSpeedUpV3Deposit", "RequestedSpeedUpDeposit"].forEach((event) => {
       if (eventsToQuery.includes(event)) {
         querySpeedUpDepositEvents(event);
       }
@@ -597,6 +598,10 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
           destinationChainId: this.chainId,
         };
 
+        if (eventName === "RequestedV3SlowFill") {
+          slowFillRequest.messageHash = getMessageHash(slowFillRequest.message);
+        }
+
         const depositHash = getRelayEventKey({ ...slowFillRequest, destinationChainId: this.chainId });
 
         // Sanity check that this event is not a duplicate.
@@ -609,7 +614,7 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
       }
     };
 
-    ["RequestedSlowFill"].forEach((event) => {
+    ["RequestedV3SlowFill", "RequestedSlowFill"].forEach((event) => {
       if (eventsToQuery.includes(event)) {
         queryRequestedSlowFillEvents(event);
       }
@@ -633,6 +638,11 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
           destinationChainId: this.chainId,
         };
 
+        if (eventName === "FilledV3Relay") {
+          fill.messageHash = getMessageHash((event as unknown as { message: string }).message);
+          fill.relayExecutionInfo.updatedMessageHash = getMessageHash(event.relayExecutionInfo.updatedMessage!);
+        }
+
         // Sanity check that this event is not a duplicate.
         const duplicateFill = this.fills[fill.originChainId]?.find((f) => duplicateEvent(fill, f));
         if (duplicateFill) {
@@ -646,7 +656,7 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
     };
 
     // Update observed fills with ingested event data.
-    ["FilledRelay"].forEach((event) => {
+    ["FilledV3Relay", "FilledRelay"].forEach((event) => {
       if (eventsToQuery.includes(event)) {
         queryFilledRelayEvents(event);
       }

package/src/clients/SpokePoolClient/index.ts

@@ -1,10 +1,10 @@
 import { EVMSpokePoolClient } from "./EVMSpokePoolClient";
-import { SvmSpokePoolClient } from "./SVMSpokePoolClient";
+import { SVMSpokePoolClient } from "./SVMSpokePoolClient";
 import { SpokePoolClient } from "./SpokePoolClient";
 
 export { EVMSpokePoolClient } from "./EVMSpokePoolClient";
 export { SpokePoolClient, SpokePoolUpdate } from "./SpokePoolClient";
-export { SvmSpokePoolClient } from "./SVMSpokePoolClient";
+export { SVMSpokePoolClient } from "./SVMSpokePoolClient";
 
 /**
  * Checks if a SpokePoolClient is an EVMSpokePoolClient.
@@ -20,6 +20,6 @@ export function isEVMSpokePoolClient(spokePoolClient: SpokePoolClient): spokePoo
  * @param spokePoolClient The SpokePoolClient to check.
  * @returns True if the SpokePoolClient is an SVMSpokePoolClient, false otherwise.
  */
-export function isSvmSpokePoolClient(spokePoolClient: SpokePoolClient): spokePoolClient is SvmSpokePoolClient {
-  return spokePoolClient instanceof SvmSpokePoolClient;
+export function isSVMSpokePoolClient(spokePoolClient: SpokePoolClient): spokePoolClient is SVMSpokePoolClient {
+  return spokePoolClient instanceof SVMSpokePoolClient;
 }

package/src/clients/index.ts

@@ -6,6 +6,6 @@ export {
 } from "./AcrossConfigStoreClient";
 export { UpdateFailureReason } from "./BaseAbstractClient";
 export { HubPoolClient, LpFeeRequest } from "./HubPoolClient";
-export { SpokePoolClient, SpokePoolUpdate, EVMSpokePoolClient, SvmSpokePoolClient } from "./SpokePoolClient";
+export { SpokePoolClient, SpokePoolUpdate, EVMSpokePoolClient, SVMSpokePoolClient } from "./SpokePoolClient";
 export * as BundleDataClient from "./BundleDataClient";
 export * as mocks from "./mocks";

package/src/clients/mocks/MockSpokePoolClient.ts

@@ -25,6 +25,7 @@ import {
   BigNumber,
   bnZero,
   bnOne,
+  toAddress,
   toBytes32,
   spreadEventWithBlockNumber,
 } from "../../utils";
@@ -84,7 +85,6 @@ export class MockSpokePoolClient extends EVMSpokePoolClient {
       lastDepositId = _depositIds[i];
     }
   }
-
   _getDepositIdAtBlock(blockTag: number): Promise<BigNumber> {
     return Promise.resolve(this.depositIdAtBlock[blockTag]);
   }
@@ -129,6 +129,10 @@ export class MockSpokePoolClient extends EVMSpokePoolClient {
     return this._deposit("FundsDeposited", deposit);
   }
 
+  depositV3(deposit: Omit<Deposit, "messageHash"> & Partial<SortableEvent>): Log {
+    return this._deposit("V3FundsDeposited", deposit);
+  }
+
   protected _deposit(event: string, deposit: Omit<Deposit, "messageHash"> & Partial<SortableEvent>): Log {
     const { blockNumber, txnIndex } = deposit;
     let { depositId, destinationChainId, inputAmount, outputAmount } = deposit;
@@ -136,11 +140,12 @@ export class MockSpokePoolClient extends EVMSpokePoolClient {
     this.numberOfDeposits = depositId.add(bnOne);
 
     destinationChainId ??= random(1, 42161, false);
-    const depositor = toBytes32(deposit.depositor ?? randomAddress());
-    const recipient = toBytes32(deposit.recipient ?? depositor);
-    const inputToken = toBytes32(deposit.inputToken ?? randomAddress());
-    const outputToken = toBytes32(deposit.outputToken ?? inputToken);
-    const exclusiveRelayer = toBytes32(deposit.exclusiveRelayer ?? ZERO_ADDRESS);
+    const addressModifier = event === "FundsDeposited" ? toBytes32 : toAddress;
+    const depositor = addressModifier(deposit.depositor ?? randomAddress());
+    const recipient = addressModifier(deposit.recipient ?? depositor);
+    const inputToken = addressModifier(deposit.inputToken ?? randomAddress());
+    const outputToken = addressModifier(deposit.outputToken ?? inputToken);
+    const exclusiveRelayer = addressModifier(deposit.exclusiveRelayer ?? ZERO_ADDRESS);
 
     inputAmount ??= toBNWei(random(1, 1000, false));
     outputAmount ??= inputAmount.mul(toBN("0.95"));
@@ -175,13 +180,17 @@ export class MockSpokePoolClient extends EVMSpokePoolClient {
     });
   }
 
-  fillRelay(fill: Omit<Fill, "messageHash"> & { message?: string } & Partial<SortableEvent>): Log {
+  fillV3Relay(fill: Omit<Fill, "messageHash"> & { message: string } & Partial<SortableEvent>): Log {
+    return this._fillRelay("FilledV3Relay", fill);
+  }
+
+  fillRelay(fill: Omit<Fill, "messageHash"> & { message: string } & Partial<SortableEvent>): Log {
     return this._fillRelay("FilledRelay", fill);
   }
 
   protected _fillRelay(
     event: string,
-    fill: Omit<Fill, "messageHash"> & { message?: string } & Partial<SortableEvent>
+    fill: Omit<Fill, "messageHash"> & { message: string } & Partial<SortableEvent>
   ): Log {
     const { blockNumber, txnIndex } = fill;
     let { originChainId, depositId, inputAmount, outputAmount, fillDeadline } = fill;
@@ -191,14 +200,15 @@ export class MockSpokePoolClient extends EVMSpokePoolClient {
     outputAmount ??= inputAmount;
     fillDeadline ??= getCurrentTime() + 60;
 
-    const depositor = toBytes32(fill.depositor ?? randomAddress());
-    const recipient = toBytes32(fill.recipient ?? depositor);
-    const inputToken = toBytes32(fill.inputToken ?? randomAddress());
-    const outputToken = toBytes32(fill.outputToken ?? ZERO_ADDRESS);
-    const exclusiveRelayer = toBytes32(fill.exclusiveRelayer ?? ZERO_ADDRESS);
-    const relayer = toBytes32(fill.relayer ?? randomAddress());
+    const addressModifier = event === "FilledRelay" ? toBytes32 : toAddress;
+    const depositor = addressModifier(fill.depositor ?? randomAddress());
+    const recipient = addressModifier(fill.recipient ?? depositor);
+    const inputToken = addressModifier(fill.inputToken ?? randomAddress());
+    const outputToken = addressModifier(fill.outputToken ?? ZERO_ADDRESS);
+    const exclusiveRelayer = addressModifier(fill.exclusiveRelayer ?? ZERO_ADDRESS);
+    const relayer = addressModifier(fill.relayer ?? randomAddress());
 
-    const topics = [originChainId, depositId, relayer];
+    const topics = [originChainId, depositId, relayer]; // @todo verify
     const message = fill.message ?? EMPTY_MESSAGE;
     const updatedMessage = fill.relayExecutionInfo?.updatedMessage ?? message;
 
@@ -229,14 +239,25 @@ export class MockSpokePoolClient extends EVMSpokePoolClient {
       },
     };
 
-    const args = {
-      ..._args,
-      messageHash: getMessageHash(message),
-      relayExecutionInfo: {
-        ...relayExecutionInfo,
-        updatedMessageHash: getMessageHash(updatedMessage),
-      },
-    };
+    const args =
+      event === "FilledRelay"
+        ? {
+            ..._args,
+            messageHash: getMessageHash(message),
+            relayExecutionInfo: {
+              ...relayExecutionInfo,
+              updatedMessageHash: getMessageHash(updatedMessage),
+            },
+          }
+        : {
+            // FilledV3Relay
+            ..._args,
+            message,
+            relayExecutionInfo: {
+              ...relayExecutionInfo,
+              updatedMessage,
+            },
+          };
 
     return this.eventManager.generateEvent({
       event,
@@ -248,12 +269,17 @@ export class MockSpokePoolClient extends EVMSpokePoolClient {
     });
   }
 
+  speedUpV3Deposit(speedUp: SpeedUp): Log {
+    return this._speedUpDeposit("RequestedSpeedUpV3Deposit", speedUp);
+  }
+
   speedUpDeposit(speedUp: SpeedUp): Log {
     return this._speedUpDeposit("RequestedSpeedUpDeposit", speedUp);
   }
 
   protected _speedUpDeposit(event: string, speedUp: SpeedUp): Log {
-    const depositor = toBytes32(speedUp.depositor);
+    const addressModifier = event === "RequestedSpeedUpDeposit" ? toBytes32 : toAddress;
+    const depositor = addressModifier(speedUp.depositor);
     const topics = [speedUp.depositId, depositor];
     const args = { ...speedUp };
 
@@ -264,7 +290,7 @@ export class MockSpokePoolClient extends EVMSpokePoolClient {
       args: {
         ...args,
         depositor,
-        updatedRecipient: toBytes32(speedUp.updatedRecipient),
+        updatedRecipient: addressModifier(speedUp.updatedRecipient),
       },
     });
   }
@@ -282,19 +308,24 @@ export class MockSpokePoolClient extends EVMSpokePoolClient {
     });
   }
 
-  requestSlowFill(request: Omit<SlowFillRequest, "destinationChainId"> & Partial<SortableEvent>): Log {
+  requestV3SlowFill(request: Omit<SlowFillRequest, "messageHash"> & Partial<SortableEvent>): Log {
+    return this._requestSlowFill("RequestedV3SlowFill", request);
+  }
+
+  requestSlowFill(request: Omit<SlowFillRequest, "messageHash"> & Partial<SortableEvent>): Log {
     return this._requestSlowFill("RequestedSlowFill", request);
   }
 
   protected _requestSlowFill(
     event: string,
-    request: Omit<SlowFillRequest, "destinationChainId"> & Partial<SortableEvent>
+    request: Omit<SlowFillRequest, "messageHash"> & Partial<SortableEvent>
   ): Log {
     const { originChainId, depositId } = request;
     const topics = [originChainId, depositId];
     const args = { ...request };
 
-    const depositor = toBytes32(args.depositor ?? randomAddress());
+    const addressModifier = event === "RequestedSlowFill" ? toBytes32 : toAddress;
+    const depositor = addressModifier(args.depositor ?? randomAddress());
 
     return this.eventManager.generateEvent({
       event,
@@ -302,21 +333,20 @@ export class MockSpokePoolClient extends EVMSpokePoolClient {
       topics: topics.map((topic) => topic.toString()),
       args: {
         ...args,
-        destinationChainId: this.chainId,
         depositor,
-        recipient: toBytes32(args.recipient ?? depositor),
-        inputToken: toBytes32(args.inputToken ?? randomAddress()),
-        outputToken: toBytes32(args.outputToken ?? ZERO_ADDRESS),
-        exclusiveRelayer: toBytes32(args.exclusiveRelayer ?? ZERO_ADDRESS),
+        recipient: addressModifier(args.recipient ?? depositor),
+        inputToken: addressModifier(args.inputToken ?? randomAddress()),
+        outputToken: addressModifier(args.outputToken ?? ZERO_ADDRESS),
+        exclusiveRelayer: addressModifier(args.exclusiveRelayer ?? ZERO_ADDRESS),
       },
       blockNumber: request.blockNumber,
       transactionIndex: request.txnIndex,
     });
   }
 
-  // This is a simple wrapper around fillRelay().
+  // This is a simple wrapper around fillV3Relay().
   // rootBundleId and proof are discarded here - we have no interest in verifying that.
-  executeSlowRelayLeaf(leaf: Omit<SlowFillLeaf, "messageHash">): Log {
+  executeV3SlowRelayLeaf(leaf: Omit<SlowFillLeaf, "messageHash">): Log {
     const fill = {
       ...leaf.relayData,
       destinationChainId: this.chainId,
@@ -331,7 +361,7 @@ export class MockSpokePoolClient extends EVMSpokePoolClient {
       },
     };
 
-    return this.fillRelay(fill);
+    return this.fillV3Relay(fill);
   }
 
   executeRelayerRefundLeaf(refund: RelayerRefundExecution & Partial<SortableEvent>): Log {

package/src/clients/mocks/MockSvmSpokePoolClient.ts

@@ -3,7 +3,7 @@ import { SvmSpokeClient } from "@across-protocol/contracts";
 import { Address } from "@solana/kit";
 import { DepositWithBlock, RelayerRefundExecution, SortableEvent, SlowFillLeaf, Log } from "../../interfaces";
 import { getCurrentTime, bnZero, MakeOptional, EventSearchConfig } from "../../utils";
-import { SpokePoolUpdate, SvmSpokePoolClient } from "../SpokePoolClient";
+import { SpokePoolUpdate, SVMSpokePoolClient } from "../SpokePoolClient";
 import { HubPoolClient } from "../HubPoolClient";
 import { EventOverrides } from "./MockEvents";
 import { AcrossConfigStoreClient } from "../AcrossConfigStoreClient";
@@ -12,7 +12,7 @@ import { EventWithData, SvmCpiEventsClient, SVMEventNames, unwrapEventData } fro
 
 // This class replaces internal SpokePoolClient functionality, enabling
 // the user to bypass on-chain queries and inject events directly.
-export class MockSvmSpokePoolClient extends SvmSpokePoolClient {
+export class MockSvmSpokePoolClient extends SVMSpokePoolClient {
   public mockEventsClient: MockSvmCpiEventsClient;
   private destinationTokenForChainOverride: Record<number, string> = {};
 

package/src/constants.ts

@@ -2,10 +2,12 @@ import { constants as ethersConstants } from "ethers";
 import { CHAIN_IDs, TOKEN_SYMBOLS_MAP } from "@across-protocol/constants";
 
 export {
+  CCTP_NO_DOMAIN,
   ChainFamily,
   CHAIN_IDs,
   MAINNET_CHAIN_IDs,
   PUBLIC_NETWORKS,
+  PRODUCTION_NETWORKS,
   TESTNET_CHAIN_IDs,
   TOKEN_SYMBOLS_MAP,
   TOKEN_EQUIVALENCE_REMAPPING,

package/src/interfaces/SpokePool.ts

@@ -1,8 +1,11 @@
 import { SortableEvent } from "./Common";
+import { FilledV3RelayEvent, V3FundsDepositedEvent } from "../typechain";
 import { SpokePoolClient } from "../clients";
 import { BigNumber } from "../utils";
 import { RelayerRefundLeaf } from "./HubPool";
 
+export type { FilledV3RelayEvent, V3FundsDepositedEvent };
+
 export interface RelayData {
   originChainId: number;
   depositor: string;
@@ -90,7 +93,7 @@ export interface SpeedUp {
 
 export interface SpeedUpWithBlock extends SpeedUp, SortableEvent {}
 
-export interface SlowFillRequest extends Omit<RelayData, "message"> {
+export interface SlowFillRequest extends RelayData {
   messageHash: string;
   destinationChainId: number;
 }

package/src/providers/infura.ts

@@ -6,6 +6,7 @@ const MAINNET_CHAIN_IDs = Object.values(_MAINNET_CHAIN_IDs);
 // Chain-specific overrides for when the endpoint name does not match the canonical chain name.
 const endpoints: { [chainId: string]: string } = {
   [CHAIN_IDs.ARBITRUM]: "arbitrum",
+  [CHAIN_IDs.BSC]: "bsc",
 };
 
 export function getURL(chainId: number, apiKey: string, transport: RPCTransport): string {

package/src/utils/BlockFinder.ts

@@ -11,7 +11,6 @@ export type BlockTimeAverage = {
 };
 
 export interface Block {
-  hash: string;
   number: number;
   timestamp: number;
 }

package/src/utils/NetworkUtils.ts

@@ -1,5 +1,12 @@
-import { CCTP_NO_DOMAIN } from "@across-protocol/constants";
-import { ChainFamily, CHAIN_IDs, MAINNET_CHAIN_IDs, PUBLIC_NETWORKS, TESTNET_CHAIN_IDs } from "../constants";
+import {
+  CCTP_NO_DOMAIN,
+  ChainFamily,
+  CHAIN_IDs,
+  MAINNET_CHAIN_IDs,
+  PRODUCTION_NETWORKS,
+  PUBLIC_NETWORKS,
+  TESTNET_CHAIN_IDs,
+} from "../constants";
 
 export const hreNetworks: Record<number, string> = {
   666: "Hardhat1",
@@ -89,24 +96,6 @@ export function chainIsArbitrum(chainId: number): boolean {
   return [CHAIN_IDs.ARBITRUM, CHAIN_IDs.ARBITRUM_SEPOLIA].includes(chainId);
 }
 
-/**
- * Determines whether a chain ID is an Aleph0 implementation
- * @param chainId Chain ID to evaluate
- * @returns True if chainId is an Aleph0 chain, otherwise false.
- */
-export function chainIsAlephZero(chainId: number): boolean {
-  return [CHAIN_IDs.ALEPH_ZERO].includes(chainId);
-}
-
-/**
- * Determines whether a chain ID is a Lens implementation
- * @param chainId Chain ID to evaluate
- * @returns True if chainId is a Lens chain, otherwise false.
- */
-export function chainIsLens(chainId: number): boolean {
-  return [CHAIN_IDs.LENS_SEPOLIA].includes(chainId);
-}
-
 /**
  * Determines whether a chain ID is a Linea implementation.
  * @param chainId Chain ID to evaluate.
@@ -159,7 +148,10 @@ export function chainIsSvm(chainId: number): boolean {
  * @returns True if chainId is a CCTP-bridging enabled chain, otherwise false.
  */
 export function chainIsCCTPEnabled(chainId: number): boolean {
-  return PUBLIC_NETWORKS?.[chainId]?.cctpDomain !== CCTP_NO_DOMAIN;
+  // Add chainIds to cctpExceptions to administratively disable CCTP on a chain.
+  // This is useful if constants has been updated to specify a CCTP domain in advance of it being activated.
+  const cctpExceptions: number[] = [];
+  return PRODUCTION_NETWORKS[chainId]?.cctpDomain !== CCTP_NO_DOMAIN && !cctpExceptions.includes(chainId);
 }
 
 /**