@across-protocol/sdk 3.4.12 → 3.4.14
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 +1 -1
- package/dist/cjs/clients/BundleDataClient/BundleDataClient.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.d.ts +12 -10
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.js +3 -3
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.js.map +1 -1
- package/dist/cjs/clients/SpokePoolClient.d.ts +12 -12
- package/dist/cjs/clients/SpokePoolClient.js +20 -18
- package/dist/cjs/clients/SpokePoolClient.js.map +1 -1
- package/dist/cjs/clients/mocks/MockSpokePoolClient.d.ts +5 -4
- package/dist/cjs/clients/mocks/MockSpokePoolClient.js +7 -7
- package/dist/cjs/clients/mocks/MockSpokePoolClient.js.map +1 -1
- package/dist/cjs/constants.d.ts +2 -2
- package/dist/cjs/constants.js +3 -3
- package/dist/cjs/constants.js.map +1 -1
- package/dist/cjs/interfaces/SpokePool.d.ts +2 -2
- package/dist/cjs/utils/BigNumberUtils.d.ts +1 -0
- package/dist/cjs/utils/BigNumberUtils.js +5 -1
- package/dist/cjs/utils/BigNumberUtils.js.map +1 -1
- package/dist/cjs/utils/CachingUtils.js +1 -1
- package/dist/cjs/utils/CachingUtils.js.map +1 -1
- package/dist/cjs/utils/DepositUtils.js +5 -5
- package/dist/cjs/utils/DepositUtils.js.map +1 -1
- package/dist/cjs/utils/EventUtils.js +4 -0
- package/dist/cjs/utils/EventUtils.js.map +1 -1
- package/dist/cjs/utils/SpokeUtils.d.ts +5 -3
- package/dist/cjs/utils/SpokeUtils.js +18 -11
- package/dist/cjs/utils/SpokeUtils.js.map +1 -1
- package/dist/cjs/utils/ValidatorUtils.js +1 -1
- package/dist/cjs/utils/ValidatorUtils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/BundleDataClient.js +1 -1
- package/dist/esm/clients/BundleDataClient/BundleDataClient.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.d.ts +12 -10
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.js +4 -4
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.js.map +1 -1
- package/dist/esm/clients/SpokePoolClient.d.ts +12 -12
- package/dist/esm/clients/SpokePoolClient.js +21 -19
- package/dist/esm/clients/SpokePoolClient.js.map +1 -1
- package/dist/esm/clients/mocks/MockSpokePoolClient.d.ts +5 -4
- package/dist/esm/clients/mocks/MockSpokePoolClient.js +8 -8
- package/dist/esm/clients/mocks/MockSpokePoolClient.js.map +1 -1
- package/dist/esm/constants.d.ts +2 -2
- package/dist/esm/constants.js +2 -2
- package/dist/esm/constants.js.map +1 -1
- package/dist/esm/interfaces/SpokePool.d.ts +2 -2
- package/dist/esm/utils/BigNumberUtils.d.ts +8 -0
- package/dist/esm/utils/BigNumberUtils.js +10 -0
- package/dist/esm/utils/BigNumberUtils.js.map +1 -1
- package/dist/esm/utils/CachingUtils.js +1 -1
- package/dist/esm/utils/CachingUtils.js.map +1 -1
- package/dist/esm/utils/DepositUtils.js +5 -5
- package/dist/esm/utils/DepositUtils.js.map +1 -1
- package/dist/esm/utils/EventUtils.js +8 -0
- package/dist/esm/utils/EventUtils.js.map +1 -1
- package/dist/esm/utils/SpokeUtils.d.ts +5 -3
- package/dist/esm/utils/SpokeUtils.js +20 -12
- package/dist/esm/utils/SpokeUtils.js.map +1 -1
- package/dist/esm/utils/ValidatorUtils.js +1 -1
- package/dist/esm/utils/ValidatorUtils.js.map +1 -1
- package/dist/types/clients/BundleDataClient/BundleDataClient.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts +12 -10
- package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts.map +1 -1
- package/dist/types/clients/SpokePoolClient.d.ts +12 -12
- package/dist/types/clients/SpokePoolClient.d.ts.map +1 -1
- package/dist/types/clients/mocks/MockSpokePoolClient.d.ts +5 -4
- package/dist/types/clients/mocks/MockSpokePoolClient.d.ts.map +1 -1
- package/dist/types/constants.d.ts +2 -2
- package/dist/types/constants.d.ts.map +1 -1
- package/dist/types/interfaces/SpokePool.d.ts +2 -2
- package/dist/types/interfaces/SpokePool.d.ts.map +1 -1
- package/dist/types/utils/BigNumberUtils.d.ts +8 -0
- package/dist/types/utils/BigNumberUtils.d.ts.map +1 -1
- package/dist/types/utils/EventUtils.d.ts.map +1 -1
- package/dist/types/utils/SpokeUtils.d.ts +5 -3
- package/dist/types/utils/SpokeUtils.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/clients/BundleDataClient/BundleDataClient.ts +5 -1
- package/src/clients/BundleDataClient/utils/SuperstructUtils.ts +4 -2
- package/src/clients/SpokePoolClient.ts +30 -26
- package/src/clients/mocks/MockSpokePoolClient.ts +11 -11
- package/src/constants.ts +2 -2
- package/src/interfaces/SpokePool.ts +2 -2
- package/src/utils/BigNumberUtils.ts +11 -0
- package/src/utils/CachingUtils.ts +1 -1
- package/src/utils/DepositUtils.ts +5 -5
- package/src/utils/EventUtils.ts +8 -0
- package/src/utils/SpokeUtils.ts +30 -17
- package/src/utils/ValidatorUtils.ts +1 -1
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Contract } from "ethers";
|
|
2
2
|
import winston from "winston";
|
|
3
3
|
import { Log, DepositWithBlock, RelayerRefundExecutionWithBlock, SlowFillRequestWithBlock, FillWithBlock, SlowFillLeaf, SpeedUp } from "../../interfaces";
|
|
4
|
+
import { BigNumber } from "../../utils";
|
|
4
5
|
import { SpokePoolClient, SpokePoolUpdate } from "../SpokePoolClient";
|
|
5
6
|
import { HubPoolClient } from "../HubPoolClient";
|
|
6
7
|
import { EventManager, EventOverrides } from "./MockEvents";
|
|
@@ -8,8 +9,8 @@ import { AcrossConfigStoreClient } from "../AcrossConfigStoreClient";
|
|
|
8
9
|
export declare class MockSpokePoolClient extends SpokePoolClient {
|
|
9
10
|
eventManager: EventManager;
|
|
10
11
|
private destinationTokenForChainOverride;
|
|
11
|
-
depositIdAtBlock:
|
|
12
|
-
numberOfDeposits:
|
|
12
|
+
depositIdAtBlock: BigNumber[];
|
|
13
|
+
numberOfDeposits: BigNumber;
|
|
13
14
|
constructor(logger: winston.Logger, spokePool: Contract, chainId: number, deploymentBlock: number, opts?: {
|
|
14
15
|
hubPoolClient: HubPoolClient | null;
|
|
15
16
|
});
|
|
@@ -17,8 +18,8 @@ export declare class MockSpokePoolClient extends SpokePoolClient {
|
|
|
17
18
|
setDestinationTokenForChain(chainId: number, token: string): void;
|
|
18
19
|
getDestinationTokenForDeposit(deposit: DepositWithBlock): string;
|
|
19
20
|
setLatestBlockNumber(blockNumber: number): void;
|
|
20
|
-
setDepositIds(_depositIds:
|
|
21
|
-
_getDepositIdAtBlock(blockTag: number): Promise<
|
|
21
|
+
setDepositIds(_depositIds: BigNumber[]): void;
|
|
22
|
+
_getDepositIdAtBlock(blockTag: number): Promise<BigNumber>;
|
|
22
23
|
_update(eventsToQuery: string[]): Promise<SpokePoolUpdate>;
|
|
23
24
|
readonly eventSignatures: Record<string, string>;
|
|
24
25
|
depositV3(deposit: DepositWithBlock): Log;
|
|
@@ -3,7 +3,7 @@ import assert from "assert";
|
|
|
3
3
|
import { random } from "lodash";
|
|
4
4
|
import { ZERO_ADDRESS } from "../../constants";
|
|
5
5
|
import { FillType, } from "../../interfaces";
|
|
6
|
-
import { toBN, toBNWei, getCurrentTime, randomAddress } from "../../utils";
|
|
6
|
+
import { toBN, toBNWei, getCurrentTime, randomAddress, BigNumber, bnZero, bnOne, bnMax } from "../../utils";
|
|
7
7
|
import { SpokePoolClient } from "../SpokePoolClient";
|
|
8
8
|
import { getEventManager } from "./MockEvents";
|
|
9
9
|
// This class replaces internal SpokePoolClient functionality, enabling
|
|
@@ -16,7 +16,7 @@ var MockSpokePoolClient = /** @class */ (function (_super) {
|
|
|
16
16
|
_this.destinationTokenForChainOverride = {};
|
|
17
17
|
// Allow tester to set the numberOfDeposits() returned by SpokePool at a block height.
|
|
18
18
|
_this.depositIdAtBlock = [];
|
|
19
|
-
_this.numberOfDeposits =
|
|
19
|
+
_this.numberOfDeposits = bnZero;
|
|
20
20
|
// Event signatures. Not strictly required, but they make generated events more recognisable.
|
|
21
21
|
_this.eventSignatures = {
|
|
22
22
|
EnabledDepositRoute: "address,uint256,bool",
|
|
@@ -45,7 +45,7 @@ var MockSpokePoolClient = /** @class */ (function (_super) {
|
|
|
45
45
|
}
|
|
46
46
|
var lastDepositId = _depositIds[0];
|
|
47
47
|
for (var i = 0; i < _depositIds.length; i++) {
|
|
48
|
-
if (_depositIds[i]
|
|
48
|
+
if (_depositIds[i].lt(lastDepositId)) {
|
|
49
49
|
throw new Error("deposit ID must be equal to or greater than previous");
|
|
50
50
|
}
|
|
51
51
|
this.depositIdAtBlock[i] = _depositIds[i];
|
|
@@ -74,10 +74,10 @@ var MockSpokePoolClient = /** @class */ (function (_super) {
|
|
|
74
74
|
});
|
|
75
75
|
// Update latestDepositIdQueried.
|
|
76
76
|
var idx = eventsToQuery.indexOf("V3FundsDeposited");
|
|
77
|
-
var latestDepositId = ((_a = events[idx]) !== null && _a !== void 0 ? _a : []).reduce(function (depositId, event) { var _a; return
|
|
77
|
+
var latestDepositId = ((_a = events[idx]) !== null && _a !== void 0 ? _a : []).reduce(function (depositId, event) { var _a; return bnMax(depositId, (_a = event.args["depositId"]) !== null && _a !== void 0 ? _a : bnZero); }, this.latestDepositIdQueried);
|
|
78
78
|
return Promise.resolve({
|
|
79
79
|
success: true,
|
|
80
|
-
firstDepositId:
|
|
80
|
+
firstDepositId: bnZero,
|
|
81
81
|
latestDepositId: latestDepositId,
|
|
82
82
|
currentTime: currentTime,
|
|
83
83
|
oldestTime: 0,
|
|
@@ -91,8 +91,8 @@ var MockSpokePoolClient = /** @class */ (function (_super) {
|
|
|
91
91
|
var blockNumber = deposit.blockNumber, transactionIndex = deposit.transactionIndex;
|
|
92
92
|
var depositId = deposit.depositId, depositor = deposit.depositor, destinationChainId = deposit.destinationChainId, inputToken = deposit.inputToken, inputAmount = deposit.inputAmount, outputToken = deposit.outputToken, outputAmount = deposit.outputAmount;
|
|
93
93
|
depositId !== null && depositId !== void 0 ? depositId : (depositId = this.numberOfDeposits);
|
|
94
|
-
assert(depositId
|
|
95
|
-
this.numberOfDeposits = depositId
|
|
94
|
+
assert(depositId.gte(this.numberOfDeposits), "".concat(depositId.toString(), " < ").concat(this.numberOfDeposits));
|
|
95
|
+
this.numberOfDeposits = depositId.add(bnOne);
|
|
96
96
|
destinationChainId !== null && destinationChainId !== void 0 ? destinationChainId : (destinationChainId = random(1, 42161, false));
|
|
97
97
|
depositor !== null && depositor !== void 0 ? depositor : (depositor = randomAddress());
|
|
98
98
|
inputToken !== null && inputToken !== void 0 ? inputToken : (inputToken = randomAddress());
|
|
@@ -133,7 +133,7 @@ var MockSpokePoolClient = /** @class */ (function (_super) {
|
|
|
133
133
|
var blockNumber = fill.blockNumber, transactionIndex = fill.transactionIndex;
|
|
134
134
|
var originChainId = fill.originChainId, depositId = fill.depositId, inputToken = fill.inputToken, inputAmount = fill.inputAmount, outputAmount = fill.outputAmount, fillDeadline = fill.fillDeadline, relayer = fill.relayer;
|
|
135
135
|
originChainId !== null && originChainId !== void 0 ? originChainId : (originChainId = random(1, 42161, false));
|
|
136
|
-
depositId !== null && depositId !== void 0 ? depositId : (depositId = random(1, 100000, false));
|
|
136
|
+
depositId !== null && depositId !== void 0 ? depositId : (depositId = BigNumber.from(random(1, 100000, false)));
|
|
137
137
|
inputToken !== null && inputToken !== void 0 ? inputToken : (inputToken = randomAddress());
|
|
138
138
|
inputAmount !== null && inputAmount !== void 0 ? inputAmount : (inputAmount = toBNWei(random(1, 1000, false)));
|
|
139
139
|
outputAmount !== null && outputAmount !== void 0 ? outputAmount : (outputAmount = inputAmount);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MockSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockSpokePoolClient.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAGL,QAAQ,GAOT,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"MockSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockSpokePoolClient.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/constants.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export { ChainFamily, CHAIN_IDs, MAINNET_CHAIN_IDs, PUBLIC_NETWORKS, TESTNET_CHAIN_IDs, TOKEN_SYMBOLS_MAP, } from "@across-protocol/constants";
|
|
2
|
-
export declare const ZERO_ADDRESS: string;
|
|
2
|
+
export declare const ZERO_ADDRESS: string, ZERO_BYTES: string;
|
|
3
3
|
export declare const MAX_SAFE_ALLOWANCE = "79228162514264337593543950335";
|
|
4
4
|
export declare const MAX_SAFE_DEPOSIT_ID = "4294967295";
|
|
5
5
|
export declare const SECONDS_PER_YEAR = 31557600;
|
|
@@ -9,7 +9,7 @@ export declare const SECONDS_PER_YEAR = 31557600;
|
|
|
9
9
|
export declare const HUBPOOL_CHAIN_ID = 1;
|
|
10
10
|
export declare const TRANSFER_THRESHOLD_MAX_CONFIG_STORE_VERSION = 1;
|
|
11
11
|
export declare const ARWEAVE_TAG_APP_NAME = "across-protocol";
|
|
12
|
-
export declare const ARWEAVE_TAG_APP_VERSION =
|
|
12
|
+
export declare const ARWEAVE_TAG_APP_VERSION = 3;
|
|
13
13
|
/**
|
|
14
14
|
* A default list of chain Ids that the protocol supports. This is outlined
|
|
15
15
|
* in the UMIP (https://github.com/UMAprotocol/UMIPs/pull/590) and is used
|
package/dist/esm/constants.js
CHANGED
|
@@ -2,7 +2,7 @@ var _a;
|
|
|
2
2
|
import { constants as ethersConstants } from "ethers";
|
|
3
3
|
import { CHAIN_IDs, TOKEN_SYMBOLS_MAP } from "@across-protocol/constants";
|
|
4
4
|
export { ChainFamily, CHAIN_IDs, MAINNET_CHAIN_IDs, PUBLIC_NETWORKS, TESTNET_CHAIN_IDs, TOKEN_SYMBOLS_MAP, } from "@across-protocol/constants";
|
|
5
|
-
export var ZERO_ADDRESS = ethersConstants.AddressZero;
|
|
5
|
+
export var ZERO_ADDRESS = ethersConstants.AddressZero, ZERO_BYTES = ethersConstants.HashZero;
|
|
6
6
|
// 2^96 - 1 is a conservative erc20 max allowance.
|
|
7
7
|
export var MAX_SAFE_ALLOWANCE = "79228162514264337593543950335";
|
|
8
8
|
// The maximum depositId that can be emitted in a depositV3 method is the maximum uint32 value, so
|
|
@@ -18,7 +18,7 @@ export var TRANSFER_THRESHOLD_MAX_CONFIG_STORE_VERSION = 1;
|
|
|
18
18
|
// A hardcoded identifier used, by default, to tag all Arweave records.
|
|
19
19
|
export var ARWEAVE_TAG_APP_NAME = "across-protocol";
|
|
20
20
|
// A hardcoded version number used, by default, to tag all Arweave records.
|
|
21
|
-
export var ARWEAVE_TAG_APP_VERSION =
|
|
21
|
+
export var ARWEAVE_TAG_APP_VERSION = 3;
|
|
22
22
|
/**
|
|
23
23
|
* A default list of chain Ids that the protocol supports. This is outlined
|
|
24
24
|
* in the UMIP (https://github.com/UMAprotocol/UMIPs/pull/590) and is used
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,IAAI,eAAe,EAAE,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE1E,OAAO,EACL,WAAW,EACX,SAAS,EACT,iBAAiB,EACjB,eAAe,EACf,iBAAiB,EACjB,iBAAiB,GAClB,MAAM,4BAA4B,CAAC;AAEpC,MAAM,CAAS,IAAa,YAAY,GAAK,eAAe,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,IAAI,eAAe,EAAE,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE1E,OAAO,EACL,WAAW,EACX,SAAS,EACT,iBAAiB,EACjB,eAAe,EACf,iBAAiB,EACjB,iBAAiB,GAClB,MAAM,4BAA4B,CAAC;AAEpC,MAAM,CAAS,IAAa,YAAY,GAA2B,eAAe,YAA1C,EAAY,UAAU,GAAK,eAAe,SAApB,CAAqB;AAEnF,kDAAkD;AAClD,MAAM,CAAC,IAAM,kBAAkB,GAAG,+BAA+B,CAAC;AAElE,kGAAkG;AAClG,YAAY;AACZ,MAAM,CAAC,IAAM,mBAAmB,GAAG,YAAY,CAAC;AAEhD,MAAM,CAAC,IAAM,gBAAgB,GAAG,QAAQ,CAAC,CAAC,wBAAwB;AAElE;;GAEG;AACH,MAAM,CAAC,IAAM,gBAAgB,GAAG,CAAC,CAAC;AAElC,+DAA+D;AAC/D,MAAM,CAAC,IAAM,2CAA2C,GAAG,CAAC,CAAC;AAE7D,uEAAuE;AACvE,MAAM,CAAC,IAAM,oBAAoB,GAAG,iBAAiB,CAAC;AAEtD,2EAA2E;AAC3E,MAAM,CAAC,IAAM,uBAAuB,GAAG,CAAC,CAAC;AAEzC;;;;;;;GAOG;AACH,MAAM,CAAC,IAAM,iCAAiC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;AAE1E,MAAM,CAAC,IAAM,mBAAmB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU;AACnE,MAAM,CAAC,IAAM,wBAAwB,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,SAAS;AAE1D,MAAM,CAAC,IAAM,iCAAiC,GAAG,4CAA4C,CAAC;AAC9F,MAAM,CAAC,IAAM,sCAAsC,GAAG,4CAA4C,CAAC,CAAC,aAAa;AAEjH,MAAM,CAAC,IAAM,+BAA+B,GAAG,6CAA6C,CAAC;AAE7F,MAAM,CAAC,IAAM,aAAa,GAAG,IAAI,CAAC;AAElC,MAAM,CAAC,IAAM,oBAAoB,GAAG;IAClC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,MAAM;IAClC,iBAAiB,CAAC,KAAK,CAAC,MAAM;IAC9B,iBAAiB,CAAC,KAAK,CAAC,MAAM;CAC/B,CAAC;AAEF,MAAM,CAAC,IAAM,iBAAiB;IAC5B,GAAC,SAAS,CAAC,OAAO,IAAG,OAAO;IAC5B,GAAC,SAAS,CAAC,YAAY,IAAG,OAAO;IACjC,GAAC,SAAS,CAAC,UAAU,IAAG,OAAO;IAC/B,4DAA4D;IAC5D,kDAAkD;IAClD,GAAC,SAAS,CAAC,YAAY,IAAG,KAAK;OAChC,CAAC"}
|
|
@@ -8,7 +8,7 @@ export interface RelayData {
|
|
|
8
8
|
originChainId: number;
|
|
9
9
|
depositor: string;
|
|
10
10
|
recipient: string;
|
|
11
|
-
depositId:
|
|
11
|
+
depositId: BigNumber;
|
|
12
12
|
inputToken: string;
|
|
13
13
|
inputAmount: BigNumber;
|
|
14
14
|
outputToken: string;
|
|
@@ -58,7 +58,7 @@ export interface FillWithBlock extends Fill, SortableEvent {
|
|
|
58
58
|
export interface SpeedUp {
|
|
59
59
|
depositor: string;
|
|
60
60
|
depositorSignature: string;
|
|
61
|
-
depositId:
|
|
61
|
+
depositId: BigNumber;
|
|
62
62
|
originChainId: number;
|
|
63
63
|
updatedRecipient: string;
|
|
64
64
|
updatedOutputAmount: BigNumber;
|
|
@@ -33,3 +33,11 @@ export declare function toGWei(num: BigNumberish): BN;
|
|
|
33
33
|
* @note This is a temporary function until we can backport support for decimal points to @across-protocol/sdk.
|
|
34
34
|
*/
|
|
35
35
|
export declare const toBN: (num: BigNumberish, rounding?: "floor" | "round" | "ceil") => BN;
|
|
36
|
+
/**
|
|
37
|
+
* Compares two BigNumbers and returns the maximum. Order does not matter.
|
|
38
|
+
*
|
|
39
|
+
* @param val The first BigNumber to compare.
|
|
40
|
+
* @param cmp The second BigNumber to compare.
|
|
41
|
+
* @returns The greater of the two BigNumbers.
|
|
42
|
+
*/
|
|
43
|
+
export declare const bnMax: (val: BigNumber, cmp: BigNumber) => BigNumber;
|
|
@@ -55,4 +55,14 @@ export var toBN = function (num, rounding) {
|
|
|
55
55
|
// Otherwise, it is a string int and we can parse it directly.
|
|
56
56
|
return BigNumber.from(num.toString());
|
|
57
57
|
};
|
|
58
|
+
/**
|
|
59
|
+
* Compares two BigNumbers and returns the maximum. Order does not matter.
|
|
60
|
+
*
|
|
61
|
+
* @param val The first BigNumber to compare.
|
|
62
|
+
* @param cmp The second BigNumber to compare.
|
|
63
|
+
* @returns The greater of the two BigNumbers.
|
|
64
|
+
*/
|
|
65
|
+
export var bnMax = function (val, cmp) {
|
|
66
|
+
return val.gt(cmp) ? val : cmp;
|
|
67
|
+
};
|
|
58
68
|
//# sourceMappingURL=BigNumberUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BigNumberUtils.js","sourceRoot":"","sources":["../../../src/utils/BigNumberUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,QAAQ,CAAC;AAE9C,iDAAiD;AACjD,OAAO,EAAE,SAAS,EAAgB,MAAM,0BAA0B,CAAC;AAEnE,iDAAiD;AACjD,cAAc,0BAA0B,CAAC;AAGzC,MAAM,CAAS,IAAA,WAAW,GAA0C,WAAW,YAArD,EAAE,WAAW,GAA6B,WAAW,YAAxC,EAAE,UAAU,GAAiB,WAAW,WAA5B,EAAE,UAAU,GAAK,WAAW,WAAhB,CAAiB;AAChF,MAAM,CAAC,IAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC1C,MAAM,CAAC,IAAM,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACzC,MAAM,CAAC,IAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AACxD,MAAM,CAAC,IAAM,YAAY,GAAG,SAAS,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAC;AAEjH;;;;GAIG;AACH,MAAM,UAAU,KAAK,CAAC,GAAiB;IACrC,OAAO,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;AAChD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,MAAM,CAAC,GAAiB;IACtC,OAAO,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AACnD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,IAAM,IAAI,GAAG,UAAC,GAAiB,EAAE,QAA8C;IAA9C,yBAAA,EAAA,kBAA8C;IACpF,gHAAgH;IAChH,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAChC,2DAA2D;QACrD,IAAA,KAAqB,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAA7C,OAAO,QAAA,EAAE,OAAO,QAA6B,CAAC;QACrD,kFAAkF;QAClF,gFAAgF;QAChF,+EAA+E;QAC/E,iFAAiF;QACjF,iEAAiE;QACjE,IAAM,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,MAAM,IAAI,CAAC,QAAQ,KAAK,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnH,4DAA4D;QAC5D,OAAO,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACrD;IACD,8DAA8D;IAC9D,OAAO,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;AACxC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"BigNumberUtils.js","sourceRoot":"","sources":["../../../src/utils/BigNumberUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,QAAQ,CAAC;AAE9C,iDAAiD;AACjD,OAAO,EAAE,SAAS,EAAgB,MAAM,0BAA0B,CAAC;AAEnE,iDAAiD;AACjD,cAAc,0BAA0B,CAAC;AAGzC,MAAM,CAAS,IAAA,WAAW,GAA0C,WAAW,YAArD,EAAE,WAAW,GAA6B,WAAW,YAAxC,EAAE,UAAU,GAAiB,WAAW,WAA5B,EAAE,UAAU,GAAK,WAAW,WAAhB,CAAiB;AAChF,MAAM,CAAC,IAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC1C,MAAM,CAAC,IAAM,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACzC,MAAM,CAAC,IAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AACxD,MAAM,CAAC,IAAM,YAAY,GAAG,SAAS,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAC;AAEjH;;;;GAIG;AACH,MAAM,UAAU,KAAK,CAAC,GAAiB;IACrC,OAAO,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;AAChD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,MAAM,CAAC,GAAiB;IACtC,OAAO,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AACnD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,IAAM,IAAI,GAAG,UAAC,GAAiB,EAAE,QAA8C;IAA9C,yBAAA,EAAA,kBAA8C;IACpF,gHAAgH;IAChH,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAChC,2DAA2D;QACrD,IAAA,KAAqB,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAA7C,OAAO,QAAA,EAAE,OAAO,QAA6B,CAAC;QACrD,kFAAkF;QAClF,gFAAgF;QAChF,+EAA+E;QAC/E,iFAAiF;QACjF,iEAAiE;QACjE,IAAM,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,MAAM,IAAI,CAAC,QAAQ,KAAK,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnH,4DAA4D;QAC5D,OAAO,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACrD;IACD,8DAA8D;IAC9D,OAAO,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;AACxC,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,CAAC,IAAM,KAAK,GAAG,UAAC,GAAc,EAAE,GAAc;IAClD,OAAO,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;AACjC,CAAC,CAAC"}
|
|
@@ -61,6 +61,6 @@ export function setDepositInCache(deposit, currentChainTime, cache, expirySecond
|
|
|
61
61
|
*/
|
|
62
62
|
export function getDepositKey(bridgeEvent) {
|
|
63
63
|
var relayHash = getRelayHashFromEvent(bridgeEvent);
|
|
64
|
-
return "deposit_".concat(bridgeEvent.originChainId, "_").concat(bridgeEvent.depositId, "_").concat(relayHash);
|
|
64
|
+
return "deposit_".concat(bridgeEvent.originChainId, "_").concat(bridgeEvent.depositId.toString(), "_").concat(relayHash);
|
|
65
65
|
}
|
|
66
66
|
//# sourceMappingURL=CachingUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CachingUtils.js","sourceRoot":"","sources":["../../../src/utils/CachingUtils.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAE7E,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,UAAU,WAAW,CAAC,cAAsB,EAAE,UAAkB,EAAE,aAAqB;IAC3F,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,MAAM,KAAK,EAAE,EAAE,mCAAmC,CAAC,CAAC;IACrF,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,MAAM,KAAK,EAAE,EAAE,mCAAmC,CAAC,CAAC;IACjF,OAAO,UAAU,GAAG,cAAc,IAAI,aAAa,CAAC;AACtD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAgB,iBAAiB,CAAC,GAAW,EAAE,KAAgC;;;;;wBAChE,qBAAM,KAAK,CAAC,GAAG,CAAS,GAAG,CAAC,EAAA;;oBAAzC,UAAU,GAAG,SAA4B;oBAC/C,sBAAO,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,eAAe,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EAAC;;;;CAChH;AAED,MAAM,UAAgB,iBAAiB,CACrC,OAAgB,EAChB,gBAAwB,EACxB,KAAgC,EAChC,aAAmC,EACnC,WAAsC;IADtC,8BAAA,EAAA,mCAAmC;IACnC,4BAAA,EAAA,sCAAsC;;;;;;oBAEhC,oBAAoB,GAAG,cAAc,EAAE,CAAC;oBAC9C,6FAA6F;oBAC7F,mEAAmE;oBACnE,IAAI,OAAO,CAAC,cAAc,GAAG,oBAAoB,IAAI,gBAAgB,GAAG,oBAAoB,EAAE;wBAC5F,sBAAO;qBACR;yBAIG,WAAW,CAAC,OAAO,CAAC,cAAc,EAAE,gBAAgB,EAAE,WAAW,CAAC,EAAlE,wBAAkE;oBACpE,qBAAM,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,EAAA;;oBAA/E,SAA+E,CAAC;;;;;;CAEnF;AAED;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAAC,WAA6C;IACzE,IAAM,SAAS,GAAG,qBAAqB,CAAC,WAAW,CAAC,CAAC;IACrD,OAAO,kBAAW,WAAW,CAAC,aAAa,cAAI,WAAW,CAAC,SAAS,cAAI,SAAS,CAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"CachingUtils.js","sourceRoot":"","sources":["../../../src/utils/CachingUtils.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAE7E,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,UAAU,WAAW,CAAC,cAAsB,EAAE,UAAkB,EAAE,aAAqB;IAC3F,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,MAAM,KAAK,EAAE,EAAE,mCAAmC,CAAC,CAAC;IACrF,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,MAAM,KAAK,EAAE,EAAE,mCAAmC,CAAC,CAAC;IACjF,OAAO,UAAU,GAAG,cAAc,IAAI,aAAa,CAAC;AACtD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAgB,iBAAiB,CAAC,GAAW,EAAE,KAAgC;;;;;wBAChE,qBAAM,KAAK,CAAC,GAAG,CAAS,GAAG,CAAC,EAAA;;oBAAzC,UAAU,GAAG,SAA4B;oBAC/C,sBAAO,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,eAAe,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EAAC;;;;CAChH;AAED,MAAM,UAAgB,iBAAiB,CACrC,OAAgB,EAChB,gBAAwB,EACxB,KAAgC,EAChC,aAAmC,EACnC,WAAsC;IADtC,8BAAA,EAAA,mCAAmC;IACnC,4BAAA,EAAA,sCAAsC;;;;;;oBAEhC,oBAAoB,GAAG,cAAc,EAAE,CAAC;oBAC9C,6FAA6F;oBAC7F,mEAAmE;oBACnE,IAAI,OAAO,CAAC,cAAc,GAAG,oBAAoB,IAAI,gBAAgB,GAAG,oBAAoB,EAAE;wBAC5F,sBAAO;qBACR;yBAIG,WAAW,CAAC,OAAO,CAAC,cAAc,EAAE,gBAAgB,EAAE,WAAW,CAAC,EAAlE,wBAAkE;oBACpE,qBAAM,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,EAAA;;oBAA/E,SAA+E,CAAC;;;;;;CAEnF;AAED;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAAC,WAA6C;IACzE,IAAM,SAAS,GAAG,qBAAqB,CAAC,WAAW,CAAC,CAAC;IACrD,OAAO,kBAAW,WAAW,CAAC,aAAa,cAAI,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,cAAI,SAAS,CAAE,CAAC;AACjG,CAAC"}
|
|
@@ -44,15 +44,15 @@ export function queryHistoricalDepositForFill(spokePoolClient, fill, cache) {
|
|
|
44
44
|
}
|
|
45
45
|
depositId = fill.depositId;
|
|
46
46
|
lowId = spokePoolClient.firstDepositIdForSpokePool, highId = spokePoolClient.lastDepositIdForSpokePool;
|
|
47
|
-
if (depositId
|
|
47
|
+
if (depositId.lt(lowId) || depositId.gt(highId)) {
|
|
48
48
|
return [2 /*return*/, {
|
|
49
49
|
found: false,
|
|
50
50
|
code: InvalidFill.DepositIdInvalid,
|
|
51
|
-
reason: "Deposit ID ".concat(depositId, " is outside of SpokePool bounds [").concat(lowId, ",").concat(highId, "]."),
|
|
51
|
+
reason: "Deposit ID ".concat(depositId.toString(), " is outside of SpokePool bounds [").concat(lowId, ",").concat(highId, "]."),
|
|
52
52
|
}];
|
|
53
53
|
}
|
|
54
54
|
(lowId = spokePoolClient.earliestDepositIdQueried, highId = spokePoolClient.latestDepositIdQueried);
|
|
55
|
-
if (depositId
|
|
55
|
+
if (depositId.gte(lowId) && depositId.lte(highId)) {
|
|
56
56
|
originChain = getNetworkName(fill.originChainId);
|
|
57
57
|
deposit_1 = spokePoolClient.getDeposit(depositId);
|
|
58
58
|
if (isDefined(deposit_1)) {
|
|
@@ -63,13 +63,13 @@ export function queryHistoricalDepositForFill(spokePoolClient, fill, cache) {
|
|
|
63
63
|
return [2 /*return*/, {
|
|
64
64
|
found: false,
|
|
65
65
|
code: InvalidFill.FillMismatch,
|
|
66
|
-
reason: "Fill for ".concat(originChain, " deposit ID ").concat(depositId, " is invalid (").concat(match_1.reason, ")."),
|
|
66
|
+
reason: "Fill for ".concat(originChain, " deposit ID ").concat(depositId.toString(), " is invalid (").concat(match_1.reason, ")."),
|
|
67
67
|
}];
|
|
68
68
|
}
|
|
69
69
|
return [2 /*return*/, {
|
|
70
70
|
found: false,
|
|
71
71
|
code: InvalidFill.DepositIdNotFound,
|
|
72
|
-
reason: "".concat(originChain, " deposit ID ").concat(depositId, " not found in SpokePoolClient event buffer."),
|
|
72
|
+
reason: "".concat(originChain, " deposit ID ").concat(depositId.toString(), " not found in SpokePoolClient event buffer."),
|
|
73
73
|
}];
|
|
74
74
|
}
|
|
75
75
|
if (!cache) return [3 /*break*/, 2];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DepositUtils.js","sourceRoot":"","sources":["../../../src/utils/DepositUtils.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAElE,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACrF,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAE5D,4FAA4F;AAC5F,gGAAgG;AAChG,yDAAyD;AAEzD,MAAM,CAAN,IAAY,WAIX;AAJD,WAAY,WAAW;IACrB,qEAAoB,CAAA;IACpB,uEAAiB,CAAA;IACjB,6DAAY,CAAA;AACd,CAAC,EAJW,WAAW,KAAX,WAAW,QAItB;AAMD;;;;;;;;;;;GAWG;AACH,MAAM,UAAgB,6BAA6B,CACjD,eAAgC,EAChC,IAA4B,EAC5B,KAAiC;;;;;;oBAEjC,IAAI,IAAI,CAAC,aAAa,KAAK,eAAe,CAAC,OAAO,EAAE;wBAClD,MAAM,IAAI,KAAK,CAAC,kCAA2B,IAAI,CAAC,aAAa,iBAAO,eAAe,CAAC,OAAO,MAAG,CAAC,CAAC;qBACjG;oBAED,kHAAkH;oBAClH,iEAAiE;oBACjE,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE;wBAC9B,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;qBACxF;oBAEO,SAAS,GAAK,IAAI,UAAT,CAAU;oBACO,KAAK,GAAwC,eAAe,2BAAvD,EAA6B,MAAM,GAAK,eAAe,0BAApB,CAAqB;oBAC/F,IAAI,SAAS,
|
|
1
|
+
{"version":3,"file":"DepositUtils.js","sourceRoot":"","sources":["../../../src/utils/DepositUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { __assign, __awaiter, __generator, __spreadArray } from "tslib";
|
|
2
2
|
import { delay } from "./common";
|
|
3
|
+
import { isDefined, toBN } from "./";
|
|
3
4
|
var maxRetries = 3;
|
|
4
5
|
var retrySleepTime = 10;
|
|
5
6
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -52,6 +53,13 @@ export function spreadEvent(args) {
|
|
|
52
53
|
if (returnedObject.rootBundleId) {
|
|
53
54
|
returnedObject.rootBundleId = Number(returnedObject.rootBundleId);
|
|
54
55
|
}
|
|
56
|
+
// If depositId is included in the event, cast it to a BigNumber. Need to check if it is defined since the deposit ID can
|
|
57
|
+
// be 0, which would still make this evaluate as false.
|
|
58
|
+
if (isDefined(returnedObject.depositId)) {
|
|
59
|
+
// Assuming a numeric output, we can safely cast the unknown to BigNumberish since the depositId will either be a uint32 (and therefore a TypeScript `number`),
|
|
60
|
+
// or a uint256 (and therefore an ethers BigNumber).
|
|
61
|
+
returnedObject.depositId = toBN(returnedObject.depositId);
|
|
62
|
+
}
|
|
55
63
|
return returnedObject;
|
|
56
64
|
}
|
|
57
65
|
export var eventToLog = function (event) { return (__assign(__assign({}, event), { event: event.event, args: spreadEvent(event.args) })); };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventUtils.js","sourceRoot":"","sources":["../../../src/utils/EventUtils.ts"],"names":[],"mappings":";AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"EventUtils.js","sourceRoot":"","sources":["../../../src/utils/EventUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Contract, PopulatedTransaction, providers } from "ethers";
|
|
2
2
|
import { Deposit, Fill, FillStatus, RelayData, SlowFillRequest } from "../interfaces";
|
|
3
3
|
import { SpokePoolClient } from "../clients";
|
|
4
|
+
import { BigNumber } from "./BigNumberUtils";
|
|
4
5
|
type BlockTag = providers.BlockTag;
|
|
5
6
|
/**
|
|
6
7
|
* @param spokePool SpokePool Contract instance.
|
|
@@ -24,7 +25,7 @@ export declare function populateV3Relay(spokePool: Contract, deposit: Deposit, r
|
|
|
24
25
|
* // contain the event emitted when deposit ID was incremented to targetDepositId + 1. This is the same transaction
|
|
25
26
|
* // where the deposit with deposit ID = targetDepositId was created.
|
|
26
27
|
*/
|
|
27
|
-
export declare function getBlockRangeForDepositId(targetDepositId:
|
|
28
|
+
export declare function getBlockRangeForDepositId(targetDepositId: BigNumber, initLow: number, initHigh: number, maxSearches: number, spokePool: SpokePoolClient): Promise<{
|
|
28
29
|
low: number;
|
|
29
30
|
high: number;
|
|
30
31
|
}>;
|
|
@@ -33,7 +34,7 @@ export declare function getBlockRangeForDepositId(targetDepositId: number, initL
|
|
|
33
34
|
* @param blockTag The block number to search for the deposit ID at.
|
|
34
35
|
* @returns The deposit ID.
|
|
35
36
|
*/
|
|
36
|
-
export declare function getDepositIdAtBlock(contract: Contract, blockTag: number): Promise<
|
|
37
|
+
export declare function getDepositIdAtBlock(contract: Contract, blockTag: number): Promise<BigNumber>;
|
|
37
38
|
/**
|
|
38
39
|
* Compute the RelayData hash for a fill. This can be used to determine the fill status.
|
|
39
40
|
* @param relayData RelayData information that is used to complete a fill.
|
|
@@ -42,7 +43,7 @@ export declare function getDepositIdAtBlock(contract: Contract, blockTag: number
|
|
|
42
43
|
*/
|
|
43
44
|
export declare function getRelayDataHash(relayData: RelayData, destinationChainId: number): string;
|
|
44
45
|
export declare function getRelayHashFromEvent(e: Deposit | Fill | SlowFillRequest): string;
|
|
45
|
-
export declare function isUnsafeDepositId(depositId:
|
|
46
|
+
export declare function isUnsafeDepositId(depositId: BigNumber): boolean;
|
|
46
47
|
/**
|
|
47
48
|
* Find the amount filled for a deposit at a particular block.
|
|
48
49
|
* @param spokePool SpokePool contract instance.
|
|
@@ -62,4 +63,5 @@ export declare function fillStatusArray(spokePool: Contract, relayData: RelayDat
|
|
|
62
63
|
* @returns The block number at which the relay was completed, or undefined.
|
|
63
64
|
*/
|
|
64
65
|
export declare function findFillBlock(spokePool: Contract, relayData: RelayData, lowBlockNumber: number, highBlockNumber?: number): Promise<number | undefined>;
|
|
66
|
+
export declare function isZeroAddress(address: string): boolean;
|
|
65
67
|
export {};
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { __awaiter, __generator } from "tslib";
|
|
2
2
|
import assert from "assert";
|
|
3
3
|
import { utils as ethersUtils } from "ethers";
|
|
4
|
-
import { CHAIN_IDs, MAX_SAFE_DEPOSIT_ID, ZERO_ADDRESS } from "../constants";
|
|
4
|
+
import { CHAIN_IDs, MAX_SAFE_DEPOSIT_ID, ZERO_ADDRESS, ZERO_BYTES } from "../constants";
|
|
5
5
|
import { FillStatus } from "../interfaces";
|
|
6
6
|
import { chunk } from "./ArrayUtils";
|
|
7
|
-
import { BigNumber, toBN } from "./BigNumberUtils";
|
|
7
|
+
import { BigNumber, toBN, bnOne, bnZero } from "./BigNumberUtils";
|
|
8
8
|
import { isDefined } from "./TypeGuards";
|
|
9
9
|
import { getNetworkName } from "./NetworkUtils";
|
|
10
10
|
/**
|
|
@@ -59,6 +59,9 @@ export function getBlockRangeForDepositId(targetDepositId, initLow, initHigh, ma
|
|
|
59
59
|
return __generator(this, function (_b) {
|
|
60
60
|
switch (_b.label) {
|
|
61
61
|
case 0:
|
|
62
|
+
// We can only perform this search when we have a safe deposit ID.
|
|
63
|
+
if (isUnsafeDepositId(targetDepositId))
|
|
64
|
+
throw new Error("Target deposit ID ".concat(targetDepositId, " is deterministic and therefore unresolvable via a binary search."));
|
|
62
65
|
deploymentBlock = spokePool.deploymentBlock;
|
|
63
66
|
// Set the initial high block to the most recent block number or the initial high block, whichever is smaller.
|
|
64
67
|
initHigh = Math.min(initHigh, spokePool.latestBlockSearched);
|
|
@@ -114,7 +117,7 @@ export function getBlockRangeForDepositId(targetDepositId, initLow, initHigh, ma
|
|
|
114
117
|
_a = _b.sent(), highestDepositIdInRange = _a[0], lowestDepositIdInRange = _a[1];
|
|
115
118
|
// If the deposit ID at the initial high block is less than the target deposit ID, then we know that
|
|
116
119
|
// the target deposit ID must be greater than the initial high block, so we can throw an error.
|
|
117
|
-
if (highestDepositIdInRange
|
|
120
|
+
if (highestDepositIdInRange.lte(targetDepositId)) {
|
|
118
121
|
// initLow = 5: Deposits Num: 10
|
|
119
122
|
// // targetId = 11 <- fail (triggers this error) // 10 <= 11
|
|
120
123
|
// // targetId = 10 <- fail (triggers this error) // 10 <= 10
|
|
@@ -123,13 +126,13 @@ export function getBlockRangeForDepositId(targetDepositId, initLow, initHigh, ma
|
|
|
123
126
|
}
|
|
124
127
|
// If the deposit ID at the initial low block is greater than the target deposit ID, then we know that
|
|
125
128
|
// the target deposit ID must be less than the initial low block, so we can throw an error.
|
|
126
|
-
if (lowestDepositIdInRange
|
|
129
|
+
if (lowestDepositIdInRange.gt(targetDepositId)) {
|
|
127
130
|
// initLow = 5: Deposits Num: 10
|
|
128
131
|
// initLow-1 = 4: Deposits Num: 2
|
|
129
132
|
// // targetId = 1 <- fail (triggers this error)
|
|
130
133
|
// // targetId = 2 <- pass (does not trigger this error)
|
|
131
134
|
// // targetId = 3 <- pass (does not trigger this error)
|
|
132
|
-
throw new Error("Target depositId is less than the initial low block (".concat(targetDepositId, " > ").concat(lowestDepositIdInRange, ")"));
|
|
135
|
+
throw new Error("Target depositId is less than the initial low block (".concat(targetDepositId.toString(), " > ").concat(lowestDepositIdInRange, ")"));
|
|
133
136
|
}
|
|
134
137
|
low = initLow;
|
|
135
138
|
high = initHigh;
|
|
@@ -140,11 +143,11 @@ export function getBlockRangeForDepositId(targetDepositId, initLow, initHigh, ma
|
|
|
140
143
|
return [4 /*yield*/, _getDepositIdAtBlock(mid)];
|
|
141
144
|
case 3:
|
|
142
145
|
midDepositId = _b.sent();
|
|
143
|
-
accountedIdByMidBlock = midDepositId
|
|
146
|
+
accountedIdByMidBlock = midDepositId.sub(bnOne);
|
|
144
147
|
// If our target deposit ID is less than the smallest range of our
|
|
145
148
|
// midpoint deposit ID range, then we know that the target deposit ID
|
|
146
149
|
// must be in the lower half of the block range.
|
|
147
|
-
if (targetDepositId
|
|
150
|
+
if (targetDepositId.lte(accountedIdByMidBlock)) {
|
|
148
151
|
high = mid;
|
|
149
152
|
}
|
|
150
153
|
// If our target deposit ID is greater than the largest range of our
|
|
@@ -176,14 +179,15 @@ export function getBlockRangeForDepositId(targetDepositId, initLow, initHigh, ma
|
|
|
176
179
|
*/
|
|
177
180
|
export function getDepositIdAtBlock(contract, blockTag) {
|
|
178
181
|
return __awaiter(this, void 0, void 0, function () {
|
|
179
|
-
var depositIdAtBlock;
|
|
182
|
+
var _depositIdAtBlock, depositIdAtBlock;
|
|
180
183
|
return __generator(this, function (_a) {
|
|
181
184
|
switch (_a.label) {
|
|
182
185
|
case 0: return [4 /*yield*/, contract.numberOfDeposits({ blockTag: blockTag })];
|
|
183
186
|
case 1:
|
|
184
|
-
|
|
187
|
+
_depositIdAtBlock = _a.sent();
|
|
188
|
+
depositIdAtBlock = toBN(_depositIdAtBlock);
|
|
185
189
|
// Sanity check to ensure that the deposit ID is an integer and is greater than or equal to zero.
|
|
186
|
-
if (
|
|
190
|
+
if (depositIdAtBlock.lt(bnZero)) {
|
|
187
191
|
throw new Error("Invalid deposit count");
|
|
188
192
|
}
|
|
189
193
|
return [2 /*return*/, depositIdAtBlock];
|
|
@@ -257,7 +261,7 @@ export function relayFillStatus(spokePool, relayData, blockTag, destinationChain
|
|
|
257
261
|
fillStatus = Number(_fillStatus);
|
|
258
262
|
if (![FillStatus.Unfilled, FillStatus.RequestedSlowFill, FillStatus.Filled].includes(fillStatus)) {
|
|
259
263
|
originChainId = relayData.originChainId, depositId = relayData.depositId;
|
|
260
|
-
throw new Error("relayFillStatus: Unexpected fillStatus for ".concat(originChainId, " deposit ").concat(depositId, " (").concat(fillStatus, ")"));
|
|
264
|
+
throw new Error("relayFillStatus: Unexpected fillStatus for ".concat(originChainId, " deposit ").concat(depositId.toString(), " (").concat(fillStatus, ")"));
|
|
261
265
|
}
|
|
262
266
|
return [2 /*return*/, fillStatus];
|
|
263
267
|
}
|
|
@@ -353,7 +357,7 @@ export function findFillBlock(spokePool, relayData, lowBlockNumber, highBlockNum
|
|
|
353
357
|
if (initialFillStatus === FillStatus.Filled) {
|
|
354
358
|
depositId = relayData.depositId, originChainId = relayData.originChainId;
|
|
355
359
|
_e = [getNetworkName(originChainId), getNetworkName(destinationChainId)], srcChain = _e[0], dstChain = _e[1];
|
|
356
|
-
throw new Error("".concat(srcChain, " deposit ").concat(depositId, " filled on ").concat(dstChain, " before block ").concat(lowBlockNumber));
|
|
360
|
+
throw new Error("".concat(srcChain, " deposit ").concat(depositId.toString(), " filled on ").concat(dstChain, " before block ").concat(lowBlockNumber));
|
|
357
361
|
}
|
|
358
362
|
_f.label = 9;
|
|
359
363
|
case 9:
|
|
@@ -376,4 +380,8 @@ export function findFillBlock(spokePool, relayData, lowBlockNumber, highBlockNum
|
|
|
376
380
|
});
|
|
377
381
|
});
|
|
378
382
|
}
|
|
383
|
+
// Determines if the input address (either a bytes32 or bytes20) is the zero address.
|
|
384
|
+
export function isZeroAddress(address) {
|
|
385
|
+
return address === ZERO_ADDRESS || address === ZERO_BYTES;
|
|
386
|
+
}
|
|
379
387
|
//# sourceMappingURL=SpokeUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SpokeUtils.js","sourceRoot":"","sources":["../../../src/utils/SpokeUtils.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAwD,KAAK,IAAI,WAAW,EAAE,MAAM,QAAQ,CAAC;AACpG,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"SpokeUtils.js","sourceRoot":"","sources":["../../../src/utils/SpokeUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ var AddressValidator = define("AddressValidator", function (v) { return ethersUt
|
|
|
5
5
|
var HexValidator = define("HexValidator", function (v) { return ethersUtils.isHexString(String(v)); });
|
|
6
6
|
var BigNumberValidator = define("BigNumberValidator", function (v) { return BigNumber.isBigNumber(v); });
|
|
7
7
|
var V3DepositSchema = object({
|
|
8
|
-
depositId:
|
|
8
|
+
depositId: BigNumberValidator,
|
|
9
9
|
depositor: AddressValidator,
|
|
10
10
|
recipient: AddressValidator,
|
|
11
11
|
inputToken: AddressValidator,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidatorUtils.js","sourceRoot":"","sources":["../../../src/utils/ValidatorUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAE7F,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,IAAM,gBAAgB,GAAG,MAAM,CAAS,kBAAkB,EAAE,UAAC,CAAC,IAAK,OAAA,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAhC,CAAgC,CAAC,CAAC;AACrG,IAAM,YAAY,GAAG,MAAM,CAAS,cAAc,EAAE,UAAC,CAAC,IAAK,OAAA,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAlC,CAAkC,CAAC,CAAC;AAC/F,IAAM,kBAAkB,GAAG,MAAM,CAAY,oBAAoB,EAAE,UAAC,CAAC,IAAK,OAAA,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,EAAxB,CAAwB,CAAC,CAAC;AAEpG,IAAM,eAAe,GAAG,MAAM,CAAC;IAC7B,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"ValidatorUtils.js","sourceRoot":"","sources":["../../../src/utils/ValidatorUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAE7F,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,IAAM,gBAAgB,GAAG,MAAM,CAAS,kBAAkB,EAAE,UAAC,CAAC,IAAK,OAAA,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAhC,CAAgC,CAAC,CAAC;AACrG,IAAM,YAAY,GAAG,MAAM,CAAS,cAAc,EAAE,UAAC,CAAC,IAAK,OAAA,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAlC,CAAkC,CAAC,CAAC;AAC/F,IAAM,kBAAkB,GAAG,MAAM,CAAY,oBAAoB,EAAE,UAAC,CAAC,IAAK,OAAA,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,EAAxB,CAAwB,CAAC,CAAC;AAEpG,IAAM,eAAe,GAAG,MAAM,CAAC;IAC7B,SAAS,EAAE,kBAAkB;IAC7B,SAAS,EAAE,gBAAgB;IAC3B,SAAS,EAAE,gBAAgB;IAC3B,UAAU,EAAE,gBAAgB;IAC5B,WAAW,EAAE,kBAAkB;IAC/B,aAAa,EAAE,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAChC,kBAAkB,EAAE,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACrC,cAAc,EAAE,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACjC,YAAY,EAAE,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAC/B,mBAAmB,EAAE,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACtC,gBAAgB,EAAE,gBAAgB;IAClC,gBAAgB,EAAE,QAAQ,CAAC,kBAAkB,CAAC;IAC9C,WAAW,EAAE,gBAAgB;IAC7B,YAAY,EAAE,kBAAkB;IAChC,OAAO,EAAE,MAAM,EAAE;IACjB,gBAAgB,EAAE,QAAQ,CAAC,YAAY,CAAC;IACxC,mBAAmB,EAAE,QAAQ,CAAC,kBAAkB,CAAC;IACjD,gBAAgB,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;IACpC,cAAc,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;IAClC,WAAW,EAAE,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAC9B,gBAAgB,EAAE,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACnC,QAAQ,EAAE,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAC3B,gBAAgB,EAAE,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACnC,eAAe,EAAE,YAAY;IAC7B,aAAa,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC;IAClC,WAAW,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC;CACjC,CAAC,CAAC;AAEH,MAAM,UAAU,wBAAwB,CAAC,OAAgB;IACvD,OAAO,eAAe,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;AACrC,CAAC"}
|