fix: Correct V3Fill type definition

Identified by Nick in a separate PR. It's proposed separately here because it's a standalone fix that's easy to review and merge now.
across-protocol · Feb 12, 2024 · d2b0ccb · d2b0ccb
1 parent 04be894
commit d2b0ccb
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 37 deletions.
diff --git a/src/clients/mocks/MockSpokePoolClient.ts b/src/clients/mocks/MockSpokePoolClient.ts
@@ -323,11 +323,11 @@ export class MockSpokePoolClient extends SpokePoolClient {
       depositor: fill.depositor ?? randomAddress(),
       recipient,
       message,
-      updatableRelayData: {
-        updatedRecipient: fill.updatableRelayData?.recipient ?? recipient,
-        updatedMessage: fill.updatableRelayData?.message ?? message,
-        updatedOutputAmount: fill.updatableRelayData?.outputAmount ?? outputAmount,
-        fillType: fill.updatableRelayData?.fillType ?? FillType.FastFill,
+      relayExecutionInfo: {
+        updatedRecipient: fill.relayExecutionInfo?.recipient ?? recipient,
+        updatedMessage: fill.relayExecutionInfo?.message ?? message,
+        updatedOutputAmount: fill.relayExecutionInfo?.outputAmount ?? outputAmount,
+        fillType: fill.relayExecutionInfo?.fillType ?? FillType.FastFill,
       },
     };
 
@@ -392,7 +392,7 @@ export class MockSpokePoolClient extends SpokePoolClient {
       destinationChainId: this.chainId,
       relayer: ZERO_ADDRESS,
       repaymentChainId: 0,
-      updatableRelayData: {
+      relayExecutionInfo: {
         recipient: leaf.relayData.recipient,
         outputAmount: leaf.updatedOutputAmount,
         message: leaf.relayData.message,

diff --git a/src/interfaces/SpokePool.ts b/src/interfaces/SpokePool.ts
@@ -105,7 +105,7 @@ export interface V3Fill extends V3RelayData {
   destinationChainId: number;
   relayer: string;
   repaymentChainId: number;
-  updatableRelayData: V3RelayExecutionEventInfo;
+  relayExecutionInfo: V3RelayExecutionEventInfo;
 }
 
 export interface V2FillWithBlock extends V2Fill, SortableEvent {}

diff --git a/src/interfaces/UBA.ts b/src/interfaces/UBA.ts
diff --git a/src/interfaces/index.ts b/src/interfaces/index.ts
@@ -3,7 +3,6 @@ export * from "./ConfigStore";
 export * from "./HubPool";
 export * from "./SpokePool";
 export * from "./Bridge";
-export * from "./UBA";
 export * from "./Error";
 export * from "./TypedData";
 export * from "./CachingMechanism";
diff --git a/src/utils/V3Utils.ts b/src/utils/V3Utils.ts
@@ -85,7 +85,7 @@ export function isV3RelayData<T extends MinV3RelayData, U extends MinV2RelayData
 }
 
 export function isSlowFill(fill: Fill): boolean {
-  return isV2Fill(fill) ? fill.updatableRelayData.isSlowRelay : fill.updatableRelayData.fillType === FillType.SlowFill;
+  return isV2Fill(fill) ? fill.updatableRelayData.isSlowRelay : fill.relayExecutionInfo.fillType === FillType.SlowFill;
 }
 
 type MinV2SlowFillLeaf = Pick<V2SlowFillLeaf, "payoutAdjustmentPct">;

diff --git a/test/utils/SpokePoolUtils.ts b/test/utils/SpokePoolUtils.ts
@@ -57,7 +57,7 @@ export function v3FillFromDeposit(deposit: V3DepositWithBlock, relayer: string):
     // Caller can modify these later.
     exclusiveRelayer: relayer,
     repaymentChainId: deposit.destinationChainId,
-    updatableRelayData: {
+    relayExecutionInfo: {
       recipient: deposit.updatedRecipient ?? recipient,
       message: deposit.updatedMessage ?? message,
       outputAmount: deposit.updatedOutputAmount ?? deposit.outputAmount,