Merge branch 'master' into npai/helper-v3

.github/workflows/build.yml

@@ -0,0 +1,14 @@
+name: CI
+on: [push]
+jobs:
+  build:
+    name: Builds
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+      - run: yarn install
+      - run: yarn build
+

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@across-protocol/sdk-v2",
   "author": "UMA Team",
-  "version": "0.20.6",
+  "version": "0.21.0",
   "license": "AGPL-3.0",
   "homepage": "https://docs.across.to/v/developer-docs/developers/across-sdk",
   "files": [

src/clients/mocks/MockSpokePoolClient.ts

@@ -271,9 +271,9 @@ export class MockSpokePoolClient extends SpokePoolClient {
       recipient,
       message,
       updatableRelayData: {
-        recipient: fill.updatableRelayData?.recipient ?? recipient,
-        message: fill.updatableRelayData?.message ?? message,
-        relayerFeePct: fill.updatableRelayData?.relayerFeePct ?? relayerFeePct,
+        updatableRecipient: fill.updatableRelayData?.updatedRecipient ?? recipient,
+        updatableMessage: fill.updatableRelayData?.updatedMessage ?? message,
+        updatedRelayerFeePct: fill.updatableRelayData?.relayerFeePct ?? relayerFeePct,
         isSlowRelay: fill.updatableRelayData?.isSlowRelay ?? false,
         payoutAdjustmentPct: fill.updatableRelayData?.payoutAdjustmentPct ?? bnZero,
       },
@@ -323,9 +323,9 @@ export class MockSpokePoolClient extends SpokePoolClient {
       recipient,
       message,
       relayExecutionInfo: {
-        updatedRecipient: fill.relayExecutionInfo?.recipient ?? recipient,
-        updatedMessage: fill.relayExecutionInfo?.message ?? message,
-        updatedOutputAmount: fill.relayExecutionInfo?.outputAmount ?? outputAmount,
+        updatedRecipient: fill.relayExecutionInfo?.updatedRecipient ?? recipient,
+        updatedMessage: fill.relayExecutionInfo?.updatedMessage ?? message,
+        updatedOutputAmount: fill.relayExecutionInfo?.updatedOutputAmount ?? outputAmount,
         fillType: fill.relayExecutionInfo?.fillType ?? FillType.FastFill,
       },
     };
@@ -392,9 +392,9 @@ export class MockSpokePoolClient extends SpokePoolClient {
       relayer: ZERO_ADDRESS,
       repaymentChainId: 0,
       relayExecutionInfo: {
-        recipient: leaf.relayData.recipient,
-        outputAmount: leaf.updatedOutputAmount,
-        message: leaf.relayData.message,
+        updatedRecipient: leaf.relayData.recipient,
+        updatedOutputAmount: leaf.updatedOutputAmount,
+        updatedMessage: leaf.relayData.message,
         fillType: FillType.SlowFill,
       },
     };

src/interfaces/SpokePool.ts

@@ -66,8 +66,8 @@ export type Deposit = V2Deposit | V3Deposit;
 export type DepositWithBlock = V2DepositWithBlock | V3DepositWithBlock;
 
 export interface RelayExecutionInfoCommon {
-  recipient: string;
-  message: string;
+  updatedRecipient: string;
+  updatedMessage: string;
 }
 
 export interface RelayExecutionInfo extends RelayExecutionInfoCommon {
@@ -89,7 +89,7 @@ export enum FillType {
 }
 
 export interface V3RelayExecutionEventInfo extends RelayExecutionInfoCommon {
-  outputAmount: BigNumber;
+  updatedOutputAmount: BigNumber;
   fillType: FillType;
 }