@across-protocol/sdk 4.3.150-alpha.1 → 4.3.150
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/src/clients/SpokePoolClient/EVMSpokePoolClient.js +5 -18
- package/dist/cjs/src/clients/SpokePoolClient/EVMSpokePoolClient.js.map +1 -1
- package/dist/cjs/src/clients/mocks/MockEvents.d.ts +0 -1
- package/dist/cjs/src/clients/mocks/MockEvents.js +0 -5
- package/dist/cjs/src/clients/mocks/MockEvents.js.map +1 -1
- package/dist/cjs/src/clients/mocks/index.d.ts +0 -1
- package/dist/cjs/src/clients/mocks/index.js +0 -1
- package/dist/cjs/src/clients/mocks/index.js.map +1 -1
- package/dist/esm/src/clients/SpokePoolClient/EVMSpokePoolClient.d.ts +1 -1
- package/dist/esm/src/clients/SpokePoolClient/EVMSpokePoolClient.js +7 -20
- package/dist/esm/src/clients/SpokePoolClient/EVMSpokePoolClient.js.map +1 -1
- package/dist/esm/src/clients/mocks/MockEvents.d.ts +0 -1
- package/dist/esm/src/clients/mocks/MockEvents.js +0 -7
- package/dist/esm/src/clients/mocks/MockEvents.js.map +1 -1
- package/dist/esm/src/clients/mocks/index.d.ts +0 -1
- package/dist/esm/src/clients/mocks/index.js +0 -1
- package/dist/esm/src/clients/mocks/index.js.map +1 -1
- package/dist/types/src/clients/SpokePoolClient/EVMSpokePoolClient.d.ts +1 -1
- package/dist/types/src/clients/SpokePoolClient/EVMSpokePoolClient.d.ts.map +1 -1
- package/dist/types/src/clients/mocks/MockEvents.d.ts +0 -1
- package/dist/types/src/clients/mocks/MockEvents.d.ts.map +1 -1
- package/dist/types/src/clients/mocks/index.d.ts +0 -1
- package/dist/types/src/clients/mocks/index.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/clients/SpokePoolClient/EVMSpokePoolClient.ts +6 -28
- package/src/clients/mocks/MockEvents.ts +0 -8
- package/src/clients/mocks/index.ts +0 -1
|
@@ -38,25 +38,12 @@ class EVMSpokePoolClient extends SpokePoolClient_1.SpokePoolClient {
|
|
|
38
38
|
return Object.keys(this._availableEventsOnSpoke(SpokePoolClient_1.knownEventNames));
|
|
39
39
|
}
|
|
40
40
|
async _getCurrentTime(blockNumber) {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
throw new Error(`EVMSpokePoolClient::_getCurrentTimeTvm: currentTime: ${currentTime} < ${this.currentTime}`);
|
|
46
|
-
}
|
|
47
|
-
return currentTime;
|
|
48
|
-
}
|
|
49
|
-
const { spokePool } = this;
|
|
50
|
-
const multicallFunctions = ["getCurrentTime"];
|
|
51
|
-
const multicallOutput = await spokePool.callStatic.multicall(multicallFunctions.map((f) => spokePool.interface.encodeFunctionData(f)), { blockTag: blockNumber });
|
|
52
|
-
const [currentTime] = multicallFunctions.map((fn, idx) => spokePool.interface.decodeFunctionResult(fn, multicallOutput[idx])[0]);
|
|
53
|
-
if (!utils_1.BigNumber.isBigNumber(currentTime) || currentTime.lt(this.currentTime)) {
|
|
54
|
-
const errMsg = utils_1.BigNumber.isBigNumber(currentTime)
|
|
55
|
-
? `currentTime: ${currentTime} < ${(0, utils_1.toBN)(this.currentTime)}`
|
|
56
|
-
: `currentTime is not a BigNumber: ${JSON.stringify(currentTime)}`;
|
|
57
|
-
throw new Error(`EVMSpokePoolClient::update: ${errMsg}`);
|
|
41
|
+
const block = await this.spokePool.provider.getBlock(blockNumber);
|
|
42
|
+
const currentTime = block.timestamp;
|
|
43
|
+
if (currentTime < this.currentTime) {
|
|
44
|
+
throw new Error(`EVMSpokePoolClient::_getCurrentTime: currentTime: ${currentTime} < ${this.currentTime}`);
|
|
58
45
|
}
|
|
59
|
-
return currentTime
|
|
46
|
+
return currentTime;
|
|
60
47
|
}
|
|
61
48
|
async _update(eventsToQuery) {
|
|
62
49
|
const searchConfig = await this.updateSearchConfig(this.spokePool.provider);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EVMSpokePoolClient.js","sourceRoot":"","sources":["../../../../../src/clients/SpokePoolClient/EVMSpokePoolClient.ts"],"names":[],"mappings":";;;AACA,wCAOwB;AACxB,wCAKwB;AAExB,
|
|
1
|
+
{"version":3,"file":"EVMSpokePoolClient.js","sourceRoot":"","sources":["../../../../../src/clients/SpokePoolClient/EVMSpokePoolClient.ts"],"names":[],"mappings":";;;AACA,wCAOwB;AACxB,wCAKwB;AAExB,uCASqB;AACrB,uDAMgC;AAChC,8DAA8D;AAC9D,uDAAsF;AAGtF,mCAAqD;AAKrD,MAAa,kBAAmB,SAAQ,iCAAe;IAMnC;IALT,IAAI,GAAG,kCAA0B,CAAC;IAClC,GAAG,CAAU;IAEtB,YACE,MAAsB,EACN,SAAmB,EACnC,aAAmC,EACnC,OAAe,EACf,eAAuB,EACvB,oBAA2D,EAAE,IAAI,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE;QAEtF,KAAK,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,eAAe,EAAE,iBAAiB,CAAC,CAAC;QAN1D,cAAS,GAAT,SAAS,CAAU;QAOnC,IAAI,CAAC,gBAAgB,GAAG,kBAAU,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC3D,IAAI,CAAC,GAAG,GAAG,IAAA,kBAAU,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAEe,eAAe,CAAC,SAAoB,EAAE,QAAiB;QACrE,MAAM,iBAAiB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,qBAAkB,CAAC,CAAC,CAAC,qBAAe,CAAC;QAC1E,OAAO,iBAAiB,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC9E,CAAC;IAEe,eAAe,CAAC,SAAsB,EAAE,QAAiB;QACvE,OAAO,IAAA,qBAAe,EAAC,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC9D,CAAC;IAEe,yBAAyB,CAAC,UAAkB,EAAE,QAAgB;QAC5E,MAAM,6BAA6B,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,+BAAqB,CAAC,CAAC,CAAC,+BAAkB,CAAC;QAC5F,OAAO,6BAA6B,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC7E,CAAC;IAEO,uBAAuB,CAAC,aAAuB,iCAAe;QACpE,OAAO,MAAM,CAAC,WAAW,CACvB,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS;aAC/B,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,OAAO,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;aACzE,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAC7D,CAAC;IACJ,CAAC;IAEe,oBAAoB;QAClC,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,iCAAe,CAAC,CAAC,CAAC;IACpE,CAAC;IAQS,KAAK,CAAC,eAAe,CAAC,WAAmB;QACjD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAClE,MAAM,WAAW,GAAG,KAAK,CAAC,SAAS,CAAC;QACpC,IAAI,WAAW,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,qDAAqD,WAAW,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QAC5G,CAAC;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;IAEkB,KAAK,CAAC,OAAO,CAAC,aAAuB;QACtD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC5E,IAAI,IAAA,0CAAqB,EAAC,YAAY,CAAC,EAAE,CAAC;YACxC,MAAM,MAAM,GAAG,YAAY,CAAC;YAC5B,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QACpC,CAAC;QAED,MAAM,kBAAkB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;YACzD,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;gBACrD,MAAM,IAAI,KAAK,CAAC,oEAAoE,SAAS,EAAE,CAAC,CAAC;YACnG,CAAC;YAED,MAAM,aAAa,GAAG,EAAE,GAAG,YAAY,EAAE,CAAC;YAK1C,IAAI,SAAS,KAAK,qBAAqB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gBAC3D,aAAa,CAAC,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC;YAC5C,CAAC;YAED,OAAO;gBACL,MAAM,EAAE,IAAI,CAAC,uBAAuB,EAAE,CAAC,SAAS,CAAC;gBACjD,YAAY,EAAE,aAAa;aAC5B,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,uCAAuC,IAAI,CAAC,OAAO,EAAE,EAAE;YACvE,aAAa;YACb,YAAY;YACZ,SAAS,EAAE,SAAS,CAAC,OAAO;SAC7B,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC9B,MAAM,CAAC,WAAW,EAAE,GAAG,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACjD,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;YACrC,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAA,gCAAmB,EAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;SAC/G,CAAC,CAAC;QACH,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,yCAAyC,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC,GAAG,EAAE,GAAG,UAAU,KAAK,CAAC,CAAC;QAE1G,IAAI,WAAW,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,4CAA4C,WAAW,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QACnG,CAAC;QAGD,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAA,uCAA0B,EAAC,MAAM,CAAC,GAAG,CAAC,+BAAkB,CAAC,CAAC,CAAC,CAAC;QAGvF,MAAM,qBAAqB,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CACrD,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,uCAA0B,EAAC,KAAK,CAAC,CAAC,CAC5D,CAAC;QAEF,OAAO;YACL,OAAO,EAAE,IAAI;YACb,WAAW;YACX,cAAc,EAAE,YAAY,CAAC,EAAE;YAC/B,MAAM,EAAE,qBAAqB;SAC9B,CAAC;IACJ,CAAC;IAEe,SAAS,CAAC,WAAmB;QAC3C,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,eAAa,CAAC,CAAC,CAAC,eAAU,CAAC;QAC/D,OAAO,gBAAgB,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IACvD,CAAC;IAEe,KAAK,CAAC,WAAW,CAAC,SAAoB;QACpD,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACzC,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QAClC,CAAC;QAGD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAExD,IAAI,QAAQ,IAAI,MAAM,EAAE,CAAC;YACvB,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,mBAAW,CAAC,iBAAiB,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;QACtF,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QAEpC,MAAM,cAAc,GAAG,IAAA,0BAAkB,EAAC,IAAA,uCAA0B,EAAC,KAAK,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3F,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAClF,MAAM,WAAW,GAAG,cAAc,CAAC,WAAW,CAAC,aAAa,EAAE;YAC5D,CAAC,CAAC,IAAI,CAAC,6BAA6B,CAAC,EAAE,GAAG,cAAc,EAAE,gBAAgB,EAAE,CAAC;YAC7E,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC;QAE/B,OAAO,GAAG;YACR,GAAG,cAAc;YACjB,WAAW;YACX,gBAAgB;YAChB,aAAa,EAAE,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC;YACrD,WAAW,EAAE,IAAI,CAAC,sBAAsB,CAAC,cAAc,CAAC;SAC9B,CAAC;QAE7B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;YAChB,EAAE,EAAE,6BAA6B;YACjC,OAAO,EAAE,2DAA2D;YACpE,OAAO;YACP,SAAS;SACV,CAAC,CAAC;QACH,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAClC,CAAC;IAEe,oBAAoB,CAAC,WAAmB;QACtD,OAAO,IAAA,0BAAqB,EAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IACrE,CAAC;IAOS,iBAAiB,CAAC,SAAoB,EAAE,QAAgB,EAAE,SAAkB;QACpF,MAAM,uBAAuB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,sBAAmB,CAAC,CAAC,CAAC,sBAAgB,CAAC;QAClF,OAAO,uBAAuB,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IACjF,CAAC;IAES,KAAK,CAAC,kBAAkB,CAChC,SAAoB;QAEpB,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,IAAI,SAAS,CAAC;QAC1D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;QACvF,MAAM,KAAK,GAAG,IAAA,sBAAc,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE3C,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO;gBACL,MAAM,EAAE,kBAAkB,KAAK,cAAc,SAAS,mBAAmB,IAAI,CAAC,eAAe,KAC3F,UAAU,IAAI,QAChB,IAAI;aACL,CAAC;QACJ,CAAC;QAED,MAAM,EAAE,GAAG,IAAI,CAAC;QAEhB,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC;QAC/C,MAAM,MAAM,GAAG,CACb,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,IAAA,gCAAmB,EACjB,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,EAChF,EAAE,IAAI,EAAE,EAAE,EAAE,WAAW,EAAE,CAC1B;YACD,IAAA,gCAAmB,EACjB,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,EAC9E,EAAE,IAAI,EAAE,EAAE,EAAE,WAAW,EAAE,CAC1B;SACF,CAAC,CACH;aACE,IAAI,EAAE;aACN,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;QAEzD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACzB,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC;QACvB,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO;gBACL,MAAM,EAAE,kBAAkB,KAAK,cAAc,SAAS,mBAAmB,IAAI,KAAK,UAAU,IAAI,QAAQ,IAAI;aAC7G,CAAC;QACJ,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,GAAG,MAAM,EAAE,CAAC;IAC9C,CAAC;CACF;AA9ND,gDA8NC"}
|
|
@@ -21,7 +21,6 @@ export declare class EventManager {
|
|
|
21
21
|
addEventSignatures(eventSignatures: Record<string, string>): void;
|
|
22
22
|
addEvent(event: Log): void;
|
|
23
23
|
getEvents(): Log[];
|
|
24
|
-
reset(blockNumber?: number): void;
|
|
25
24
|
generateEvent(inputs: EthersEventTemplate): Log;
|
|
26
25
|
}
|
|
27
26
|
export declare function getEventManager(chainId: number, eventSignatures?: Record<string, string>, blockNumber?: number): EventManager;
|
|
@@ -34,11 +34,6 @@ class EventManager {
|
|
|
34
34
|
this.events = [];
|
|
35
35
|
return events;
|
|
36
36
|
}
|
|
37
|
-
reset(blockNumber = 0) {
|
|
38
|
-
this.blockNumber = blockNumber;
|
|
39
|
-
this.logIndexes = {};
|
|
40
|
-
this.events = [];
|
|
41
|
-
}
|
|
42
37
|
generateEvent(inputs) {
|
|
43
38
|
const { address, event, topics, data, args } = inputs;
|
|
44
39
|
let { blockNumber, transactionIndex } = inputs;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MockEvents.js","sourceRoot":"","sources":["../../../../../src/clients/mocks/MockEvents.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"MockEvents.js","sourceRoot":"","sources":["../../../../../src/clients/mocks/MockEvents.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
tslib_1.__exportStar(require("./MockConfigStoreClient"), exports);
|
|
5
|
-
tslib_1.__exportStar(require("./MockEvents"), exports);
|
|
6
5
|
tslib_1.__exportStar(require("./MockHubPoolClient"), exports);
|
|
7
6
|
tslib_1.__exportStar(require("./MockSpokePoolClient"), exports);
|
|
8
7
|
tslib_1.__exportStar(require("./MockSvmCpiEventsClient"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/clients/mocks/index.ts"],"names":[],"mappings":";;;AAAA,kEAAwC;AACxC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/clients/mocks/index.ts"],"names":[],"mappings":";;;AAAA,kEAAwC;AACxC,8DAAoC;AACpC,gEAAsC;AACtC,mEAAyC;AACzC,mEAAyC"}
|
|
@@ -20,7 +20,7 @@ export declare class EVMSpokePoolClient extends SpokePoolClient {
|
|
|
20
20
|
_queryableEventNames(): string[];
|
|
21
21
|
/**
|
|
22
22
|
* Retrieve the on-chain time at a specific block.
|
|
23
|
-
*
|
|
23
|
+
* Reads the block timestamp, which is well-supported for historical queries on both EVM and TVM.
|
|
24
24
|
* @param blockNumber The block number to query.
|
|
25
25
|
* @returns The on-chain time as a number.
|
|
26
26
|
*/
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { fillStatusArray, findDepositBlock, getMaxFillDeadlineInRange as getMaxFillDeadline, getTimeAt as _getTimeAt, relayFillStatus, getTimestampForBlock as _getTimestampForBlock, } from "../../arch/evm";
|
|
2
2
|
import { relayFillStatus as relayFillStatusTvm, getMaxFillDeadlineInRange as getMaxFillDeadlineTvm, getTimeAt as _getTimeAtTvm, findDepositBlock as findDepositBlockTvm, } from "../../arch/tvm";
|
|
3
|
-
import {
|
|
3
|
+
import { getNetworkName, InvalidFill, EvmAddress, unpackDepositEvent, chainIsTvm, } from "../../utils";
|
|
4
4
|
import { logToSortableEvent, paginatedEventQuery, sortEventsAscendingInPlace, spreadEventWithBlockNumber, } from "../../utils/EventUtils";
|
|
5
5
|
import { isUpdateFailureReason } from "../BaseAbstractClient";
|
|
6
6
|
import { knownEventNames, SpokePoolClient } from "./SpokePoolClient";
|
|
@@ -39,30 +39,17 @@ export class EVMSpokePoolClient extends SpokePoolClient {
|
|
|
39
39
|
}
|
|
40
40
|
/**
|
|
41
41
|
* Retrieve the on-chain time at a specific block.
|
|
42
|
-
*
|
|
42
|
+
* Reads the block timestamp, which is well-supported for historical queries on both EVM and TVM.
|
|
43
43
|
* @param blockNumber The block number to query.
|
|
44
44
|
* @returns The on-chain time as a number.
|
|
45
45
|
*/
|
|
46
46
|
async _getCurrentTime(blockNumber) {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
throw new Error(`EVMSpokePoolClient::_getCurrentTimeTvm: currentTime: ${currentTime} < ${this.currentTime}`);
|
|
52
|
-
}
|
|
53
|
-
return currentTime;
|
|
54
|
-
}
|
|
55
|
-
const { spokePool } = this;
|
|
56
|
-
const multicallFunctions = ["getCurrentTime"];
|
|
57
|
-
const multicallOutput = await spokePool.callStatic.multicall(multicallFunctions.map((f) => spokePool.interface.encodeFunctionData(f)), { blockTag: blockNumber });
|
|
58
|
-
const [currentTime] = multicallFunctions.map((fn, idx) => spokePool.interface.decodeFunctionResult(fn, multicallOutput[idx])[0]);
|
|
59
|
-
if (!BigNumber.isBigNumber(currentTime) || currentTime.lt(this.currentTime)) {
|
|
60
|
-
const errMsg = BigNumber.isBigNumber(currentTime)
|
|
61
|
-
? `currentTime: ${currentTime} < ${toBN(this.currentTime)}`
|
|
62
|
-
: `currentTime is not a BigNumber: ${JSON.stringify(currentTime)}`;
|
|
63
|
-
throw new Error(`EVMSpokePoolClient::update: ${errMsg}`);
|
|
47
|
+
const block = await this.spokePool.provider.getBlock(blockNumber);
|
|
48
|
+
const currentTime = block.timestamp;
|
|
49
|
+
if (currentTime < this.currentTime) {
|
|
50
|
+
throw new Error(`EVMSpokePoolClient::_getCurrentTime: currentTime: ${currentTime} < ${this.currentTime}`);
|
|
64
51
|
}
|
|
65
|
-
return currentTime
|
|
52
|
+
return currentTime;
|
|
66
53
|
}
|
|
67
54
|
async _update(eventsToQuery) {
|
|
68
55
|
const searchConfig = await this.updateSearchConfig(this.spokePool.provider);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EVMSpokePoolClient.js","sourceRoot":"","sources":["../../../../../src/clients/SpokePoolClient/EVMSpokePoolClient.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,yBAAyB,IAAI,kBAAkB,EAC/C,SAAS,IAAI,UAAU,EACvB,eAAe,EACf,oBAAoB,IAAI,qBAAqB,GAC9C,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,eAAe,IAAI,kBAAkB,EACrC,yBAAyB,IAAI,qBAAqB,EAClD,SAAS,IAAI,aAAa,EAC1B,gBAAgB,IAAI,mBAAmB,GACxC,MAAM,gBAAgB,CAAC;AAExB,OAAO,
|
|
1
|
+
{"version":3,"file":"EVMSpokePoolClient.js","sourceRoot":"","sources":["../../../../../src/clients/SpokePoolClient/EVMSpokePoolClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,13 +29,6 @@ export class EventManager {
|
|
|
29
29
|
this.events = [];
|
|
30
30
|
return events;
|
|
31
31
|
}
|
|
32
|
-
// Reset internal state. Lets a chain-keyed singleton be reused across test
|
|
33
|
-
// contexts that begin at different block numbers.
|
|
34
|
-
reset(blockNumber = 0) {
|
|
35
|
-
this.blockNumber = blockNumber;
|
|
36
|
-
this.logIndexes = {};
|
|
37
|
-
this.events = [];
|
|
38
|
-
}
|
|
39
32
|
generateEvent(inputs) {
|
|
40
33
|
const { address, event, topics, data, args } = inputs;
|
|
41
34
|
let { blockNumber, transactionIndex } = inputs;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MockEvents.js","sourceRoot":"","sources":["../../../../../src/clients/mocks/MockEvents.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,WAAW,CAAC;AAgBnD,MAAM,aAAa,GAAwC,EAAE,CAAC;AAE9D,MAAM,OAAO,YAAY;IAMJ;IALX,UAAU,GAA2B,EAAE,CAAC;IACzC,MAAM,GAAU,EAAE,CAAC;IACV,aAAa,GAAG,EAAE,CAAC;IACnB,eAAe,GAA2B,EAAE,CAAC;IAE7D,YAAmB,cAAc,CAAC;QAAf,gBAAW,GAAX,WAAW,CAAI;IAAG,CAAC;IAEtC,kBAAkB,CAAC,eAAuC;QACxD,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,EAAE;YAC7D,IAAI,SAAS,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;gBAC3C,MAAM,CAAC,SAAS,KAAK,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,SAAS,KAAK,qBAAqB,CAAC,CAAC;YACzF,CAAC;YACD,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;QAC1C,CAAC,CAAC,CAAC;IACL,CAAC;IAED,QAAQ,CAAC,KAAU;QACjB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;IAED,SAAS;QACP,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"MockEvents.js","sourceRoot":"","sources":["../../../../../src/clients/mocks/MockEvents.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/clients/mocks/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/clients/mocks/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC"}
|
|
@@ -20,7 +20,7 @@ export declare class EVMSpokePoolClient extends SpokePoolClient {
|
|
|
20
20
|
_queryableEventNames(): string[];
|
|
21
21
|
/**
|
|
22
22
|
* Retrieve the on-chain time at a specific block.
|
|
23
|
-
*
|
|
23
|
+
* Reads the block timestamp, which is well-supported for historical queries on both EVM and TVM.
|
|
24
24
|
* @param blockNumber The block number to query.
|
|
25
25
|
* @returns The on-chain time as a number.
|
|
26
26
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EVMSpokePoolClient.d.ts","sourceRoot":"","sources":["../../../../../src/clients/SpokePoolClient/EVMSpokePoolClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAe,MAAM,QAAQ,CAAC;AAe/C,OAAO,EAAoB,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAChF,OAAO,EACL,SAAS,EACT,mBAAmB,EAGnB,YAAY,
|
|
1
|
+
{"version":3,"file":"EVMSpokePoolClient.d.ts","sourceRoot":"","sources":["../../../../../src/clients/SpokePoolClient/EVMSpokePoolClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAe,MAAM,QAAQ,CAAC;AAe/C,OAAO,EAAoB,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAChF,OAAO,EACL,SAAS,EACT,mBAAmB,EAGnB,YAAY,EAIb,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,iBAAiB,EAKlB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAmB,eAAe,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACtF,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,eAAe;aAMnC,SAAS,EAAE,QAAQ;IALrC,QAAQ,CAAC,IAAI,SAA8B;IAC3C,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC;gBAGpB,MAAM,EAAE,OAAO,CAAC,MAAM,EACN,SAAS,EAAE,QAAQ,EACnC,aAAa,EAAE,aAAa,GAAG,IAAI,EACnC,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,MAAM,EACvB,iBAAiB,GAAE,YAAY,CAAC,iBAAiB,EAAE,IAAI,CAA+B;IAOxE,eAAe,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAK7E,eAAe,CAAC,SAAS,EAAE,SAAS,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,UAAU,GAAG,SAAS,CAAC,EAAE,CAAC;IAI/F,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKhG,OAAO,CAAC,uBAAuB;IAQf,oBAAoB,IAAI,MAAM,EAAE;IAIhD;;;;;OAKG;cACa,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;cAS5C,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC;IA6DnE,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKzC,WAAW,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAsCrE,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI1E;;;;OAIG;IACH,SAAS,CAAC,iBAAiB,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;cAKpG,kBAAkB,CAChC,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC;QAAE,KAAK,EAAE,GAAG,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CA4CnE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MockEvents.d.ts","sourceRoot":"","sources":["../../../../../src/clients/mocks/MockEvents.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AAIvC,MAAM,MAAM,cAAc,GAAG;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,EAAE,CAAC;IAEjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAIF,qBAAa,YAAY;IAMJ,WAAW;IAL9B,OAAO,CAAC,UAAU,CAA8B;IACzC,MAAM,EAAE,GAAG,EAAE,CAAM;IAC1B,SAAgB,aAAa,MAAM;IACnC,SAAgB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM;gBAE1C,WAAW,SAAI;IAElC,kBAAkB,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IASjE,QAAQ,CAAC,KAAK,EAAE,GAAG,GAAG,IAAI;IAI1B,SAAS,IAAI,GAAG,EAAE;
|
|
1
|
+
{"version":3,"file":"MockEvents.d.ts","sourceRoot":"","sources":["../../../../../src/clients/mocks/MockEvents.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AAIvC,MAAM,MAAM,cAAc,GAAG;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,EAAE,CAAC;IAEjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAIF,qBAAa,YAAY;IAMJ,WAAW;IAL9B,OAAO,CAAC,UAAU,CAA8B;IACzC,MAAM,EAAE,GAAG,EAAE,CAAM;IAC1B,SAAgB,aAAa,MAAM;IACnC,SAAgB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM;gBAE1C,WAAW,SAAI;IAElC,kBAAkB,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IASjE,QAAQ,CAAC,KAAK,EAAE,GAAG,GAAG,IAAI;IAI1B,SAAS,IAAI,GAAG,EAAE;IAMlB,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,GAAG;CAgChD;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACxC,WAAW,CAAC,EAAE,MAAM,GACnB,YAAY,CASd"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/clients/mocks/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/clients/mocks/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC"}
|
package/package.json
CHANGED
|
@@ -20,7 +20,6 @@ import {
|
|
|
20
20
|
getNetworkName,
|
|
21
21
|
InvalidFill,
|
|
22
22
|
MakeOptional,
|
|
23
|
-
toBN,
|
|
24
23
|
EvmAddress,
|
|
25
24
|
unpackDepositEvent,
|
|
26
25
|
chainIsTvm,
|
|
@@ -86,38 +85,17 @@ export class EVMSpokePoolClient extends SpokePoolClient {
|
|
|
86
85
|
|
|
87
86
|
/**
|
|
88
87
|
* Retrieve the on-chain time at a specific block.
|
|
89
|
-
*
|
|
88
|
+
* Reads the block timestamp, which is well-supported for historical queries on both EVM and TVM.
|
|
90
89
|
* @param blockNumber The block number to query.
|
|
91
90
|
* @returns The on-chain time as a number.
|
|
92
91
|
*/
|
|
93
92
|
protected async _getCurrentTime(blockNumber: number): Promise<number> {
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
throw new Error(`EVMSpokePoolClient::_getCurrentTimeTvm: currentTime: ${currentTime} < ${this.currentTime}`);
|
|
99
|
-
}
|
|
100
|
-
return currentTime;
|
|
101
|
-
}
|
|
102
|
-
const { spokePool } = this;
|
|
103
|
-
const multicallFunctions = ["getCurrentTime"];
|
|
104
|
-
const multicallOutput = await spokePool.callStatic.multicall(
|
|
105
|
-
multicallFunctions.map((f) => spokePool.interface.encodeFunctionData(f)),
|
|
106
|
-
{ blockTag: blockNumber }
|
|
107
|
-
);
|
|
108
|
-
|
|
109
|
-
const [currentTime] = multicallFunctions.map(
|
|
110
|
-
(fn, idx) => spokePool.interface.decodeFunctionResult(fn, multicallOutput[idx])[0]
|
|
111
|
-
);
|
|
112
|
-
|
|
113
|
-
if (!BigNumber.isBigNumber(currentTime) || currentTime.lt(this.currentTime)) {
|
|
114
|
-
const errMsg = BigNumber.isBigNumber(currentTime)
|
|
115
|
-
? `currentTime: ${currentTime} < ${toBN(this.currentTime)}`
|
|
116
|
-
: `currentTime is not a BigNumber: ${JSON.stringify(currentTime)}`;
|
|
117
|
-
throw new Error(`EVMSpokePoolClient::update: ${errMsg}`);
|
|
93
|
+
const block = await this.spokePool.provider.getBlock(blockNumber);
|
|
94
|
+
const currentTime = block.timestamp;
|
|
95
|
+
if (currentTime < this.currentTime) {
|
|
96
|
+
throw new Error(`EVMSpokePoolClient::_getCurrentTime: currentTime: ${currentTime} < ${this.currentTime}`);
|
|
118
97
|
}
|
|
119
|
-
|
|
120
|
-
return currentTime.toNumber();
|
|
98
|
+
return currentTime;
|
|
121
99
|
}
|
|
122
100
|
|
|
123
101
|
protected override async _update(eventsToQuery: string[]): Promise<SpokePoolUpdate> {
|
|
@@ -49,14 +49,6 @@ export class EventManager {
|
|
|
49
49
|
return events;
|
|
50
50
|
}
|
|
51
51
|
|
|
52
|
-
// Reset internal state. Lets a chain-keyed singleton be reused across test
|
|
53
|
-
// contexts that begin at different block numbers.
|
|
54
|
-
reset(blockNumber = 0): void {
|
|
55
|
-
this.blockNumber = blockNumber;
|
|
56
|
-
this.logIndexes = {};
|
|
57
|
-
this.events = [];
|
|
58
|
-
}
|
|
59
|
-
|
|
60
52
|
generateEvent(inputs: EthersEventTemplate): Log {
|
|
61
53
|
const { address, event, topics, data, args } = inputs;
|
|
62
54
|
let { blockNumber, transactionIndex } = inputs;
|