@across-protocol/sdk 4.3.150-alpha.2 → 4.3.151
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/MockConfigStoreClient.js.map +1 -1
- package/dist/cjs/src/utils/SpokeUtils.js +25 -25
- package/dist/cjs/src/utils/SpokeUtils.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/MockConfigStoreClient.js +1 -1
- package/dist/esm/src/clients/mocks/MockConfigStoreClient.js.map +1 -1
- package/dist/esm/src/utils/SpokeUtils.js +25 -25
- package/dist/esm/src/utils/SpokeUtils.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/MockConfigStoreClient.d.ts.map +1 -1
- package/dist/types/src/utils/SpokeUtils.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/clients/SpokePoolClient/EVMSpokePoolClient.ts +6 -28
- package/src/clients/mocks/MockConfigStoreClient.ts +1 -7
- package/src/clients/mocks/MockEvents.ts +0 -1
- package/src/utils/SpokeUtils.ts +26 -25
|
@@ -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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MockConfigStoreClient.js","sourceRoot":"","sources":["../../../../../src/clients/mocks/MockConfigStoreClient.ts"],"names":[],"mappings":";;;;AAAA,4DAA4B;AAE5B,mCAA0C;AAE1C,
|
|
1
|
+
{"version":3,"file":"MockConfigStoreClient.js","sourceRoot":"","sources":["../../../../../src/clients/mocks/MockConfigStoreClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,27 +55,31 @@ function unpackFillEvent(rawEvent, destinationChainId) {
|
|
|
55
55
|
},
|
|
56
56
|
};
|
|
57
57
|
}
|
|
58
|
+
const RELAYDATA_ABI = [
|
|
59
|
+
{
|
|
60
|
+
type: "tuple",
|
|
61
|
+
components: [
|
|
62
|
+
{ type: "bytes32", name: "depositor" },
|
|
63
|
+
{ type: "bytes32", name: "recipient" },
|
|
64
|
+
{ type: "bytes32", name: "exclusiveRelayer" },
|
|
65
|
+
{ type: "bytes32", name: "inputToken" },
|
|
66
|
+
{ type: "bytes32", name: "outputToken" },
|
|
67
|
+
{ type: "uint256", name: "inputAmount" },
|
|
68
|
+
{ type: "uint256", name: "outputAmount" },
|
|
69
|
+
{ type: "uint256", name: "originChainId" },
|
|
70
|
+
{ type: "uint256", name: "depositId" },
|
|
71
|
+
{ type: "uint32", name: "fillDeadline" },
|
|
72
|
+
{ type: "uint32", name: "exclusivityDeadline" },
|
|
73
|
+
{ type: "bytes", name: "message" },
|
|
74
|
+
],
|
|
75
|
+
},
|
|
76
|
+
{ type: "uint256", name: "destinationChainId" },
|
|
77
|
+
];
|
|
58
78
|
function getRelayDataHash(relayData, destinationChainId) {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
{ type: "bytes32", name: "depositor" },
|
|
64
|
-
{ type: "bytes32", name: "recipient" },
|
|
65
|
-
{ type: "bytes32", name: "exclusiveRelayer" },
|
|
66
|
-
{ type: "bytes32", name: "inputToken" },
|
|
67
|
-
{ type: "bytes32", name: "outputToken" },
|
|
68
|
-
{ type: "uint256", name: "inputAmount" },
|
|
69
|
-
{ type: "uint256", name: "outputAmount" },
|
|
70
|
-
{ type: "uint256", name: "originChainId" },
|
|
71
|
-
{ type: "uint256", name: "depositId" },
|
|
72
|
-
{ type: "uint32", name: "fillDeadline" },
|
|
73
|
-
{ type: "uint32", name: "exclusivityDeadline" },
|
|
74
|
-
{ type: "bytes", name: "message" },
|
|
75
|
-
],
|
|
76
|
-
},
|
|
77
|
-
{ type: "uint256", name: "destinationChainId" },
|
|
78
|
-
];
|
|
79
|
+
if ((0, NetworkUtils_1.chainIsSvm)(destinationChainId)) {
|
|
80
|
+
const messageHash = getMessageHash(relayData.message);
|
|
81
|
+
return arch_1.svm.getRelayDataHash({ ...relayData, messageHash }, destinationChainId);
|
|
82
|
+
}
|
|
79
83
|
const _relayData = {
|
|
80
84
|
...relayData,
|
|
81
85
|
depositor: relayData.depositor.toBytes32(),
|
|
@@ -84,11 +88,7 @@ function getRelayDataHash(relayData, destinationChainId) {
|
|
|
84
88
|
outputToken: relayData.outputToken.toBytes32(),
|
|
85
89
|
exclusiveRelayer: relayData.exclusiveRelayer.toBytes32(),
|
|
86
90
|
};
|
|
87
|
-
|
|
88
|
-
const messageHash = getMessageHash(relayData.message);
|
|
89
|
-
return arch_1.svm.getRelayDataHash({ ...relayData, messageHash }, destinationChainId);
|
|
90
|
-
}
|
|
91
|
-
return (0, viem_1.keccak256)((0, viem_1.encodeAbiParameters)(abi, [_relayData, destinationChainId]));
|
|
91
|
+
return (0, viem_1.keccak256)((0, viem_1.encodeAbiParameters)(RELAYDATA_ABI, [_relayData, destinationChainId]));
|
|
92
92
|
}
|
|
93
93
|
function getRelayHashFromEvent(e) {
|
|
94
94
|
return getRelayDataHash(e, e.destinationChainId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SpokeUtils.js","sourceRoot":"","sources":["../../../../src/utils/SpokeUtils.ts"],"names":[],"mappings":";;AAqBA,gCAEC;AAED,0DAGC;AASD,gDAiCC;AAQD,0CAmCC;
|
|
1
|
+
{"version":3,"file":"SpokeUtils.js","sourceRoot":"","sources":["../../../../src/utils/SpokeUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -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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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import assert from "assert";
|
|
2
2
|
import { ethers } from "ethers";
|
|
3
|
-
import { getCurrentTime, utf8ToHex, spreadEventWithBlockNumber
|
|
3
|
+
import { getCurrentTime, utf8ToHex, spreadEventWithBlockNumber } from "../../utils";
|
|
4
4
|
import { AcrossConfigStoreClient, DEFAULT_CONFIG_STORE_VERSION, GLOBAL_CONFIG_STORE_KEYS, } from "../AcrossConfigStoreClient";
|
|
5
5
|
import { CHAIN_IDs } from "../../constants";
|
|
6
6
|
import { EventManager } from "./MockEvents";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MockConfigStoreClient.js","sourceRoot":"","sources":["../../../../../src/clients/mocks/MockConfigStoreClient.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAY,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE1C,OAAO,
|
|
1
|
+
{"version":3,"file":"MockConfigStoreClient.js","sourceRoot":"","sources":["../../../../../src/clients/mocks/MockConfigStoreClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,6 +57,26 @@ export function unpackFillEvent(rawEvent, destinationChainId) {
|
|
|
57
57
|
},
|
|
58
58
|
};
|
|
59
59
|
}
|
|
60
|
+
const RELAYDATA_ABI = [
|
|
61
|
+
{
|
|
62
|
+
type: "tuple",
|
|
63
|
+
components: [
|
|
64
|
+
{ type: "bytes32", name: "depositor" },
|
|
65
|
+
{ type: "bytes32", name: "recipient" },
|
|
66
|
+
{ type: "bytes32", name: "exclusiveRelayer" },
|
|
67
|
+
{ type: "bytes32", name: "inputToken" },
|
|
68
|
+
{ type: "bytes32", name: "outputToken" },
|
|
69
|
+
{ type: "uint256", name: "inputAmount" },
|
|
70
|
+
{ type: "uint256", name: "outputAmount" },
|
|
71
|
+
{ type: "uint256", name: "originChainId" },
|
|
72
|
+
{ type: "uint256", name: "depositId" },
|
|
73
|
+
{ type: "uint32", name: "fillDeadline" },
|
|
74
|
+
{ type: "uint32", name: "exclusivityDeadline" },
|
|
75
|
+
{ type: "bytes", name: "message" },
|
|
76
|
+
],
|
|
77
|
+
},
|
|
78
|
+
{ type: "uint256", name: "destinationChainId" },
|
|
79
|
+
];
|
|
60
80
|
/**
|
|
61
81
|
* Compute the RelayData hash for a fill. This can be used to determine the fill status.
|
|
62
82
|
* @param relayData RelayData information that is used to complete a fill.
|
|
@@ -64,26 +84,10 @@ export function unpackFillEvent(rawEvent, destinationChainId) {
|
|
|
64
84
|
* @returns The corresponding RelayData hash.
|
|
65
85
|
*/
|
|
66
86
|
export function getRelayDataHash(relayData, destinationChainId) {
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
{ type: "bytes32", name: "depositor" },
|
|
72
|
-
{ type: "bytes32", name: "recipient" },
|
|
73
|
-
{ type: "bytes32", name: "exclusiveRelayer" },
|
|
74
|
-
{ type: "bytes32", name: "inputToken" },
|
|
75
|
-
{ type: "bytes32", name: "outputToken" },
|
|
76
|
-
{ type: "uint256", name: "inputAmount" },
|
|
77
|
-
{ type: "uint256", name: "outputAmount" },
|
|
78
|
-
{ type: "uint256", name: "originChainId" },
|
|
79
|
-
{ type: "uint256", name: "depositId" },
|
|
80
|
-
{ type: "uint32", name: "fillDeadline" },
|
|
81
|
-
{ type: "uint32", name: "exclusivityDeadline" },
|
|
82
|
-
{ type: "bytes", name: "message" },
|
|
83
|
-
],
|
|
84
|
-
},
|
|
85
|
-
{ type: "uint256", name: "destinationChainId" },
|
|
86
|
-
];
|
|
87
|
+
if (chainIsSvm(destinationChainId)) {
|
|
88
|
+
const messageHash = getMessageHash(relayData.message);
|
|
89
|
+
return svm.getRelayDataHash({ ...relayData, messageHash }, destinationChainId);
|
|
90
|
+
}
|
|
87
91
|
const _relayData = {
|
|
88
92
|
...relayData,
|
|
89
93
|
depositor: relayData.depositor.toBytes32(),
|
|
@@ -92,11 +96,7 @@ export function getRelayDataHash(relayData, destinationChainId) {
|
|
|
92
96
|
outputToken: relayData.outputToken.toBytes32(),
|
|
93
97
|
exclusiveRelayer: relayData.exclusiveRelayer.toBytes32(),
|
|
94
98
|
};
|
|
95
|
-
|
|
96
|
-
const messageHash = getMessageHash(relayData.message);
|
|
97
|
-
return svm.getRelayDataHash({ ...relayData, messageHash }, destinationChainId);
|
|
98
|
-
}
|
|
99
|
-
return keccak256(encodeAbiParameters(abi, [_relayData, destinationChainId]));
|
|
99
|
+
return keccak256(encodeAbiParameters(RELAYDATA_ABI, [_relayData, destinationChainId]));
|
|
100
100
|
}
|
|
101
101
|
export function getRelayHashFromEvent(e) {
|
|
102
102
|
return getRelayDataHash(e, e.destinationChainId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SpokeUtils.js","sourceRoot":"","sources":["../../../../src/utils/SpokeUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAO,SAAS,EAAE,MAAM,MAAM,CAAC;AAC3D,OAAO,EAAE,oBAAoB,IAAI,UAAU,EAAE,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAIL,QAAQ,GAMT,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAG/C,MAAM,UAAU,UAAU,CAAC,IAAU;IACnC,OAAO,IAAI,CAAC,kBAAkB,CAAC,QAAQ,KAAK,QAAQ,CAAC,QAAQ,CAAC;AAChE,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,IAAkB;IACxD,MAAM,EAAE,SAAS,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC;IAChD,OAAO,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;AACnG,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,kBAAkB,CAChC,QAAuB,EACvB,aAAqB;IAErB,MAAM,KAAK,GAAG,QAiBb,CAAC;IAEF,OAAO;QACL,GAAG,KAAK;QACR,aAAa;QACb,SAAS,EAAE,aAAa,CAAC,KAAK,CAAC,SAAS,EAAE,aAAa,CAAC;QACxD,SAAS,EAAE,aAAa,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,kBAAkB,CAAC;QACnE,UAAU,EAAE,aAAa,CAAC,KAAK,CAAC,UAAU,EAAE,aAAa,CAAC;QAC1D,WAAW,EAAE,aAAa,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,kBAAkB,CAAC;QACvE,gBAAgB,EAAE,aAAa,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,kBAAkB,CAAC;QACjF,WAAW,EAAE,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC;KAC4C,CAAC;AAC3F,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAAC,QAAuB,EAAE,kBAA0B;IACjF,MAAM,KAAK,GAAG,QAkBb,CAAC;IAEF,OAAO;QACL,GAAG,KAAK;QACR,kBAAkB;QAClB,SAAS,EAAE,aAAa,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC;QAC9D,SAAS,EAAE,aAAa,CAAC,KAAK,CAAC,SAAS,EAAE,kBAAkB,CAAC;QAC7D,UAAU,EAAE,aAAa,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,aAAa,CAAC;QAChE,WAAW,EAAE,aAAa,CAAC,KAAK,CAAC,WAAW,EAAE,kBAAkB,CAAC;QACjE,gBAAgB,EAAE,aAAa,CAAC,KAAK,CAAC,gBAAgB,EAAE,kBAAkB,CAAC;QAC3E,OAAO,EAAE,aAAa,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,gBAAgB,CAAC;QAC7D,kBAAkB,EAAE;YAClB,GAAG,KAAK,CAAC,kBAAkB;YAC3B,gBAAgB,EAAE,aAAa,CAAC,KAAK,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,kBAAkB,CAAC;SAC/F;KACsB,CAAC;AAC5B,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"SpokeUtils.js","sourceRoot":"","sources":["../../../../src/utils/SpokeUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -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":"MockConfigStoreClient.d.ts","sourceRoot":"","sources":["../../../../../src/clients/mocks/MockConfigStoreClient.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAU,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,
|
|
1
|
+
{"version":3,"file":"MockConfigStoreClient.d.ts","sourceRoot":"","sources":["../../../../../src/clients/mocks/MockConfigStoreClient.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAU,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAkB,iBAAiB,EAAE,YAAY,EAAyC,MAAM,aAAa,CAAC;AACrH,OAAO,EACL,uBAAuB,EACvB,iBAAiB,EAGlB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE5D,qBAAa,qBAAsB,SAAQ,uBAAuB;IACzD,kBAAkB,SAAgC;IACzD,OAAO,CAAC,YAAY,CAAsB;IAC1C,OAAO,CAAC,yBAAyB,CAAuB;IAGxD,SAAgB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAIrD;gBAGA,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,WAAW,EAAE,QAAQ,EACrB,iBAAiB,EAAE,YAAY,CAAC,iBAAiB,EAAE,IAAI,CAAC,YAA8B,EACtF,kBAAkB,EAAE,MAAM,EAC1B,OAAO,SAAoB,EAC3B,UAAU,UAAQ,EAClB,yBAAyB,CAAC,EAAE,MAAM,EAAE,EACpC,IAAI,GAAE;QAAE,YAAY,CAAC,EAAE,YAAY,CAAA;KAAO;IAe5C,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI;IAI5C,yBAAyB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE;IAInD,6BAA6B,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAM3D,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAI5C,OAAO,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAuCrC,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,GAAE,cAAmB,GAAG,GAAG;IAInF,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,GAAE,cAAmB,GAAG,GAAG;IAQlF,OAAO,CAAC,cAAc;CAcvB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SpokeUtils.d.ts","sourceRoot":"","sources":["../../../../src/utils/SpokeUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,gBAAgB,EAChB,IAAI,EACJ,aAAa,EAEb,WAAW,EACX,SAAS,EAET,YAAY,EACZ,aAAa,EACd,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAI7C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAE9C;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,YAAY,GAAG,SAAS,CAGrE;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,aAAa,EACvB,aAAa,EAAE,MAAM,GACpB,IAAI,CAAC,gBAAgB,EAAE,kBAAkB,GAAG,eAAe,GAAG,aAAa,CAAC,CA8B9E;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,GAAG,aAAa,CAmClG;
|
|
1
|
+
{"version":3,"file":"SpokeUtils.d.ts","sourceRoot":"","sources":["../../../../src/utils/SpokeUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,gBAAgB,EAChB,IAAI,EACJ,aAAa,EAEb,WAAW,EACX,SAAS,EAET,YAAY,EACZ,aAAa,EACd,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAI7C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAE9C;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,YAAY,GAAG,SAAS,CAGrE;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,aAAa,EACvB,aAAa,EAAE,MAAM,GACpB,IAAI,CAAC,gBAAgB,EAAE,kBAAkB,GAAG,eAAe,GAAG,aAAa,CAAC,CA8B9E;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,GAAG,aAAa,CAmClG;AAuBD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAezF;AAED,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,SAAS,GAAG;IAAE,kBAAkB,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAE3F;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAQ/D;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,wBAAsB,gBAAgB,CAAC,gBAAgB,EAAE;IACvD,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,CAAC;CACpC,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAuDzB"}
|
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> {
|
|
@@ -2,13 +2,7 @@ import assert from "assert";
|
|
|
2
2
|
import winston from "winston";
|
|
3
3
|
import { Contract, ethers } from "ethers";
|
|
4
4
|
import { Log } from "../../interfaces";
|
|
5
|
-
import {
|
|
6
|
-
getCurrentTime,
|
|
7
|
-
EventSearchConfig,
|
|
8
|
-
MakeOptional,
|
|
9
|
-
utf8ToHex,
|
|
10
|
-
spreadEventWithBlockNumber,
|
|
11
|
-
} from "../../utils";
|
|
5
|
+
import { getCurrentTime, EventSearchConfig, MakeOptional, utf8ToHex, spreadEventWithBlockNumber } from "../../utils";
|
|
12
6
|
import {
|
|
13
7
|
AcrossConfigStoreClient,
|
|
14
8
|
ConfigStoreUpdate,
|
package/src/utils/SpokeUtils.ts
CHANGED
|
@@ -113,6 +113,27 @@ export function unpackFillEvent(rawEvent: SortableEvent, destinationChainId: num
|
|
|
113
113
|
} satisfies FillWithBlock;
|
|
114
114
|
}
|
|
115
115
|
|
|
116
|
+
const RELAYDATA_ABI = [
|
|
117
|
+
{
|
|
118
|
+
type: "tuple",
|
|
119
|
+
components: [
|
|
120
|
+
{ type: "bytes32", name: "depositor" },
|
|
121
|
+
{ type: "bytes32", name: "recipient" },
|
|
122
|
+
{ type: "bytes32", name: "exclusiveRelayer" },
|
|
123
|
+
{ type: "bytes32", name: "inputToken" },
|
|
124
|
+
{ type: "bytes32", name: "outputToken" },
|
|
125
|
+
{ type: "uint256", name: "inputAmount" },
|
|
126
|
+
{ type: "uint256", name: "outputAmount" },
|
|
127
|
+
{ type: "uint256", name: "originChainId" },
|
|
128
|
+
{ type: "uint256", name: "depositId" },
|
|
129
|
+
{ type: "uint32", name: "fillDeadline" },
|
|
130
|
+
{ type: "uint32", name: "exclusivityDeadline" },
|
|
131
|
+
{ type: "bytes", name: "message" },
|
|
132
|
+
],
|
|
133
|
+
},
|
|
134
|
+
{ type: "uint256", name: "destinationChainId" },
|
|
135
|
+
];
|
|
136
|
+
|
|
116
137
|
/**
|
|
117
138
|
* Compute the RelayData hash for a fill. This can be used to determine the fill status.
|
|
118
139
|
* @param relayData RelayData information that is used to complete a fill.
|
|
@@ -120,26 +141,10 @@ export function unpackFillEvent(rawEvent: SortableEvent, destinationChainId: num
|
|
|
120
141
|
* @returns The corresponding RelayData hash.
|
|
121
142
|
*/
|
|
122
143
|
export function getRelayDataHash(relayData: RelayData, destinationChainId: number): string {
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
{ type: "bytes32", name: "depositor" },
|
|
128
|
-
{ type: "bytes32", name: "recipient" },
|
|
129
|
-
{ type: "bytes32", name: "exclusiveRelayer" },
|
|
130
|
-
{ type: "bytes32", name: "inputToken" },
|
|
131
|
-
{ type: "bytes32", name: "outputToken" },
|
|
132
|
-
{ type: "uint256", name: "inputAmount" },
|
|
133
|
-
{ type: "uint256", name: "outputAmount" },
|
|
134
|
-
{ type: "uint256", name: "originChainId" },
|
|
135
|
-
{ type: "uint256", name: "depositId" },
|
|
136
|
-
{ type: "uint32", name: "fillDeadline" },
|
|
137
|
-
{ type: "uint32", name: "exclusivityDeadline" },
|
|
138
|
-
{ type: "bytes", name: "message" },
|
|
139
|
-
],
|
|
140
|
-
},
|
|
141
|
-
{ type: "uint256", name: "destinationChainId" },
|
|
142
|
-
];
|
|
144
|
+
if (chainIsSvm(destinationChainId)) {
|
|
145
|
+
const messageHash = getMessageHash(relayData.message);
|
|
146
|
+
return svm.getRelayDataHash({ ...relayData, messageHash }, destinationChainId);
|
|
147
|
+
}
|
|
143
148
|
|
|
144
149
|
const _relayData = {
|
|
145
150
|
...relayData,
|
|
@@ -149,11 +154,7 @@ export function getRelayDataHash(relayData: RelayData, destinationChainId: numbe
|
|
|
149
154
|
outputToken: relayData.outputToken.toBytes32(),
|
|
150
155
|
exclusiveRelayer: relayData.exclusiveRelayer.toBytes32(),
|
|
151
156
|
};
|
|
152
|
-
|
|
153
|
-
const messageHash = getMessageHash(relayData.message);
|
|
154
|
-
return svm.getRelayDataHash({ ...relayData, messageHash }, destinationChainId);
|
|
155
|
-
}
|
|
156
|
-
return keccak256(encodeAbiParameters(abi, [_relayData, destinationChainId]));
|
|
157
|
+
return keccak256(encodeAbiParameters(RELAYDATA_ABI, [_relayData, destinationChainId]));
|
|
157
158
|
}
|
|
158
159
|
|
|
159
160
|
export function getRelayHashFromEvent(e: RelayData & { destinationChainId: number }): string {
|