@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;
|
|
@@ -16,7 +16,7 @@ var MockSpokePoolClient = (function (_super) {
|
|
|
16
16
|
var _this = _super.call(this, logger, spokePool, opts.hubPoolClient, chainId, deploymentBlock) || this;
|
|
17
17
|
_this.destinationTokenForChainOverride = {};
|
|
18
18
|
_this.depositIdAtBlock = [];
|
|
19
|
-
_this.numberOfDeposits =
|
|
19
|
+
_this.numberOfDeposits = utils_1.bnZero;
|
|
20
20
|
_this.eventSignatures = {
|
|
21
21
|
EnabledDepositRoute: "address,uint256,bool",
|
|
22
22
|
};
|
|
@@ -44,7 +44,7 @@ var MockSpokePoolClient = (function (_super) {
|
|
|
44
44
|
}
|
|
45
45
|
var lastDepositId = _depositIds[0];
|
|
46
46
|
for (var i = 0; i < _depositIds.length; i++) {
|
|
47
|
-
if (_depositIds[i]
|
|
47
|
+
if (_depositIds[i].lt(lastDepositId)) {
|
|
48
48
|
throw new Error("deposit ID must be equal to or greater than previous");
|
|
49
49
|
}
|
|
50
50
|
this.depositIdAtBlock[i] = _depositIds[i];
|
|
@@ -69,10 +69,10 @@ var MockSpokePoolClient = (function (_super) {
|
|
|
69
69
|
}
|
|
70
70
|
});
|
|
71
71
|
var idx = eventsToQuery.indexOf("V3FundsDeposited");
|
|
72
|
-
var latestDepositId = ((_a = events[idx]) !== null && _a !== void 0 ? _a : []).reduce(function (depositId, event) { var _a; return
|
|
72
|
+
var latestDepositId = ((_a = events[idx]) !== null && _a !== void 0 ? _a : []).reduce(function (depositId, event) { var _a; return (0, utils_1.bnMax)(depositId, (_a = event.args["depositId"]) !== null && _a !== void 0 ? _a : utils_1.bnZero); }, this.latestDepositIdQueried);
|
|
73
73
|
return Promise.resolve({
|
|
74
74
|
success: true,
|
|
75
|
-
firstDepositId:
|
|
75
|
+
firstDepositId: utils_1.bnZero,
|
|
76
76
|
latestDepositId: latestDepositId,
|
|
77
77
|
currentTime: currentTime,
|
|
78
78
|
oldestTime: 0,
|
|
@@ -86,8 +86,8 @@ var MockSpokePoolClient = (function (_super) {
|
|
|
86
86
|
var blockNumber = deposit.blockNumber, transactionIndex = deposit.transactionIndex;
|
|
87
87
|
var depositId = deposit.depositId, depositor = deposit.depositor, destinationChainId = deposit.destinationChainId, inputToken = deposit.inputToken, inputAmount = deposit.inputAmount, outputToken = deposit.outputToken, outputAmount = deposit.outputAmount;
|
|
88
88
|
depositId !== null && depositId !== void 0 ? depositId : (depositId = this.numberOfDeposits);
|
|
89
|
-
(0, assert_1.default)(depositId
|
|
90
|
-
this.numberOfDeposits = depositId
|
|
89
|
+
(0, assert_1.default)(depositId.gte(this.numberOfDeposits), "".concat(depositId.toString(), " < ").concat(this.numberOfDeposits));
|
|
90
|
+
this.numberOfDeposits = depositId.add(utils_1.bnOne);
|
|
91
91
|
destinationChainId !== null && destinationChainId !== void 0 ? destinationChainId : (destinationChainId = (0, lodash_1.random)(1, 42161, false));
|
|
92
92
|
depositor !== null && depositor !== void 0 ? depositor : (depositor = (0, utils_1.randomAddress)());
|
|
93
93
|
inputToken !== null && inputToken !== void 0 ? inputToken : (inputToken = (0, utils_1.randomAddress)());
|
|
@@ -128,7 +128,7 @@ var MockSpokePoolClient = (function (_super) {
|
|
|
128
128
|
var blockNumber = fill.blockNumber, transactionIndex = fill.transactionIndex;
|
|
129
129
|
var originChainId = fill.originChainId, depositId = fill.depositId, inputToken = fill.inputToken, inputAmount = fill.inputAmount, outputAmount = fill.outputAmount, fillDeadline = fill.fillDeadline, relayer = fill.relayer;
|
|
130
130
|
originChainId !== null && originChainId !== void 0 ? originChainId : (originChainId = (0, lodash_1.random)(1, 42161, false));
|
|
131
|
-
depositId !== null && depositId !== void 0 ? depositId : (depositId = (0, lodash_1.random)(1, 100000, false));
|
|
131
|
+
depositId !== null && depositId !== void 0 ? depositId : (depositId = utils_1.BigNumber.from((0, lodash_1.random)(1, 100000, false)));
|
|
132
132
|
inputToken !== null && inputToken !== void 0 ? inputToken : (inputToken = (0, utils_1.randomAddress)());
|
|
133
133
|
inputAmount !== null && inputAmount !== void 0 ? inputAmount : (inputAmount = (0, utils_1.toBNWei)((0, lodash_1.random)(1, 1000, false)));
|
|
134
134
|
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,0DAA4B;AAE5B,iCAAgC;AAEhC,6CAA+C;AAC/C,+CAU0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"MockSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockSpokePoolClient.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/constants.d.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
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;
|
|
6
6
|
export declare const HUBPOOL_CHAIN_ID = 1;
|
|
7
7
|
export declare const TRANSFER_THRESHOLD_MAX_CONFIG_STORE_VERSION = 1;
|
|
8
8
|
export declare const ARWEAVE_TAG_APP_NAME = "across-protocol";
|
|
9
|
-
export declare const ARWEAVE_TAG_APP_VERSION =
|
|
9
|
+
export declare const ARWEAVE_TAG_APP_VERSION = 3;
|
|
10
10
|
export declare const PROTOCOL_DEFAULT_CHAIN_ID_INDICES: number[];
|
|
11
11
|
export declare const DEFAULT_CACHING_TTL: number;
|
|
12
12
|
export declare const DEFAULT_CACHING_SAFE_LAG: number;
|
package/dist/cjs/constants.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var _a;
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.CUSTOM_GAS_TOKENS = exports.BRIDGED_USDC_SYMBOLS = exports.EMPTY_MESSAGE = exports.DEFAULT_ARWEAVE_STORAGE_ADDRESS = exports.DEFAULT_SIMULATED_RELAYER_ADDRESS_TEST = exports.DEFAULT_SIMULATED_RELAYER_ADDRESS = exports.DEFAULT_CACHING_SAFE_LAG = exports.DEFAULT_CACHING_TTL = exports.PROTOCOL_DEFAULT_CHAIN_ID_INDICES = exports.ARWEAVE_TAG_APP_VERSION = exports.ARWEAVE_TAG_APP_NAME = exports.TRANSFER_THRESHOLD_MAX_CONFIG_STORE_VERSION = exports.HUBPOOL_CHAIN_ID = exports.SECONDS_PER_YEAR = exports.MAX_SAFE_DEPOSIT_ID = exports.MAX_SAFE_ALLOWANCE = exports.ZERO_ADDRESS = exports.TOKEN_SYMBOLS_MAP = exports.TESTNET_CHAIN_IDs = exports.PUBLIC_NETWORKS = exports.MAINNET_CHAIN_IDs = exports.CHAIN_IDs = exports.ChainFamily = void 0;
|
|
4
|
+
exports.CUSTOM_GAS_TOKENS = exports.BRIDGED_USDC_SYMBOLS = exports.EMPTY_MESSAGE = exports.DEFAULT_ARWEAVE_STORAGE_ADDRESS = exports.DEFAULT_SIMULATED_RELAYER_ADDRESS_TEST = exports.DEFAULT_SIMULATED_RELAYER_ADDRESS = exports.DEFAULT_CACHING_SAFE_LAG = exports.DEFAULT_CACHING_TTL = exports.PROTOCOL_DEFAULT_CHAIN_ID_INDICES = exports.ARWEAVE_TAG_APP_VERSION = exports.ARWEAVE_TAG_APP_NAME = exports.TRANSFER_THRESHOLD_MAX_CONFIG_STORE_VERSION = exports.HUBPOOL_CHAIN_ID = exports.SECONDS_PER_YEAR = exports.MAX_SAFE_DEPOSIT_ID = exports.MAX_SAFE_ALLOWANCE = exports.ZERO_BYTES = exports.ZERO_ADDRESS = exports.TOKEN_SYMBOLS_MAP = exports.TESTNET_CHAIN_IDs = exports.PUBLIC_NETWORKS = exports.MAINNET_CHAIN_IDs = exports.CHAIN_IDs = exports.ChainFamily = void 0;
|
|
5
5
|
var ethers_1 = require("ethers");
|
|
6
6
|
var constants_1 = require("@across-protocol/constants");
|
|
7
7
|
var constants_2 = require("@across-protocol/constants");
|
|
@@ -11,14 +11,14 @@ Object.defineProperty(exports, "MAINNET_CHAIN_IDs", { enumerable: true, get: fun
|
|
|
11
11
|
Object.defineProperty(exports, "PUBLIC_NETWORKS", { enumerable: true, get: function () { return constants_2.PUBLIC_NETWORKS; } });
|
|
12
12
|
Object.defineProperty(exports, "TESTNET_CHAIN_IDs", { enumerable: true, get: function () { return constants_2.TESTNET_CHAIN_IDs; } });
|
|
13
13
|
Object.defineProperty(exports, "TOKEN_SYMBOLS_MAP", { enumerable: true, get: function () { return constants_2.TOKEN_SYMBOLS_MAP; } });
|
|
14
|
-
exports.ZERO_ADDRESS = ethers_1.constants.AddressZero;
|
|
14
|
+
exports.ZERO_ADDRESS = ethers_1.constants.AddressZero, exports.ZERO_BYTES = ethers_1.constants.HashZero;
|
|
15
15
|
exports.MAX_SAFE_ALLOWANCE = "79228162514264337593543950335";
|
|
16
16
|
exports.MAX_SAFE_DEPOSIT_ID = "4294967295";
|
|
17
17
|
exports.SECONDS_PER_YEAR = 31557600;
|
|
18
18
|
exports.HUBPOOL_CHAIN_ID = 1;
|
|
19
19
|
exports.TRANSFER_THRESHOLD_MAX_CONFIG_STORE_VERSION = 1;
|
|
20
20
|
exports.ARWEAVE_TAG_APP_NAME = "across-protocol";
|
|
21
|
-
exports.ARWEAVE_TAG_APP_VERSION =
|
|
21
|
+
exports.ARWEAVE_TAG_APP_VERSION = 3;
|
|
22
22
|
exports.PROTOCOL_DEFAULT_CHAIN_ID_INDICES = [1, 10, 137, 288, 42161];
|
|
23
23
|
exports.DEFAULT_CACHING_TTL = 60 * 60 * 24 * 7 * 2;
|
|
24
24
|
exports.DEFAULT_CACHING_SAFE_LAG = 60 * 60;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":";;;;AAAA,iCAAsD;AACtD,wDAA0E;AAE1E,wDAOoC;AANlC,wGAAA,WAAW,OAAA;AACX,sGAAA,SAAS,OAAA;AACT,8GAAA,iBAAiB,OAAA;AACjB,4GAAA,eAAe,OAAA;AACf,8GAAA,iBAAiB,OAAA;AACjB,8GAAA,iBAAiB,OAAA;AAGS,QAAA,YAAY,GAAK,kBAAe,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":";;;;AAAA,iCAAsD;AACtD,wDAA0E;AAE1E,wDAOoC;AANlC,wGAAA,WAAW,OAAA;AACX,sGAAA,SAAS,OAAA;AACT,8GAAA,iBAAiB,OAAA;AACjB,4GAAA,eAAe,OAAA;AACf,8GAAA,iBAAiB,OAAA;AACjB,8GAAA,iBAAiB,OAAA;AAGS,QAAA,YAAY,GAA2B,kBAAe,cAA9B,QAAA,UAAU,GAAK,kBAAe,UAAC;AAGtE,QAAA,kBAAkB,GAAG,+BAA+B,CAAC;AAIrD,QAAA,mBAAmB,GAAG,YAAY,CAAC;AAEnC,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAK5B,QAAA,gBAAgB,GAAG,CAAC,CAAC;AAGrB,QAAA,2CAA2C,GAAG,CAAC,CAAC;AAGhD,QAAA,oBAAoB,GAAG,iBAAiB,CAAC;AAGzC,QAAA,uBAAuB,GAAG,CAAC,CAAC;AAU5B,QAAA,iCAAiC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;AAE7D,QAAA,mBAAmB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;AAC3C,QAAA,wBAAwB,GAAG,EAAE,GAAG,EAAE,CAAC;AAEnC,QAAA,iCAAiC,GAAG,4CAA4C,CAAC;AACjF,QAAA,sCAAsC,GAAG,4CAA4C,CAAC;AAEtF,QAAA,+BAA+B,GAAG,6CAA6C,CAAC;AAEhF,QAAA,aAAa,GAAG,IAAI,CAAC;AAErB,QAAA,oBAAoB,GAAG;IAClC,6BAAiB,CAAC,QAAQ,CAAC,CAAC,MAAM;IAClC,6BAAiB,CAAC,KAAK,CAAC,MAAM;IAC9B,6BAAiB,CAAC,KAAK,CAAC,MAAM;CAC/B,CAAC;AAEW,QAAA,iBAAiB;IAC5B,GAAC,qBAAS,CAAC,OAAO,IAAG,OAAO;IAC5B,GAAC,qBAAS,CAAC,YAAY,IAAG,OAAO;IACjC,GAAC,qBAAS,CAAC,UAAU,IAAG,OAAO;IAG/B,GAAC,qBAAS,CAAC,YAAY,IAAG,KAAK;QAC/B"}
|
|
@@ -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;
|
|
@@ -10,3 +10,4 @@ export declare const bnUint256Max: BigNumber;
|
|
|
10
10
|
export declare function toWei(num: BigNumberish): BN;
|
|
11
11
|
export declare function toGWei(num: BigNumberish): BN;
|
|
12
12
|
export declare const toBN: (num: BigNumberish, rounding?: "floor" | "round" | "ceil") => BN;
|
|
13
|
+
export declare const bnMax: (val: BigNumber, cmp: BigNumber) => BigNumber;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.toBN = exports.toGWei = exports.toWei = exports.bnUint256Max = exports.bnUint32Max = exports.bnOne = exports.bnZero = exports.parseUnits = exports.parseEther = exports.formatUnits = exports.formatEther = void 0;
|
|
3
|
+
exports.bnMax = exports.toBN = exports.toGWei = exports.toWei = exports.bnUint256Max = exports.bnUint32Max = exports.bnOne = exports.bnZero = exports.parseUnits = exports.parseEther = exports.formatUnits = exports.formatEther = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var ethers_1 = require("ethers");
|
|
6
6
|
var bignumber_1 = require("@ethersproject/bignumber");
|
|
@@ -28,4 +28,8 @@ var toBN = function (num, rounding) {
|
|
|
28
28
|
return bignumber_1.BigNumber.from(num.toString());
|
|
29
29
|
};
|
|
30
30
|
exports.toBN = toBN;
|
|
31
|
+
var bnMax = function (val, cmp) {
|
|
32
|
+
return val.gt(cmp) ? val : cmp;
|
|
33
|
+
};
|
|
34
|
+
exports.bnMax = bnMax;
|
|
31
35
|
//# sourceMappingURL=BigNumberUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BigNumberUtils.js","sourceRoot":"","sources":["../../../src/utils/BigNumberUtils.ts"],"names":[],"mappings":";;;;AAMA,iCAA8C;AAG9C,sDAAmE;AAGnE,mEAAyC;AAG1B,QAAA,WAAW,GAA0C,cAAW,cAAnD,QAAA,WAAW,GAA6B,cAAW,cAAtC,QAAA,UAAU,GAAiB,cAAW,aAA1B,QAAA,UAAU,GAAK,cAAW,YAAC;AACnE,QAAA,MAAM,GAAG,qBAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7B,QAAA,KAAK,GAAG,qBAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC5B,QAAA,WAAW,GAAG,qBAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AAC3C,QAAA,YAAY,GAAG,qBAAS,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAC;AAOjH,SAAgB,KAAK,CAAC,GAAiB;IACrC,OAAO,cAAW,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;AAChD,CAAC;AAFD,sBAEC;AAOD,SAAgB,MAAM,CAAC,GAAiB;IACtC,OAAO,cAAW,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AACnD,CAAC;AAFD,wBAEC;AAUM,IAAM,IAAI,GAAG,UAAC,GAAiB,EAAE,QAA8C;IAA9C,yBAAA,EAAA,kBAA8C;IAEpF,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAE1B,IAAA,KAAqB,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAA7C,OAAO,QAAA,EAAE,OAAO,QAA6B,CAAC;QAMrD,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;QAEnH,OAAO,qBAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACrD;IAED,OAAO,qBAAS,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;AACxC,CAAC,CAAC;AAhBW,QAAA,IAAI,QAgBf"}
|
|
1
|
+
{"version":3,"file":"BigNumberUtils.js","sourceRoot":"","sources":["../../../src/utils/BigNumberUtils.ts"],"names":[],"mappings":";;;;AAMA,iCAA8C;AAG9C,sDAAmE;AAGnE,mEAAyC;AAG1B,QAAA,WAAW,GAA0C,cAAW,cAAnD,QAAA,WAAW,GAA6B,cAAW,cAAtC,QAAA,UAAU,GAAiB,cAAW,aAA1B,QAAA,UAAU,GAAK,cAAW,YAAC;AACnE,QAAA,MAAM,GAAG,qBAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7B,QAAA,KAAK,GAAG,qBAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC5B,QAAA,WAAW,GAAG,qBAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AAC3C,QAAA,YAAY,GAAG,qBAAS,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAC;AAOjH,SAAgB,KAAK,CAAC,GAAiB;IACrC,OAAO,cAAW,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;AAChD,CAAC;AAFD,sBAEC;AAOD,SAAgB,MAAM,CAAC,GAAiB;IACtC,OAAO,cAAW,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AACnD,CAAC;AAFD,wBAEC;AAUM,IAAM,IAAI,GAAG,UAAC,GAAiB,EAAE,QAA8C;IAA9C,yBAAA,EAAA,kBAA8C;IAEpF,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAE1B,IAAA,KAAqB,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAA7C,OAAO,QAAA,EAAE,OAAO,QAA6B,CAAC;QAMrD,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;QAEnH,OAAO,qBAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACrD;IAED,OAAO,qBAAS,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;AACxC,CAAC,CAAC;AAhBW,QAAA,IAAI,QAgBf;AASK,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;AAFW,QAAA,KAAK,SAEhB"}
|
|
@@ -53,7 +53,7 @@ function setDepositInCache(deposit, currentChainTime, cache, expirySeconds, time
|
|
|
53
53
|
exports.setDepositInCache = setDepositInCache;
|
|
54
54
|
function getDepositKey(bridgeEvent) {
|
|
55
55
|
var relayHash = (0, SpokeUtils_1.getRelayHashFromEvent)(bridgeEvent);
|
|
56
|
-
return "deposit_".concat(bridgeEvent.originChainId, "_").concat(bridgeEvent.depositId, "_").concat(relayHash);
|
|
56
|
+
return "deposit_".concat(bridgeEvent.originChainId, "_").concat(bridgeEvent.depositId.toString(), "_").concat(relayHash);
|
|
57
57
|
}
|
|
58
58
|
exports.getDepositKey = getDepositKey;
|
|
59
59
|
//# sourceMappingURL=CachingUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CachingUtils.js","sourceRoot":"","sources":["../../../src/utils/CachingUtils.ts"],"names":[],"mappings":";;;;AAAA,0CAA6E;AAE7E,uCAAoC;AACpC,+CAA6E;AAC7E,2CAAqD;AACrD,yCAA6C;AAC7C,2CAAyC;AAEzC,SAAgB,WAAW,CAAC,cAAsB,EAAE,UAAkB,EAAE,aAAqB;IAC3F,IAAA,iBAAM,EAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,MAAM,KAAK,EAAE,EAAE,mCAAmC,CAAC,CAAC;IACrF,IAAA,iBAAM,EAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,MAAM,KAAK,EAAE,EAAE,mCAAmC,CAAC,CAAC;IACjF,OAAO,UAAU,GAAG,cAAc,IAAI,aAAa,CAAC;AACtD,CAAC;AAJD,kCAIC;AAQD,SAAsB,iBAAiB,CAAC,GAAW,EAAE,KAAgC;;;;;wBAChE,WAAM,KAAK,CAAC,GAAG,CAAS,GAAG,CAAC,EAAA;;oBAAzC,UAAU,GAAG,SAA4B;oBAC/C,WAAO,IAAA,sBAAS,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,IAAA,8BAAe,EAAC,yCAA0B,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EAAC;;;;CAChH;AAHD,8CAGC;AAED,SAAsB,iBAAiB,CACrC,OAAgB,EAChB,gBAAwB,EACxB,KAAgC,EAChC,aAAmC,EACnC,WAAsC;IADtC,8BAAA,EAAA,gBAAgB,+BAAmB;IACnC,4BAAA,EAAA,cAAc,oCAAwB;;;;;;oBAEhC,oBAAoB,GAAG,IAAA,0BAAc,GAAE,CAAC;oBAG9C,IAAI,OAAO,CAAC,cAAc,GAAG,oBAAoB,IAAI,gBAAgB,GAAG,oBAAoB,EAAE;wBAC5F,WAAO;qBACR;yBAIG,WAAW,CAAC,OAAO,CAAC,cAAc,EAAE,gBAAgB,EAAE,WAAW,CAAC,EAAlE,cAAkE;oBACpE,WAAM,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;AAnBD,8CAmBC;AAQD,SAAgB,aAAa,CAAC,WAA6C;IACzE,IAAM,SAAS,GAAG,IAAA,kCAAqB,EAAC,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,0CAA6E;AAE7E,uCAAoC;AACpC,+CAA6E;AAC7E,2CAAqD;AACrD,yCAA6C;AAC7C,2CAAyC;AAEzC,SAAgB,WAAW,CAAC,cAAsB,EAAE,UAAkB,EAAE,aAAqB;IAC3F,IAAA,iBAAM,EAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,MAAM,KAAK,EAAE,EAAE,mCAAmC,CAAC,CAAC;IACrF,IAAA,iBAAM,EAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,MAAM,KAAK,EAAE,EAAE,mCAAmC,CAAC,CAAC;IACjF,OAAO,UAAU,GAAG,cAAc,IAAI,aAAa,CAAC;AACtD,CAAC;AAJD,kCAIC;AAQD,SAAsB,iBAAiB,CAAC,GAAW,EAAE,KAAgC;;;;;wBAChE,WAAM,KAAK,CAAC,GAAG,CAAS,GAAG,CAAC,EAAA;;oBAAzC,UAAU,GAAG,SAA4B;oBAC/C,WAAO,IAAA,sBAAS,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,IAAA,8BAAe,EAAC,yCAA0B,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EAAC;;;;CAChH;AAHD,8CAGC;AAED,SAAsB,iBAAiB,CACrC,OAAgB,EAChB,gBAAwB,EACxB,KAAgC,EAChC,aAAmC,EACnC,WAAsC;IADtC,8BAAA,EAAA,gBAAgB,+BAAmB;IACnC,4BAAA,EAAA,cAAc,oCAAwB;;;;;;oBAEhC,oBAAoB,GAAG,IAAA,0BAAc,GAAE,CAAC;oBAG9C,IAAI,OAAO,CAAC,cAAc,GAAG,oBAAoB,IAAI,gBAAgB,GAAG,oBAAoB,EAAE;wBAC5F,WAAO;qBACR;yBAIG,WAAW,CAAC,OAAO,CAAC,cAAc,EAAE,gBAAgB,EAAE,WAAW,CAAC,EAAlE,cAAkE;oBACpE,WAAM,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;AAnBD,8CAmBC;AAQD,SAAgB,aAAa,CAAC,WAA6C;IACzE,IAAM,SAAS,GAAG,IAAA,kCAAqB,EAAC,WAAW,CAAC,CAAC;IACrD,OAAO,kBAAW,WAAW,CAAC,aAAa,cAAI,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,cAAI,SAAS,CAAE,CAAC;AACjG,CAAC;AAHD,sCAGC"}
|
|
@@ -30,15 +30,15 @@ function queryHistoricalDepositForFill(spokePoolClient, fill, cache) {
|
|
|
30
30
|
}
|
|
31
31
|
depositId = fill.depositId;
|
|
32
32
|
lowId = spokePoolClient.firstDepositIdForSpokePool, highId = spokePoolClient.lastDepositIdForSpokePool;
|
|
33
|
-
if (depositId
|
|
33
|
+
if (depositId.lt(lowId) || depositId.gt(highId)) {
|
|
34
34
|
return [2, {
|
|
35
35
|
found: false,
|
|
36
36
|
code: InvalidFill.DepositIdInvalid,
|
|
37
|
-
reason: "Deposit ID ".concat(depositId, " is outside of SpokePool bounds [").concat(lowId, ",").concat(highId, "]."),
|
|
37
|
+
reason: "Deposit ID ".concat(depositId.toString(), " is outside of SpokePool bounds [").concat(lowId, ",").concat(highId, "]."),
|
|
38
38
|
}];
|
|
39
39
|
}
|
|
40
40
|
(lowId = spokePoolClient.earliestDepositIdQueried, highId = spokePoolClient.latestDepositIdQueried);
|
|
41
|
-
if (depositId
|
|
41
|
+
if (depositId.gte(lowId) && depositId.lte(highId)) {
|
|
42
42
|
originChain = (0, NetworkUtils_1.getNetworkName)(fill.originChainId);
|
|
43
43
|
deposit_1 = spokePoolClient.getDeposit(depositId);
|
|
44
44
|
if ((0, TypeGuards_1.isDefined)(deposit_1)) {
|
|
@@ -49,13 +49,13 @@ function queryHistoricalDepositForFill(spokePoolClient, fill, cache) {
|
|
|
49
49
|
return [2, {
|
|
50
50
|
found: false,
|
|
51
51
|
code: InvalidFill.FillMismatch,
|
|
52
|
-
reason: "Fill for ".concat(originChain, " deposit ID ").concat(depositId, " is invalid (").concat(match_1.reason, ")."),
|
|
52
|
+
reason: "Fill for ".concat(originChain, " deposit ID ").concat(depositId.toString(), " is invalid (").concat(match_1.reason, ")."),
|
|
53
53
|
}];
|
|
54
54
|
}
|
|
55
55
|
return [2, {
|
|
56
56
|
found: false,
|
|
57
57
|
code: InvalidFill.DepositIdNotFound,
|
|
58
|
-
reason: "".concat(originChain, " deposit ID ").concat(depositId, " not found in SpokePoolClient event buffer."),
|
|
58
|
+
reason: "".concat(originChain, " deposit ID ").concat(depositId.toString(), " not found in SpokePoolClient event buffer."),
|
|
59
59
|
}];
|
|
60
60
|
}
|
|
61
61
|
if (!cache) return [3, 2];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DepositUtils.js","sourceRoot":"","sources":["../../../src/utils/DepositUtils.ts"],"names":[],"mappings":";;;;AAAA,0DAA4B;AAE5B,0CAAkE;AAElE,+CAAgD;AAChD,+CAAqF;AACrF,yCAAqD;AACrD,yCAA6C;AAC7C,2CAAyC;AACzC,mDAA4D;AAM5D,IAAY,WAIX;AAJD,WAAY,WAAW;IACrB,qEAAoB,CAAA;IACpB,uEAAiB,CAAA;IACjB,6DAAY,CAAA;AACd,CAAC,EAJW,WAAW,2BAAX,WAAW,QAItB;AAkBD,SAAsB,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;oBAID,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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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getTransactionHashes = exports.isEventOlder = exports.sortEventsDescendingInPlace = exports.sortEventsDescending = exports.sortEventsAscendingInPlace = exports.sortEventsAscending = exports.spreadEventWithBlockNumber = exports.getPaginatedBlockRanges = exports.paginatedEventQuery = exports.eventToLog = exports.spreadEvent = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var common_1 = require("./common");
|
|
6
|
+
var _1 = require("./");
|
|
6
7
|
var maxRetries = 3;
|
|
7
8
|
var retrySleepTime = 10;
|
|
8
9
|
function spreadEvent(args) {
|
|
@@ -52,6 +53,9 @@ function spreadEvent(args) {
|
|
|
52
53
|
if (returnedObject.rootBundleId) {
|
|
53
54
|
returnedObject.rootBundleId = Number(returnedObject.rootBundleId);
|
|
54
55
|
}
|
|
56
|
+
if ((0, _1.isDefined)(returnedObject.depositId)) {
|
|
57
|
+
returnedObject.depositId = (0, _1.toBN)(returnedObject.depositId);
|
|
58
|
+
}
|
|
55
59
|
return returnedObject;
|
|
56
60
|
}
|
|
57
61
|
exports.spreadEvent = spreadEvent;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventUtils.js","sourceRoot":"","sources":["../../../src/utils/EventUtils.ts"],"names":[],"mappings":";;;;AAIA,mCAAiC;
|
|
1
|
+
{"version":3,"file":"EventUtils.js","sourceRoot":"","sources":["../../../src/utils/EventUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,19 @@
|
|
|
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
|
export declare function populateV3Relay(spokePool: Contract, deposit: Deposit, relayer: string, repaymentChainId?: number): Promise<PopulatedTransaction>;
|
|
6
|
-
export declare function getBlockRangeForDepositId(targetDepositId:
|
|
7
|
+
export declare function getBlockRangeForDepositId(targetDepositId: BigNumber, initLow: number, initHigh: number, maxSearches: number, spokePool: SpokePoolClient): Promise<{
|
|
7
8
|
low: number;
|
|
8
9
|
high: number;
|
|
9
10
|
}>;
|
|
10
|
-
export declare function getDepositIdAtBlock(contract: Contract, blockTag: number): Promise<
|
|
11
|
+
export declare function getDepositIdAtBlock(contract: Contract, blockTag: number): Promise<BigNumber>;
|
|
11
12
|
export declare function getRelayDataHash(relayData: RelayData, destinationChainId: number): string;
|
|
12
13
|
export declare function getRelayHashFromEvent(e: Deposit | Fill | SlowFillRequest): string;
|
|
13
|
-
export declare function isUnsafeDepositId(depositId:
|
|
14
|
+
export declare function isUnsafeDepositId(depositId: BigNumber): boolean;
|
|
14
15
|
export declare function relayFillStatus(spokePool: Contract, relayData: RelayData, blockTag?: number | "latest", destinationChainId?: number): Promise<FillStatus>;
|
|
15
16
|
export declare function fillStatusArray(spokePool: Contract, relayData: RelayData[], blockTag?: BlockTag): Promise<(FillStatus | undefined)[]>;
|
|
16
17
|
export declare function findFillBlock(spokePool: Contract, relayData: RelayData, lowBlockNumber: number, highBlockNumber?: number): Promise<number | undefined>;
|
|
18
|
+
export declare function isZeroAddress(address: string): boolean;
|
|
17
19
|
export {};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.findFillBlock = exports.fillStatusArray = exports.relayFillStatus = exports.isUnsafeDepositId = exports.getRelayHashFromEvent = exports.getRelayDataHash = exports.getDepositIdAtBlock = exports.getBlockRangeForDepositId = exports.populateV3Relay = void 0;
|
|
3
|
+
exports.isZeroAddress = exports.findFillBlock = exports.fillStatusArray = exports.relayFillStatus = exports.isUnsafeDepositId = exports.getRelayHashFromEvent = exports.getRelayDataHash = exports.getDepositIdAtBlock = exports.getBlockRangeForDepositId = exports.populateV3Relay = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var assert_1 = tslib_1.__importDefault(require("assert"));
|
|
6
6
|
var ethers_1 = require("ethers");
|
|
@@ -42,6 +42,8 @@ function getBlockRangeForDepositId(targetDepositId, initLow, initHigh, maxSearch
|
|
|
42
42
|
return tslib_1.__generator(this, function (_b) {
|
|
43
43
|
switch (_b.label) {
|
|
44
44
|
case 0:
|
|
45
|
+
if (isUnsafeDepositId(targetDepositId))
|
|
46
|
+
throw new Error("Target deposit ID ".concat(targetDepositId, " is deterministic and therefore unresolvable via a binary search."));
|
|
45
47
|
deploymentBlock = spokePool.deploymentBlock;
|
|
46
48
|
initHigh = Math.min(initHigh, spokePool.latestBlockSearched);
|
|
47
49
|
[
|
|
@@ -85,11 +87,11 @@ function getBlockRangeForDepositId(targetDepositId, initLow, initHigh, maxSearch
|
|
|
85
87
|
])];
|
|
86
88
|
case 1:
|
|
87
89
|
_a = _b.sent(), highestDepositIdInRange = _a[0], lowestDepositIdInRange = _a[1];
|
|
88
|
-
if (highestDepositIdInRange
|
|
90
|
+
if (highestDepositIdInRange.lte(targetDepositId)) {
|
|
89
91
|
throw new Error("Target depositId is greater than the initial high block (".concat(targetDepositId, " > ").concat(highestDepositIdInRange, ")"));
|
|
90
92
|
}
|
|
91
|
-
if (lowestDepositIdInRange
|
|
92
|
-
throw new Error("Target depositId is less than the initial low block (".concat(targetDepositId, " > ").concat(lowestDepositIdInRange, ")"));
|
|
93
|
+
if (lowestDepositIdInRange.gt(targetDepositId)) {
|
|
94
|
+
throw new Error("Target depositId is less than the initial low block (".concat(targetDepositId.toString(), " > ").concat(lowestDepositIdInRange, ")"));
|
|
93
95
|
}
|
|
94
96
|
low = initLow;
|
|
95
97
|
high = initHigh;
|
|
@@ -100,8 +102,8 @@ function getBlockRangeForDepositId(targetDepositId, initLow, initHigh, maxSearch
|
|
|
100
102
|
return [4, _getDepositIdAtBlock(mid)];
|
|
101
103
|
case 3:
|
|
102
104
|
midDepositId = _b.sent();
|
|
103
|
-
accountedIdByMidBlock = midDepositId
|
|
104
|
-
if (targetDepositId
|
|
105
|
+
accountedIdByMidBlock = midDepositId.sub(BigNumberUtils_1.bnOne);
|
|
106
|
+
if (targetDepositId.lte(accountedIdByMidBlock)) {
|
|
105
107
|
high = mid;
|
|
106
108
|
}
|
|
107
109
|
else {
|
|
@@ -123,13 +125,14 @@ function getBlockRangeForDepositId(targetDepositId, initLow, initHigh, maxSearch
|
|
|
123
125
|
exports.getBlockRangeForDepositId = getBlockRangeForDepositId;
|
|
124
126
|
function getDepositIdAtBlock(contract, blockTag) {
|
|
125
127
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
126
|
-
var depositIdAtBlock;
|
|
128
|
+
var _depositIdAtBlock, depositIdAtBlock;
|
|
127
129
|
return tslib_1.__generator(this, function (_a) {
|
|
128
130
|
switch (_a.label) {
|
|
129
131
|
case 0: return [4, contract.numberOfDeposits({ blockTag: blockTag })];
|
|
130
132
|
case 1:
|
|
131
|
-
|
|
132
|
-
|
|
133
|
+
_depositIdAtBlock = _a.sent();
|
|
134
|
+
depositIdAtBlock = (0, BigNumberUtils_1.toBN)(_depositIdAtBlock);
|
|
135
|
+
if (depositIdAtBlock.lt(BigNumberUtils_1.bnZero)) {
|
|
133
136
|
throw new Error("Invalid deposit count");
|
|
134
137
|
}
|
|
135
138
|
return [2, depositIdAtBlock];
|
|
@@ -189,7 +192,7 @@ function relayFillStatus(spokePool, relayData, blockTag, destinationChainId) {
|
|
|
189
192
|
fillStatus = Number(_fillStatus);
|
|
190
193
|
if (![interfaces_1.FillStatus.Unfilled, interfaces_1.FillStatus.RequestedSlowFill, interfaces_1.FillStatus.Filled].includes(fillStatus)) {
|
|
191
194
|
originChainId = relayData.originChainId, depositId = relayData.depositId;
|
|
192
|
-
throw new Error("relayFillStatus: Unexpected fillStatus for ".concat(originChainId, " deposit ").concat(depositId, " (").concat(fillStatus, ")"));
|
|
195
|
+
throw new Error("relayFillStatus: Unexpected fillStatus for ".concat(originChainId, " deposit ").concat(depositId.toString(), " (").concat(fillStatus, ")"));
|
|
193
196
|
}
|
|
194
197
|
return [2, fillStatus];
|
|
195
198
|
}
|
|
@@ -277,7 +280,7 @@ function findFillBlock(spokePool, relayData, lowBlockNumber, highBlockNumber) {
|
|
|
277
280
|
if (initialFillStatus === interfaces_1.FillStatus.Filled) {
|
|
278
281
|
depositId = relayData.depositId, originChainId = relayData.originChainId;
|
|
279
282
|
_e = [(0, NetworkUtils_1.getNetworkName)(originChainId), (0, NetworkUtils_1.getNetworkName)(destinationChainId)], srcChain = _e[0], dstChain = _e[1];
|
|
280
|
-
throw new Error("".concat(srcChain, " deposit ").concat(depositId, " filled on ").concat(dstChain, " before block ").concat(lowBlockNumber));
|
|
283
|
+
throw new Error("".concat(srcChain, " deposit ").concat(depositId.toString(), " filled on ").concat(dstChain, " before block ").concat(lowBlockNumber));
|
|
281
284
|
}
|
|
282
285
|
_f.label = 9;
|
|
283
286
|
case 9:
|
|
@@ -301,4 +304,8 @@ function findFillBlock(spokePool, relayData, lowBlockNumber, highBlockNumber) {
|
|
|
301
304
|
});
|
|
302
305
|
}
|
|
303
306
|
exports.findFillBlock = findFillBlock;
|
|
307
|
+
function isZeroAddress(address) {
|
|
308
|
+
return address === constants_1.ZERO_ADDRESS || address === constants_1.ZERO_BYTES;
|
|
309
|
+
}
|
|
310
|
+
exports.isZeroAddress = isZeroAddress;
|
|
304
311
|
//# sourceMappingURL=SpokeUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SpokeUtils.js","sourceRoot":"","sources":["../../../src/utils/SpokeUtils.ts"],"names":[],"mappings":";;;;AAAA,0DAA4B;AAC5B,iCAAoG;AACpG,
|
|
1
|
+
{"version":3,"file":"SpokeUtils.js","sourceRoot":"","sources":["../../../src/utils/SpokeUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ var AddressValidator = (0, superstruct_1.define)("AddressValidator", function (v
|
|
|
8
8
|
var HexValidator = (0, superstruct_1.define)("HexValidator", function (v) { return ethers_1.utils.isHexString(String(v)); });
|
|
9
9
|
var BigNumberValidator = (0, superstruct_1.define)("BigNumberValidator", function (v) { return utils_1.BigNumber.isBigNumber(v); });
|
|
10
10
|
var V3DepositSchema = (0, superstruct_1.object)({
|
|
11
|
-
depositId:
|
|
11
|
+
depositId: BigNumberValidator,
|
|
12
12
|
depositor: AddressValidator,
|
|
13
13
|
recipient: AddressValidator,
|
|
14
14
|
inputToken: AddressValidator,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidatorUtils.js","sourceRoot":"","sources":["../../../src/utils/ValidatorUtils.ts"],"names":[],"mappings":";;;AAAA,iCAA8C;AAC9C,2CAA6F;AAE7F,kCAAqC;AAErC,IAAM,gBAAgB,GAAG,IAAA,oBAAM,EAAS,kBAAkB,EAAE,UAAC,CAAC,IAAK,OAAA,cAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAhC,CAAgC,CAAC,CAAC;AACrG,IAAM,YAAY,GAAG,IAAA,oBAAM,EAAS,cAAc,EAAE,UAAC,CAAC,IAAK,OAAA,cAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAlC,CAAkC,CAAC,CAAC;AAC/F,IAAM,kBAAkB,GAAG,IAAA,oBAAM,EAAY,oBAAoB,EAAE,UAAC,CAAC,IAAK,OAAA,iBAAS,CAAC,WAAW,CAAC,CAAC,CAAC,EAAxB,CAAwB,CAAC,CAAC;AAEpG,IAAM,eAAe,GAAG,IAAA,oBAAM,EAAC;IAC7B,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"ValidatorUtils.js","sourceRoot":"","sources":["../../../src/utils/ValidatorUtils.ts"],"names":[],"mappings":";;;AAAA,iCAA8C;AAC9C,2CAA6F;AAE7F,kCAAqC;AAErC,IAAM,gBAAgB,GAAG,IAAA,oBAAM,EAAS,kBAAkB,EAAE,UAAC,CAAC,IAAK,OAAA,cAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAhC,CAAgC,CAAC,CAAC;AACrG,IAAM,YAAY,GAAG,IAAA,oBAAM,EAAS,cAAc,EAAE,UAAC,CAAC,IAAK,OAAA,cAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAlC,CAAkC,CAAC,CAAC;AAC/F,IAAM,kBAAkB,GAAG,IAAA,oBAAM,EAAY,oBAAoB,EAAE,UAAC,CAAC,IAAK,OAAA,iBAAS,CAAC,WAAW,CAAC,CAAC,CAAC,EAAxB,CAAwB,CAAC,CAAC;AAEpG,IAAM,eAAe,GAAG,IAAA,oBAAM,EAAC;IAC7B,SAAS,EAAE,kBAAkB;IAC7B,SAAS,EAAE,gBAAgB;IAC3B,SAAS,EAAE,gBAAgB;IAC3B,UAAU,EAAE,gBAAgB;IAC5B,WAAW,EAAE,kBAAkB;IAC/B,aAAa,EAAE,IAAA,iBAAG,EAAC,IAAA,qBAAO,GAAE,EAAE,CAAC,CAAC;IAChC,kBAAkB,EAAE,IAAA,iBAAG,EAAC,IAAA,qBAAO,GAAE,EAAE,CAAC,CAAC;IACrC,cAAc,EAAE,IAAA,iBAAG,EAAC,IAAA,qBAAO,GAAE,EAAE,CAAC,CAAC;IACjC,YAAY,EAAE,IAAA,iBAAG,EAAC,IAAA,qBAAO,GAAE,EAAE,CAAC,CAAC;IAC/B,mBAAmB,EAAE,IAAA,iBAAG,EAAC,IAAA,qBAAO,GAAE,EAAE,CAAC,CAAC;IACtC,gBAAgB,EAAE,gBAAgB;IAClC,gBAAgB,EAAE,IAAA,sBAAQ,EAAC,kBAAkB,CAAC;IAC9C,WAAW,EAAE,gBAAgB;IAC7B,YAAY,EAAE,kBAAkB;IAChC,OAAO,EAAE,IAAA,oBAAM,GAAE;IACjB,gBAAgB,EAAE,IAAA,sBAAQ,EAAC,YAAY,CAAC;IACxC,mBAAmB,EAAE,IAAA,sBAAQ,EAAC,kBAAkB,CAAC;IACjD,gBAAgB,EAAE,IAAA,sBAAQ,EAAC,IAAA,oBAAM,GAAE,CAAC;IACpC,cAAc,EAAE,IAAA,sBAAQ,EAAC,IAAA,oBAAM,GAAE,CAAC;IAClC,WAAW,EAAE,IAAA,iBAAG,EAAC,IAAA,qBAAO,GAAE,EAAE,CAAC,CAAC;IAC9B,gBAAgB,EAAE,IAAA,iBAAG,EAAC,IAAA,qBAAO,GAAE,EAAE,CAAC,CAAC;IACnC,QAAQ,EAAE,IAAA,iBAAG,EAAC,IAAA,qBAAO,GAAE,EAAE,CAAC,CAAC;IAC3B,gBAAgB,EAAE,IAAA,iBAAG,EAAC,IAAA,qBAAO,GAAE,EAAE,CAAC,CAAC;IACnC,eAAe,EAAE,YAAY;IAC7B,aAAa,EAAE,IAAA,sBAAQ,EAAC,IAAA,qBAAO,GAAE,CAAC;IAClC,WAAW,EAAE,IAAA,sBAAQ,EAAC,IAAA,qBAAO,GAAE,CAAC;CACjC,CAAC,CAAC;AAEH,SAAgB,wBAAwB,CAAC,OAAgB;IACvD,OAAO,eAAe,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;AACrC,CAAC;AAFD,4DAEC"}
|
|
@@ -1068,7 +1068,7 @@ var BundleDataClient = /** @class */ (function () {
|
|
|
1068
1068
|
// spoke pool contract. However, this internal function is used to uniquely identify a bridging event
|
|
1069
1069
|
// for speed since its easier to build a string from the event data than to hash it.
|
|
1070
1070
|
BundleDataClient.prototype.getRelayHashFromEvent = function (event) {
|
|
1071
|
-
return "".concat(event.depositor, "-").concat(event.recipient, "-").concat(event.exclusiveRelayer, "-").concat(event.inputToken, "-").concat(event.outputToken, "-").concat(event.inputAmount, "-").concat(event.outputAmount, "-").concat(event.originChainId, "-").concat(event.depositId, "-").concat(event.fillDeadline, "-").concat(event.exclusivityDeadline, "-").concat(event.message, "-").concat(event.destinationChainId);
|
|
1071
|
+
return "".concat(event.depositor, "-").concat(event.recipient, "-").concat(event.exclusiveRelayer, "-").concat(event.inputToken, "-").concat(event.outputToken, "-").concat(event.inputAmount, "-").concat(event.outputAmount, "-").concat(event.originChainId, "-").concat(event.depositId.toString(), "-").concat(event.fillDeadline, "-").concat(event.exclusivityDeadline, "-").concat(event.message, "-").concat(event.destinationChainId);
|
|
1072
1072
|
};
|
|
1073
1073
|
BundleDataClient.prototype.getBundleBlockTimestamps = function (chainIds, blockRangesForChains, spokePoolClients) {
|
|
1074
1074
|
return __awaiter(this, void 0, void 0, function () {
|