@across-protocol/sdk 4.1.45-beta.0 → 4.1.45-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/clients/BundleDataClient/BundleDataClient.js +13 -11
- package/dist/cjs/clients/BundleDataClient/BundleDataClient.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/DataworkerUtils.js +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/DataworkerUtils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/FillUtils.d.ts +2 -3
- package/dist/cjs/clients/BundleDataClient/utils/FillUtils.js +13 -13
- package/dist/cjs/clients/BundleDataClient/utils/FillUtils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/PoolRebalanceUtils.d.ts +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/PoolRebalanceUtils.js +2 -2
- package/dist/cjs/clients/BundleDataClient/utils/PoolRebalanceUtils.js.map +1 -1
- package/dist/cjs/clients/HubPoolClient.d.ts +1 -2
- package/dist/cjs/clients/HubPoolClient.js +0 -5
- package/dist/cjs/clients/HubPoolClient.js.map +1 -1
- package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.js +6 -5
- package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/BundleDataClient.js +13 -11
- package/dist/esm/clients/BundleDataClient/BundleDataClient.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/DataworkerUtils.js +1 -1
- package/dist/esm/clients/BundleDataClient/utils/DataworkerUtils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/FillUtils.d.ts +2 -3
- package/dist/esm/clients/BundleDataClient/utils/FillUtils.js +13 -13
- package/dist/esm/clients/BundleDataClient/utils/FillUtils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/PoolRebalanceUtils.d.ts +1 -1
- package/dist/esm/clients/BundleDataClient/utils/PoolRebalanceUtils.js +2 -2
- package/dist/esm/clients/BundleDataClient/utils/PoolRebalanceUtils.js.map +1 -1
- package/dist/esm/clients/HubPoolClient.d.ts +1 -16
- package/dist/esm/clients/HubPoolClient.js +0 -20
- package/dist/esm/clients/HubPoolClient.js.map +1 -1
- package/dist/esm/clients/SpokePoolClient/SpokePoolClient.js +7 -6
- package/dist/esm/clients/SpokePoolClient/SpokePoolClient.js.map +1 -1
- package/dist/types/clients/BundleDataClient/BundleDataClient.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/DataworkerUtils.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/FillUtils.d.ts +2 -3
- package/dist/types/clients/BundleDataClient/utils/FillUtils.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/PoolRebalanceUtils.d.ts +1 -1
- package/dist/types/clients/BundleDataClient/utils/PoolRebalanceUtils.d.ts.map +1 -1
- package/dist/types/clients/HubPoolClient.d.ts +1 -16
- package/dist/types/clients/HubPoolClient.d.ts.map +1 -1
- package/dist/types/clients/SpokePoolClient/SpokePoolClient.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/clients/BundleDataClient/BundleDataClient.ts +19 -12
- package/src/clients/BundleDataClient/utils/DataworkerUtils.ts +7 -1
- package/src/clients/BundleDataClient/utils/FillUtils.ts +23 -18
- package/src/clients/BundleDataClient/utils/PoolRebalanceUtils.ts +3 -2
- package/src/clients/HubPoolClient.ts +3 -24
- package/src/clients/SpokePoolClient/SpokePoolClient.ts +17 -5
|
@@ -20,6 +20,6 @@ export declare function getNetSendAmountForL1Token(spokePoolTargetBalance: Spoke
|
|
|
20
20
|
export declare function getRunningBalanceForL1Token(spokePoolTargetBalance: SpokePoolTargetBalance, runningBalance: BigNumber): BigNumber;
|
|
21
21
|
export declare function updateRunningBalance(runningBalances: RunningBalances, l2ChainId: number, l1Token: string, updateAmount: BigNumber): void;
|
|
22
22
|
export declare function addLastRunningBalance(latestMainnetBlock: number, runningBalances: RunningBalances, hubPoolClient: HubPoolClient): void;
|
|
23
|
-
export declare function updateRunningBalanceForDeposit(runningBalances: RunningBalances, hubPoolClient: HubPoolClient, deposit: V3DepositWithBlock, updateAmount: BigNumber): void;
|
|
23
|
+
export declare function updateRunningBalanceForDeposit(runningBalances: RunningBalances, hubPoolClient: HubPoolClient, deposit: V3DepositWithBlock, updateAmount: BigNumber, mainnetBundleEndBlock: number): void;
|
|
24
24
|
export declare function constructPoolRebalanceLeaves(latestMainnetBlock: number, runningBalances: RunningBalances, realizedLpFees: RunningBalances, configStoreClient: AcrossConfigStoreClient, maxL1TokenCount?: number): PoolRebalanceLeaf[];
|
|
25
25
|
//# sourceMappingURL=PoolRebalanceUtils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PoolRebalanceUtils.d.ts","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/utils/PoolRebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC1G,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,SAAS,EAA4B,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,eAAe,EAAE,eAAe,CAAC;IACjC,cAAc,EAAE,eAAe,CAAC;IAChC,MAAM,EAAE,iBAAiB,EAAE,CAAC;IAC5B,IAAI,EAAE,UAAU,CAAC,iBAAiB,CAAC,CAAC;CACrC,CAAC;AAMF,wBAAgB,mCAAmC,CACjD,0CAA0C,EAAE,MAAM,EAAE,EACpD,YAAY,EAAE;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,CAAA;CAAE,EACpD,eAAe,EAAE,MAAM,EAAE,EACzB,OAAO,EAAE,OAAO,EAChB,kBAAkB,EAAE,MAAM,EAC1B,aAAa,EAAE,MAAM,EAAE,GACtB,MAAM,EAAE,EAAE,CAyCZ;AAED,wBAAgB,eAAe,CAAC,kBAAkB,EAAE,MAAM,EAAE,GAAG,OAAO,CAErE;AAID,wBAAgB,mCAAmC,CACjD,cAAc,EAAE,SAAS,EACzB,sBAAsB,EAAE,sBAAsB,GAC7C,SAAS,CAyBX;AAMD,wBAAgB,0BAA0B,CACxC,sBAAsB,EAAE,sBAAsB,EAC9C,cAAc,EAAE,SAAS,GACxB,SAAS,CAEX;AAED,wBAAgB,2BAA2B,CACzC,sBAAsB,EAAE,sBAAsB,EAC9C,cAAc,EAAE,SAAS,GACxB,SAAS,CAGX;AAED,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,SAAS,GACtB,IAAI,CAWN;AAED,wBAAgB,qBAAqB,CACnC,kBAAkB,EAAE,MAAM,EAC1B,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,aAAa,GAC3B,IAAI,CAaN;AAED,wBAAgB,8BAA8B,CAC5C,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE,kBAAkB,EAC3B,YAAY,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"PoolRebalanceUtils.d.ts","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/utils/PoolRebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC1G,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,SAAS,EAA4B,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,eAAe,EAAE,eAAe,CAAC;IACjC,cAAc,EAAE,eAAe,CAAC;IAChC,MAAM,EAAE,iBAAiB,EAAE,CAAC;IAC5B,IAAI,EAAE,UAAU,CAAC,iBAAiB,CAAC,CAAC;CACrC,CAAC;AAMF,wBAAgB,mCAAmC,CACjD,0CAA0C,EAAE,MAAM,EAAE,EACpD,YAAY,EAAE;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,CAAA;CAAE,EACpD,eAAe,EAAE,MAAM,EAAE,EACzB,OAAO,EAAE,OAAO,EAChB,kBAAkB,EAAE,MAAM,EAC1B,aAAa,EAAE,MAAM,EAAE,GACtB,MAAM,EAAE,EAAE,CAyCZ;AAED,wBAAgB,eAAe,CAAC,kBAAkB,EAAE,MAAM,EAAE,GAAG,OAAO,CAErE;AAID,wBAAgB,mCAAmC,CACjD,cAAc,EAAE,SAAS,EACzB,sBAAsB,EAAE,sBAAsB,GAC7C,SAAS,CAyBX;AAMD,wBAAgB,0BAA0B,CACxC,sBAAsB,EAAE,sBAAsB,EAC9C,cAAc,EAAE,SAAS,GACxB,SAAS,CAEX;AAED,wBAAgB,2BAA2B,CACzC,sBAAsB,EAAE,sBAAsB,EAC9C,cAAc,EAAE,SAAS,GACxB,SAAS,CAGX;AAED,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,SAAS,GACtB,IAAI,CAWN;AAED,wBAAgB,qBAAqB,CACnC,kBAAkB,EAAE,MAAM,EAC1B,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,aAAa,GAC3B,IAAI,CAaN;AAED,wBAAgB,8BAA8B,CAC5C,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE,kBAAkB,EAC3B,YAAY,EAAE,SAAS,EACvB,qBAAqB,EAAE,MAAM,GAC5B,IAAI,CAON;AAED,wBAAgB,4BAA4B,CAC1C,kBAAkB,EAAE,MAAM,EAC1B,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,eAAe,EAC/B,iBAAiB,EAAE,uBAAuB,EAC1C,eAAe,CAAC,EAAE,MAAM,GACvB,iBAAiB,EAAE,CAuDrB"}
|
|
@@ -72,22 +72,7 @@ export declare class HubPoolClient extends BaseAbstractClient {
|
|
|
72
72
|
getSpokePoolActivationBlock(chain: number, spokePool: string): number | undefined;
|
|
73
73
|
getL2TokenForL1TokenAtBlock(l1Token: string, destinationChainId: number, latestHubBlock?: number): string;
|
|
74
74
|
getL1TokenForL2TokenAtBlock(l2Token: string, destinationChainId: number, latestHubBlock?: number): string;
|
|
75
|
-
|
|
76
|
-
* Returns the L1 token that should be used for an L2 Bridge event. This function is
|
|
77
|
-
* designed to be used by the caller to associate the L2 token with its mapped L1 token
|
|
78
|
-
* at the HubPool equivalent block number of the L2 event.
|
|
79
|
-
* @param deposit Deposit event
|
|
80
|
-
* @param returns string L1 token counterpart for Deposit
|
|
81
|
-
*/
|
|
82
|
-
getL1TokenForDeposit(deposit: Pick<DepositWithBlock, "originChainId" | "inputToken" | "quoteBlockNumber">): string;
|
|
83
|
-
/**
|
|
84
|
-
* Returns the L2 token that should be used as a counterpart to a deposit event. For example, the caller
|
|
85
|
-
* might want to know what the refund token will be on l2ChainId for the deposit event.
|
|
86
|
-
* @param l2ChainId Chain where caller wants to get L2 token counterpart for
|
|
87
|
-
* @param event Deposit event
|
|
88
|
-
* @returns string L2 token counterpart on l2ChainId
|
|
89
|
-
*/
|
|
90
|
-
getL2TokenForDeposit(deposit: Pick<DepositWithBlock, "originChainId" | "destinationChainId" | "inputToken" | "quoteBlockNumber">, l2ChainId?: number): string;
|
|
75
|
+
protected getL1TokenForDeposit(deposit: Pick<DepositWithBlock, "originChainId" | "inputToken" | "quoteBlockNumber">): string;
|
|
91
76
|
l2TokenEnabledForL1Token(l1Token: string, destinationChainId: number): boolean;
|
|
92
77
|
l2TokenEnabledForL1TokenAtBlock(l1Token: string, destinationChainId: number, hubBlockNumber: number): boolean;
|
|
93
78
|
l2TokenHasPoolRebalanceRoute(l2Token: string, l2ChainId: number, hubPoolBlock?: number): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HubPoolClient.d.ts","sourceRoot":"","sources":["../../../src/clients/HubPoolClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"HubPoolClient.d.ts","sourceRoot":"","sources":["../../../src/clients/HubPoolClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SpokePoolClient.d.ts","sourceRoot":"","sources":["../../../../src/clients/SpokePoolClient/SpokePoolClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SpokePoolClient.d.ts","sourceRoot":"","sources":["../../../../src/clients/SpokePoolClient/SpokePoolClient.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EACL,SAAS,EACT,SAAS,EAET,gBAAgB,EAChB,mBAAmB,EACnB,iBAAiB,EAEjB,YAAY,EAWb,MAAM,aAAa,CAAC;AAQrB,OAAO,EACL,OAAO,EACP,gBAAgB,EAChB,IAAI,EACJ,UAAU,EACV,aAAa,EACb,GAAG,EACH,SAAS,EACT,+BAA+B,EAC/B,wBAAwB,EACxB,wBAAwB,EACxB,gBAAgB,EAChB,aAAa,EACd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAChF,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAErE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,MAAM,sBAAsB,GAAG;IACnC,OAAO,EAAE,IAAI,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AACF,MAAM,MAAM,sBAAsB,GAAG;IACnC,OAAO,EAAE,KAAK,CAAC;IACf,MAAM,EAAE,mBAAmB,CAAC;CAC7B,CAAC;AACF,MAAM,MAAM,eAAe,GAAG,sBAAsB,GAAG,sBAAsB,CAAC;AAE9E,eAAO,MAAM,eAAe,UAa3B,CAAC;AAEF;;;GAGG;AACH,8BAAsB,eAAgB,SAAQ,kBAAkB;IAwB5D,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM;IAE/B,QAAQ,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI;IAC5C,QAAQ,CAAC,OAAO,EAAE,MAAM;IACjB,eAAe,EAAE,MAAM;IA3BhC,SAAS,CAAC,WAAW,SAAK;IAC1B,SAAS,CAAC,aAAa,EAAE;QAAE,CAAC,WAAW,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAC1E,SAAS,CAAC,sBAAsB,EAAE;QAAE,CAAC,WAAW,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;KAAE,CAAM;IACrF,SAAS,CAAC,oBAAoB,EAAE;QAAE,CAAC,WAAW,EAAE,MAAM,GAAG,aAAa,EAAE,CAAA;KAAE,CAAM;IAChF,SAAS,CAAC,QAAQ,EAAE;QAAE,CAAC,gBAAgB,EAAE,MAAM,GAAG;YAAE,CAAC,SAAS,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;SAAE,CAAA;KAAE,CAAM;IACrG,SAAS,CAAC,gBAAgB,EAAE;QAAE,CAAC,aAAa,EAAE,MAAM,GAAG,wBAAwB,CAAA;KAAE,CAAM;IACvF,SAAS,CAAC,aAAa,EAAE;QAAE,CAAC,WAAW,EAAE,MAAM,GAAG;YAAE,CAAC,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAA;SAAE,CAAA;KAAE,CAAM;IACnG,SAAS,CAAC,aAAa,EAAE,aAAa,EAAE,CAAM;IAC9C,SAAS,CAAC,gBAAgB,EAAE,wBAAwB,EAAE,CAAM;IAC5D,SAAS,CAAC,uBAAuB,EAAE,+BAA+B,EAAE,CAAM;IAC1E,SAAS,CAAC,iBAAiB,EAAE,uBAAuB,GAAG,SAAS,CAAC;IACjE,SAAS,CAAC,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;IACzC,KAAK,EAAE;QAAE,CAAC,aAAa,EAAE,MAAM,GAAG,aAAa,EAAE,CAAA;KAAE,CAAM;IAEhE;;;;;;;OAOG;IACH,SAAS,aACE,MAAM,EAAE,OAAO,CAAC,MAAM,EAEtB,aAAa,EAAE,aAAa,GAAG,IAAI,EACnC,OAAO,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,EAC9B,iBAAiB,GAAE,YAAY,CAAC,iBAAiB,EAAE,SAAS,CAAyC;IAQvG;;;;OAIG;IACI,8BAA8B,CAAC,kBAAkB,EAAE,MAAM,GAAG,gBAAgB,EAAE;IAIrF;;;;;;OAMG;IACH,OAAO,CAAC,qBAAqB;IAK7B;;;;;;OAMG;IACI,4CAA4C,CAAC,kBAAkB,EAAE,MAAM,GAAG,gBAAgB,EAAE;IASnG;;;;OAIG;IACI,WAAW,CAAC,MAAM,CAAC,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,gBAAgB,EAAE;IAUvF;;;OAGG;IACI,gBAAgB,IAAI,aAAa,EAAE;IAI1C;;;OAGG;IACI,gBAAgB,IAAI;QAAE,CAAC,WAAW,EAAE,MAAM,GAAG;YAAE,CAAC,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAA;SAAE,CAAA;KAAE;IAI/F;;;OAGG;IACI,QAAQ,IAAI,aAAa,EAAE;IAIlC;;;;OAIG;IACI,sBAAsB,CAAC,aAAa,EAAE,MAAM,GAAG,aAAa,EAAE;IAIrE;;;;OAIG;IACI,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,EAAE;IAI3D;;;;;OAKG;IACI,wBAAwB,CAAC,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,aAAa,EAAE;IAI5F;;;OAGG;IACI,mBAAmB,IAAI,wBAAwB,EAAE;IAIxD;;;OAGG;IACI,qBAAqB,IAAI,MAAM;IAMtC;;;OAGG;IACI,0BAA0B,IAAI,+BAA+B,EAAE;IAItE;;;;OAIG;IACI,kCAAkC,CAAC,OAAO,EAAE,gBAAgB,GAAG,gBAAgB;IAgCtF;;;;;OAKG;IACI,UAAU,CAAC,SAAS,EAAE,SAAS,GAAG,gBAAgB,GAAG,SAAS;IAIrE;;;OAGG;IACI,mBAAmB,IAAI,wBAAwB,EAAE;IAIxD;;;;OAIG;IACI,kBAAkB,CAAC,SAAS,EAAE,SAAS,GAAG,wBAAwB,GAAG,SAAS;IAMrF;;;;OAIG;IACI,iCAAiC,CAAC,aAAa,EAAE,MAAM,GAAG,wBAAwB,EAAE;IAI3F;;;OAGG;IACI,WAAW,IAAI;QAAE,CAAC,gBAAgB,EAAE,MAAM,GAAG;YAAE,CAAC,SAAS,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;SAAE,CAAA;KAAE;IAIjG;;;;OAIG;IACI,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,gBAAgB,GAAG,SAAS;IAM3D,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,aAAa,EAAE;IAI5D;;;;;;OAMG;IACI,gCAAgC,CAAC,OAAO,EAAE,OAAO,GAAG;QACzD,cAAc,EAAE,SAAS,CAAC;QAC1B,SAAS,EAAE,MAAM,CAAC;QAClB,YAAY,EAAE,aAAa,EAAE,CAAC;KAC/B;IA2FD;;;;;;OAMG;IACI,cAAc,CAAC,KAAK,EAAE;QAAE,SAAS,EAAE,SAAS,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM;IAIrF,SAAS,CAAC,gCAAgC,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO;IAuB9E;;;;;;;OAOG;IACU,MAAM,CAAC,aAAa,WAA8B,GAAG,OAAO,CAAC,IAAI,CAAC;IAgO/E;;;;OAIG;IACH,SAAS,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI5D;;;;OAIG;IACH,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAAE,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAO9F;;;;OAIG;IACH,SAAS,CAAC,6BAA6B,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM;IAgB1E;;;;;OAKG;IACH,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,SAAS;IAIxE;;;OAGG;IACI,cAAc,IAAI,MAAM;IAI/B;;;;;OAKG;IACH,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO;IAI/D;;;;;OAKG;IACH,SAAS,CAAC,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO;IAUpE;;;OAGG;aACa,oBAAoB,IAAI,MAAM,EAAE;IAEhD;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC;IAE7E;;;;;;;;;;;;OAYG;aACa,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAEhG;;;;OAIG;aACa,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAEvE;;;OAGG;aACa,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAE/D;;;;;OAKG;aACa,WAAW,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAE/E;;;;;OAKG;aACa,eAAe,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC;IAExG;;;;;OAKG;aACa,eAAe,CAC7B,SAAS,EAAE,SAAS,EAAE,EACtB,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,GAC3B,OAAO,CAAC,CAAC,UAAU,GAAG,SAAS,CAAC,EAAE,CAAC;CACvC"}
|
package/package.json
CHANGED
|
@@ -359,6 +359,7 @@ export class BundleDataClient {
|
|
|
359
359
|
// @dev This helper function should probably be moved to the InventoryClient
|
|
360
360
|
async getApproximateRefundsForBlockRange(chainIds: number[], blockRanges: number[][]): Promise<CombinedRefunds> {
|
|
361
361
|
const refundsForChain: CombinedRefunds = {};
|
|
362
|
+
const bundleEndBlockForMainnet = blockRanges[0][1];
|
|
362
363
|
for (const chainId of chainIds) {
|
|
363
364
|
if (this.spokePoolClients[chainId] === undefined) {
|
|
364
365
|
continue;
|
|
@@ -401,7 +402,8 @@ export class BundleDataClient {
|
|
|
401
402
|
_fill,
|
|
402
403
|
spokeClient.spokePool.provider,
|
|
403
404
|
matchingDeposit,
|
|
404
|
-
this.clients.hubPoolClient
|
|
405
|
+
this.clients.hubPoolClient,
|
|
406
|
+
bundleEndBlockForMainnet
|
|
405
407
|
);
|
|
406
408
|
if (!isDefined(fill)) {
|
|
407
409
|
return;
|
|
@@ -410,9 +412,9 @@ export class BundleDataClient {
|
|
|
410
412
|
{
|
|
411
413
|
...fill,
|
|
412
414
|
fromLiteChain: matchingDeposit.fromLiteChain,
|
|
413
|
-
quoteBlockNumber: matchingDeposit.quoteBlockNumber,
|
|
414
415
|
},
|
|
415
|
-
this.clients.hubPoolClient
|
|
416
|
+
this.clients.hubPoolClient,
|
|
417
|
+
bundleEndBlockForMainnet
|
|
416
418
|
);
|
|
417
419
|
// Assume that lp fees are 0 for the sake of speed. In the future we could batch compute
|
|
418
420
|
// these or make hardcoded assumptions based on the origin-repayment chain direction. This might result
|
|
@@ -675,6 +677,7 @@ export class BundleDataClient {
|
|
|
675
677
|
}
|
|
676
678
|
|
|
677
679
|
const chainIds = this.clients.configStoreClient.getChainIdIndicesForBlock(blockRangesForChains[0][0]);
|
|
680
|
+
const bundleEndBlockForMainnet = blockRangesForChains[0][1];
|
|
678
681
|
|
|
679
682
|
if (blockRangesForChains.length > chainIds.length) {
|
|
680
683
|
throw new Error(
|
|
@@ -711,7 +714,7 @@ export class BundleDataClient {
|
|
|
711
714
|
deposit.originChainId,
|
|
712
715
|
deposit.outputToken,
|
|
713
716
|
deposit.destinationChainId,
|
|
714
|
-
|
|
717
|
+
bundleEndBlockForMainnet
|
|
715
718
|
) &&
|
|
716
719
|
// Cannot slow fill from or to a lite chain.
|
|
717
720
|
!deposit.fromLiteChain &&
|
|
@@ -910,7 +913,8 @@ export class BundleDataClient {
|
|
|
910
913
|
fill,
|
|
911
914
|
destinationClient.spokePool.provider,
|
|
912
915
|
deposits[0],
|
|
913
|
-
this.clients.hubPoolClient
|
|
916
|
+
this.clients.hubPoolClient,
|
|
917
|
+
bundleEndBlockForMainnet
|
|
914
918
|
);
|
|
915
919
|
if (!isDefined(fillToRefund)) {
|
|
916
920
|
bundleUnrepayableFillsV3.push(fill);
|
|
@@ -1014,7 +1018,8 @@ export class BundleDataClient {
|
|
|
1014
1018
|
fill,
|
|
1015
1019
|
destinationClient.spokePool.provider,
|
|
1016
1020
|
matchedDeposit,
|
|
1017
|
-
this.clients.hubPoolClient
|
|
1021
|
+
this.clients.hubPoolClient,
|
|
1022
|
+
bundleEndBlockForMainnet
|
|
1018
1023
|
);
|
|
1019
1024
|
if (!isDefined(fillToRefund)) {
|
|
1020
1025
|
bundleUnrepayableFillsV3.push(fill);
|
|
@@ -1194,7 +1199,8 @@ export class BundleDataClient {
|
|
|
1194
1199
|
fill,
|
|
1195
1200
|
destinationClient.spokePool.provider,
|
|
1196
1201
|
deposits[0],
|
|
1197
|
-
this.clients.hubPoolClient
|
|
1202
|
+
this.clients.hubPoolClient,
|
|
1203
|
+
bundleEndBlockForMainnet
|
|
1198
1204
|
);
|
|
1199
1205
|
if (!isDefined(fillToRefund)) {
|
|
1200
1206
|
bundleUnrepayableFillsV3.push(fill);
|
|
@@ -1250,7 +1256,8 @@ export class BundleDataClient {
|
|
|
1250
1256
|
prefill,
|
|
1251
1257
|
destinationClient.spokePool.provider,
|
|
1252
1258
|
deposit,
|
|
1253
|
-
this.clients.hubPoolClient
|
|
1259
|
+
this.clients.hubPoolClient,
|
|
1260
|
+
bundleEndBlockForMainnet
|
|
1254
1261
|
);
|
|
1255
1262
|
if (!isDefined(verifiedFill)) {
|
|
1256
1263
|
bundleUnrepayableFillsV3.push(prefill);
|
|
@@ -1387,9 +1394,9 @@ export class BundleDataClient {
|
|
|
1387
1394
|
{
|
|
1388
1395
|
...fill,
|
|
1389
1396
|
fromLiteChain: matchedDeposit.fromLiteChain,
|
|
1390
|
-
quoteBlockNumber: matchedDeposit.quoteBlockNumber,
|
|
1391
1397
|
},
|
|
1392
|
-
this.clients.hubPoolClient
|
|
1398
|
+
this.clients.hubPoolClient,
|
|
1399
|
+
bundleEndBlockForMainnet
|
|
1393
1400
|
);
|
|
1394
1401
|
return {
|
|
1395
1402
|
...fill,
|
|
@@ -1434,9 +1441,9 @@ export class BundleDataClient {
|
|
|
1434
1441
|
{
|
|
1435
1442
|
...fill,
|
|
1436
1443
|
fromLiteChain: associatedDeposit.fromLiteChain,
|
|
1437
|
-
quoteBlockNumber: associatedDeposit.quoteBlockNumber,
|
|
1438
1444
|
},
|
|
1439
|
-
this.clients.hubPoolClient
|
|
1445
|
+
this.clients.hubPoolClient,
|
|
1446
|
+
bundleEndBlockForMainnet
|
|
1440
1447
|
);
|
|
1441
1448
|
updateBundleFillsV3(bundleFillsV3, fill, realizedLpFeePct, chainToSendRefundTo, repaymentToken, fill.relayer);
|
|
1442
1449
|
});
|
|
@@ -233,7 +233,13 @@ export function _buildPoolRebalanceRoot(
|
|
|
233
233
|
) {
|
|
234
234
|
return;
|
|
235
235
|
}
|
|
236
|
-
updateRunningBalanceForDeposit(
|
|
236
|
+
updateRunningBalanceForDeposit(
|
|
237
|
+
runningBalances,
|
|
238
|
+
clients.hubPoolClient,
|
|
239
|
+
deposit,
|
|
240
|
+
deposit.inputAmount.mul(-1),
|
|
241
|
+
mainnetBundleEndBlock
|
|
242
|
+
);
|
|
237
243
|
});
|
|
238
244
|
});
|
|
239
245
|
});
|
|
@@ -9,7 +9,7 @@ import { HubPoolClient } from "../../HubPoolClient";
|
|
|
9
9
|
* @notice FillRepaymentInformation is a fill with additional properties required to determine where it can
|
|
10
10
|
* be repaid.
|
|
11
11
|
*/
|
|
12
|
-
type FillRepaymentInformation = Fill & {
|
|
12
|
+
type FillRepaymentInformation = Fill & { fromLiteChain: boolean };
|
|
13
13
|
|
|
14
14
|
/**
|
|
15
15
|
* @notice Return repayment chain and repayment token for a fill, but does not verify if the returned
|
|
@@ -20,12 +20,13 @@ type FillRepaymentInformation = Fill & { quoteBlockNumber: number; fromLiteChain
|
|
|
20
20
|
*/
|
|
21
21
|
export function getRefundInformationFromFill(
|
|
22
22
|
relayData: FillRepaymentInformation,
|
|
23
|
-
hubPoolClient: HubPoolClient
|
|
23
|
+
hubPoolClient: HubPoolClient,
|
|
24
|
+
bundleEndBlockForMainnet: number
|
|
24
25
|
): {
|
|
25
26
|
chainToSendRefundTo: number;
|
|
26
27
|
repaymentToken: string;
|
|
27
28
|
} {
|
|
28
|
-
const chainToSendRefundTo = _getRepaymentChainId(relayData, hubPoolClient);
|
|
29
|
+
const chainToSendRefundTo = _getRepaymentChainId(relayData, hubPoolClient, bundleEndBlockForMainnet);
|
|
29
30
|
if (chainToSendRefundTo === relayData.originChainId) {
|
|
30
31
|
return {
|
|
31
32
|
chainToSendRefundTo,
|
|
@@ -39,13 +40,13 @@ export function getRefundInformationFromFill(
|
|
|
39
40
|
const l1TokenCounterpart = hubPoolClient.getL1TokenForL2TokenAtBlock(
|
|
40
41
|
relayData.inputToken,
|
|
41
42
|
relayData.originChainId,
|
|
42
|
-
|
|
43
|
+
bundleEndBlockForMainnet
|
|
43
44
|
);
|
|
44
45
|
|
|
45
46
|
const repaymentToken = hubPoolClient.getL2TokenForL1TokenAtBlock(
|
|
46
47
|
l1TokenCounterpart,
|
|
47
48
|
chainToSendRefundTo,
|
|
48
|
-
|
|
49
|
+
bundleEndBlockForMainnet
|
|
49
50
|
);
|
|
50
51
|
return {
|
|
51
52
|
chainToSendRefundTo,
|
|
@@ -66,12 +67,12 @@ export async function verifyFillRepayment(
|
|
|
66
67
|
_fill: FillWithBlock,
|
|
67
68
|
destinationChainProvider: providers.Provider,
|
|
68
69
|
matchedDeposit: DepositWithBlock,
|
|
69
|
-
hubPoolClient: HubPoolClient
|
|
70
|
+
hubPoolClient: HubPoolClient,
|
|
71
|
+
bundleEndBlockForMainnet: number
|
|
70
72
|
): Promise<FillWithBlock | undefined> {
|
|
71
73
|
const fill = {
|
|
72
74
|
..._.cloneDeep(_fill),
|
|
73
75
|
fromLiteChain: matchedDeposit.fromLiteChain,
|
|
74
|
-
quoteBlockNumber: matchedDeposit.quoteBlockNumber,
|
|
75
76
|
};
|
|
76
77
|
|
|
77
78
|
// Slow fills don't result in repayments so they're always valid.
|
|
@@ -79,7 +80,7 @@ export async function verifyFillRepayment(
|
|
|
79
80
|
return fill;
|
|
80
81
|
}
|
|
81
82
|
|
|
82
|
-
let repaymentChainId = _getRepaymentChainId(fill, hubPoolClient);
|
|
83
|
+
let repaymentChainId = _getRepaymentChainId(fill, hubPoolClient, bundleEndBlockForMainnet);
|
|
83
84
|
|
|
84
85
|
// Repayments will always go to the fill.relayer address so check if its a valid EVM address. If its not, attempt
|
|
85
86
|
// to change it to the msg.sender of the FilledRelay.
|
|
@@ -122,7 +123,11 @@ export async function verifyFillRepayment(
|
|
|
122
123
|
return fill;
|
|
123
124
|
}
|
|
124
125
|
|
|
125
|
-
function _getRepaymentChainId(
|
|
126
|
+
function _getRepaymentChainId(
|
|
127
|
+
relayData: FillRepaymentInformation,
|
|
128
|
+
hubPoolClient: HubPoolClient,
|
|
129
|
+
bundleEndBlockForMainnet: number
|
|
130
|
+
): number {
|
|
126
131
|
if (relayData.fromLiteChain) {
|
|
127
132
|
assert(!isSlowFill(relayData), "getRepaymentChainId: fromLiteChain and slow fill are mutually exclusive");
|
|
128
133
|
return relayData.originChainId;
|
|
@@ -135,7 +140,7 @@ function _getRepaymentChainId(relayData: FillRepaymentInformation, hubPoolClient
|
|
|
135
140
|
}
|
|
136
141
|
|
|
137
142
|
// Repayment chain is valid if the input token and repayment chain are mapped to the same PoolRebalanceRoute.
|
|
138
|
-
const repaymentTokenIsValid = _repaymentChainTokenIsValid(relayData, hubPoolClient);
|
|
143
|
+
const repaymentTokenIsValid = _repaymentChainTokenIsValid(relayData, hubPoolClient, bundleEndBlockForMainnet);
|
|
139
144
|
if (repaymentTokenIsValid) {
|
|
140
145
|
return relayData.repaymentChainId;
|
|
141
146
|
}
|
|
@@ -144,26 +149,26 @@ function _getRepaymentChainId(relayData: FillRepaymentInformation, hubPoolClient
|
|
|
144
149
|
return relayData.originChainId;
|
|
145
150
|
}
|
|
146
151
|
|
|
147
|
-
function _repaymentChainTokenIsValid(
|
|
152
|
+
function _repaymentChainTokenIsValid(
|
|
153
|
+
relayData: FillRepaymentInformation,
|
|
154
|
+
hubPoolClient: HubPoolClient,
|
|
155
|
+
bundleEndBlockForMainnet: number
|
|
156
|
+
): boolean {
|
|
148
157
|
if (
|
|
149
|
-
!hubPoolClient.l2TokenHasPoolRebalanceRoute(
|
|
150
|
-
relayData.inputToken,
|
|
151
|
-
relayData.originChainId,
|
|
152
|
-
relayData.quoteBlockNumber
|
|
153
|
-
)
|
|
158
|
+
!hubPoolClient.l2TokenHasPoolRebalanceRoute(relayData.inputToken, relayData.originChainId, bundleEndBlockForMainnet)
|
|
154
159
|
) {
|
|
155
160
|
return false;
|
|
156
161
|
}
|
|
157
162
|
const l1TokenCounterpart = hubPoolClient.getL1TokenForL2TokenAtBlock(
|
|
158
163
|
relayData.inputToken,
|
|
159
164
|
relayData.originChainId,
|
|
160
|
-
|
|
165
|
+
bundleEndBlockForMainnet
|
|
161
166
|
);
|
|
162
167
|
if (
|
|
163
168
|
!hubPoolClient.l2TokenEnabledForL1TokenAtBlock(
|
|
164
169
|
l1TokenCounterpart,
|
|
165
170
|
relayData.repaymentChainId,
|
|
166
|
-
|
|
171
|
+
bundleEndBlockForMainnet
|
|
167
172
|
)
|
|
168
173
|
) {
|
|
169
174
|
return false;
|
|
@@ -163,12 +163,13 @@ export function updateRunningBalanceForDeposit(
|
|
|
163
163
|
runningBalances: RunningBalances,
|
|
164
164
|
hubPoolClient: HubPoolClient,
|
|
165
165
|
deposit: V3DepositWithBlock,
|
|
166
|
-
updateAmount: BigNumber
|
|
166
|
+
updateAmount: BigNumber,
|
|
167
|
+
mainnetBundleEndBlock: number
|
|
167
168
|
): void {
|
|
168
169
|
const l1TokenCounterpart = hubPoolClient.getL1TokenForL2TokenAtBlock(
|
|
169
170
|
deposit.inputToken,
|
|
170
171
|
deposit.originChainId,
|
|
171
|
-
|
|
172
|
+
mainnetBundleEndBlock
|
|
172
173
|
);
|
|
173
174
|
updateRunningBalance(runningBalances, deposit.originChainId, l1TokenCounterpart, updateAmount);
|
|
174
175
|
}
|
|
@@ -231,36 +231,15 @@ export class HubPoolClient extends BaseAbstractClient {
|
|
|
231
231
|
return sortEventsDescending(l2Tokens)[0].l1Token;
|
|
232
232
|
}
|
|
233
233
|
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
* at the HubPool equivalent block number of the L2 event.
|
|
238
|
-
* @param deposit Deposit event
|
|
239
|
-
* @param returns string L1 token counterpart for Deposit
|
|
240
|
-
*/
|
|
241
|
-
getL1TokenForDeposit(deposit: Pick<DepositWithBlock, "originChainId" | "inputToken" | "quoteBlockNumber">): string {
|
|
234
|
+
protected getL1TokenForDeposit(
|
|
235
|
+
deposit: Pick<DepositWithBlock, "originChainId" | "inputToken" | "quoteBlockNumber">
|
|
236
|
+
): string {
|
|
242
237
|
// L1-->L2 token mappings are set via PoolRebalanceRoutes which occur on mainnet,
|
|
243
238
|
// so we use the latest token mapping. This way if a very old deposit is filled, the relayer can use the
|
|
244
239
|
// latest L2 token mapping to find the L1 token counterpart.
|
|
245
240
|
return this.getL1TokenForL2TokenAtBlock(deposit.inputToken, deposit.originChainId, deposit.quoteBlockNumber);
|
|
246
241
|
}
|
|
247
242
|
|
|
248
|
-
/**
|
|
249
|
-
* Returns the L2 token that should be used as a counterpart to a deposit event. For example, the caller
|
|
250
|
-
* might want to know what the refund token will be on l2ChainId for the deposit event.
|
|
251
|
-
* @param l2ChainId Chain where caller wants to get L2 token counterpart for
|
|
252
|
-
* @param event Deposit event
|
|
253
|
-
* @returns string L2 token counterpart on l2ChainId
|
|
254
|
-
*/
|
|
255
|
-
getL2TokenForDeposit(
|
|
256
|
-
deposit: Pick<DepositWithBlock, "originChainId" | "destinationChainId" | "inputToken" | "quoteBlockNumber">,
|
|
257
|
-
l2ChainId = deposit.destinationChainId
|
|
258
|
-
): string {
|
|
259
|
-
const l1Token = this.getL1TokenForDeposit(deposit);
|
|
260
|
-
// Use the latest hub block number to find the L2 token counterpart.
|
|
261
|
-
return this.getL2TokenForL1TokenAtBlock(l1Token, l2ChainId, deposit.quoteBlockNumber);
|
|
262
|
-
}
|
|
263
|
-
|
|
264
243
|
l2TokenEnabledForL1Token(l1Token: string, destinationChainId: number): boolean {
|
|
265
244
|
return this.l1TokensToDestinationTokens?.[l1Token]?.[destinationChainId] != undefined;
|
|
266
245
|
}
|
|
@@ -369,11 +369,11 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
|
|
|
369
369
|
const fillRepaymentData = {
|
|
370
370
|
...fill,
|
|
371
371
|
fromLiteChain: deposit.fromLiteChain,
|
|
372
|
-
quoteBlockNumber: this.hubPoolClient!.latestBlockSearched,
|
|
373
372
|
};
|
|
374
373
|
const { chainToSendRefundTo: repaymentChainId } = getRefundInformationFromFill(
|
|
375
374
|
fillRepaymentData,
|
|
376
|
-
this.hubPoolClient
|
|
375
|
+
this.hubPoolClient!,
|
|
376
|
+
this.hubPoolClient!.latestBlockSearched
|
|
377
377
|
);
|
|
378
378
|
// In order to keep this function sync, we can't call verifyFillRepayment so we'll log any fills where
|
|
379
379
|
// the filler-specified repayment chain and repayment address is not a valid repayment upon
|
|
@@ -464,7 +464,11 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
|
|
|
464
464
|
) {
|
|
465
465
|
return false;
|
|
466
466
|
} else {
|
|
467
|
-
const l1Token = this.hubPoolClient?.
|
|
467
|
+
const l1Token = this.hubPoolClient?.getL1TokenForL2TokenAtBlock(
|
|
468
|
+
deposit.inputToken,
|
|
469
|
+
deposit.originChainId,
|
|
470
|
+
deposit.quoteBlockNumber
|
|
471
|
+
);
|
|
468
472
|
return this.hubPoolClient.l2TokenEnabledForL1TokenAtBlock(
|
|
469
473
|
l1Token,
|
|
470
474
|
deposit.destinationChainId,
|
|
@@ -735,8 +739,16 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
|
|
|
735
739
|
if (!this.canResolveZeroAddressOutputToken(deposit)) {
|
|
736
740
|
return ZERO_ADDRESS;
|
|
737
741
|
}
|
|
738
|
-
//
|
|
739
|
-
|
|
742
|
+
// L1 token should be resolved if we get here:
|
|
743
|
+
const l1Token = this.hubPoolClient!.getL1TokenForL2TokenAtBlock(
|
|
744
|
+
deposit.inputToken,
|
|
745
|
+
deposit.originChainId,
|
|
746
|
+
deposit.quoteBlockNumber
|
|
747
|
+
)!;
|
|
748
|
+
return (
|
|
749
|
+
this.hubPoolClient!.getL2TokenForL1TokenAtBlock(l1Token, deposit.destinationChainId, deposit.quoteBlockNumber) ??
|
|
750
|
+
ZERO_ADDRESS
|
|
751
|
+
);
|
|
740
752
|
}
|
|
741
753
|
|
|
742
754
|
/**
|