@across-protocol/sdk 4.3.167 → 4.3.169
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/arch/evm/UpgradeUtils.d.ts +1 -1
- package/dist/cjs/src/arch/evm/UpgradeUtils.js +2 -2
- package/dist/cjs/src/arch/evm/UpgradeUtils.js.map +1 -1
- package/dist/cjs/src/arch/tvm/SpokeUtils.d.ts +9 -5
- package/dist/cjs/src/arch/tvm/SpokeUtils.js +13 -12
- package/dist/cjs/src/arch/tvm/SpokeUtils.js.map +1 -1
- package/dist/cjs/src/clients/BundleDataClient/BundleDataClient.js +4 -2
- package/dist/cjs/src/clients/BundleDataClient/BundleDataClient.js.map +1 -1
- package/dist/cjs/src/clients/SpokePoolClient/EVMSpokePoolClient.js +19 -6
- package/dist/cjs/src/clients/SpokePoolClient/EVMSpokePoolClient.js.map +1 -1
- package/dist/esm/src/arch/evm/UpgradeUtils.d.ts +2 -1
- package/dist/esm/src/arch/evm/UpgradeUtils.js +3 -2
- package/dist/esm/src/arch/evm/UpgradeUtils.js.map +1 -1
- package/dist/esm/src/arch/tvm/SpokeUtils.d.ts +9 -5
- package/dist/esm/src/arch/tvm/SpokeUtils.js +13 -13
- package/dist/esm/src/arch/tvm/SpokeUtils.js.map +1 -1
- package/dist/esm/src/clients/BundleDataClient/BundleDataClient.js +4 -2
- package/dist/esm/src/clients/BundleDataClient/BundleDataClient.js.map +1 -1
- package/dist/esm/src/clients/SpokePoolClient/EVMSpokePoolClient.js +19 -6
- package/dist/esm/src/clients/SpokePoolClient/EVMSpokePoolClient.js.map +1 -1
- package/dist/types/src/arch/evm/UpgradeUtils.d.ts +2 -1
- package/dist/types/src/arch/evm/UpgradeUtils.d.ts.map +1 -1
- package/dist/types/src/arch/tvm/SpokeUtils.d.ts +9 -5
- package/dist/types/src/arch/tvm/SpokeUtils.d.ts.map +1 -1
- package/dist/types/src/clients/BundleDataClient/BundleDataClient.d.ts.map +1 -1
- package/dist/types/src/clients/SpokePoolClient/EVMSpokePoolClient.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/arch/evm/UpgradeUtils.ts +8 -2
- package/src/arch/tvm/SpokeUtils.ts +20 -13
- package/src/clients/BundleDataClient/BundleDataClient.ts +10 -2
- package/src/clients/SpokePoolClient/EVMSpokePoolClient.ts +19 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SpokeUtils.js","sourceRoot":"","sources":["../../../../../src/arch/tvm/SpokeUtils.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAA4B,MAAM,kBAAkB,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,eAAe,IAAI,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EAEL,gBAAgB,EAChB,SAAS,EACT,iBAAiB,EACjB,mBAAmB,EACnB,0BAA0B,EAC1B,eAAe,GAChB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"SpokeUtils.js","sourceRoot":"","sources":["../../../../../src/arch/tvm/SpokeUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1052,8 +1052,10 @@ export class BundleDataClient {
|
|
|
1052
1052
|
return await findSvmFillEvent(deposit, spokePoolClient.chainId, spokePoolClient.svmEventsClient, spokePoolClient.deploymentBlock, spokePoolClient.latestHeightSearched, spokePoolClient.logger);
|
|
1053
1053
|
}
|
|
1054
1054
|
else if (isEVMSpokePoolClient(spokePoolClient)) {
|
|
1055
|
-
|
|
1056
|
-
|
|
1055
|
+
if (chainIsTvm(spokePoolClient.chainId)) {
|
|
1056
|
+
return await findTvmFillEvent(spokePoolClient.spokePool, deposit, spokePoolClient.deploymentBlock, spokePoolClient.latestHeightSearched, { maxLookBack: spokePoolClient.eventSearchConfig.maxLookBack });
|
|
1057
|
+
}
|
|
1058
|
+
return await findEvmFillEvent(spokePoolClient.spokePool, deposit, spokePoolClient.deploymentBlock, spokePoolClient.latestHeightSearched);
|
|
1057
1059
|
}
|
|
1058
1060
|
else {
|
|
1059
1061
|
throw new Error("Unsupported spoke pool client type");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BundleDataClient.js","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/BundleDataClient.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"BundleDataClient.js","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/BundleDataClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,8 +19,13 @@ export class EVMSpokePoolClient extends SpokePoolClient {
|
|
|
19
19
|
this.tvm = chainIsTvm(this.chainId);
|
|
20
20
|
}
|
|
21
21
|
relayFillStatus(relayData, atHeight) {
|
|
22
|
-
|
|
23
|
-
|
|
22
|
+
if (this.tvm) {
|
|
23
|
+
return relayFillStatusTvm(this.spokePool, relayData, atHeight, this.chainId, {
|
|
24
|
+
from: this.deploymentBlock,
|
|
25
|
+
maxLookBack: this.eventSearchConfig.maxLookBack,
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
return relayFillStatus(this.spokePool, relayData, atHeight, this.chainId);
|
|
24
29
|
}
|
|
25
30
|
fillStatusArray(relayData, atHeight) {
|
|
26
31
|
return fillStatusArray(this.spokePool, relayData, atHeight);
|
|
@@ -29,8 +34,12 @@ export class EVMSpokePoolClient extends SpokePoolClient {
|
|
|
29
34
|
// Clamp startBlock to the SpokePool's deployment block; reading state at
|
|
30
35
|
// an earlier block reverts because the contract did not yet exist.
|
|
31
36
|
const effectiveStartBlock = Math.max(startBlock, this.deploymentBlock);
|
|
32
|
-
|
|
33
|
-
|
|
37
|
+
if (this.tvm) {
|
|
38
|
+
return getMaxFillDeadlineTvm(this.spokePool, effectiveStartBlock, endBlock, {
|
|
39
|
+
maxLookBack: this.eventSearchConfig.maxLookBack,
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
return getMaxFillDeadline(this.spokePool, effectiveStartBlock, endBlock);
|
|
34
43
|
}
|
|
35
44
|
_availableEventsOnSpoke(eventNames = knownEventNames) {
|
|
36
45
|
return Object.fromEntries(this.spokePool.interface.fragments
|
|
@@ -146,8 +155,12 @@ export class EVMSpokePoolClient extends SpokePoolClient {
|
|
|
146
155
|
* TVM overrides this with an event-based lookup.
|
|
147
156
|
*/
|
|
148
157
|
_findDepositBlock(depositId, lowBlock, highBlock) {
|
|
149
|
-
|
|
150
|
-
|
|
158
|
+
if (this.tvm) {
|
|
159
|
+
return findDepositBlockTvm(this.spokePool, depositId, lowBlock, highBlock, {
|
|
160
|
+
maxLookBack: this.eventSearchConfig.maxLookBack,
|
|
161
|
+
});
|
|
162
|
+
}
|
|
163
|
+
return findDepositBlock(this.spokePool, depositId, lowBlock, highBlock);
|
|
151
164
|
}
|
|
152
165
|
async queryDepositEvents(depositId) {
|
|
153
166
|
const tStart = Date.now();
|
|
@@ -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,EAGL,cAAc,EACd,WAAW,EAEX,UAAU,EACV,kBAAkB,EAClB,UAAU,GACX,MAAM,aAAa,CAAC;AACrB,OAAO,EAEL,kBAAkB,EAClB,mBAAmB,EACnB,0BAA0B,EAC1B,0BAA0B,GAC3B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,eAAe,EAAmB,MAAM,mBAAmB,CAAC;AAGtF,OAAO,EAAE,0BAA0B,EAAE,MAAM,SAAS,CAAC;AAErD;;GAEG;AACH,MAAM,OAAO,kBAAmB,SAAQ,eAAe;IAMnC;IALT,IAAI,GAAG,0BAA0B,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,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC3D,IAAI,CAAC,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAEe,eAAe,CAAC,SAAoB,EAAE,QAAiB;QACrE,
|
|
1
|
+
{"version":3,"file":"EVMSpokePoolClient.js","sourceRoot":"","sources":["../../../../../src/clients/SpokePoolClient/EVMSpokePoolClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,8 @@ import { Contract } from "ethers";
|
|
|
4
4
|
* @param contract A contract instance (must be a UUPS or transparent proxy that emits the Upgraded event).
|
|
5
5
|
* @param startBlock Optional start of the block range (inclusive). Defaults to 0.
|
|
6
6
|
* @param endBlock Optional end of the block range (inclusive). Defaults to latest.
|
|
7
|
+
* @param maxLookBack Optional eth_getLogs chunk size. Required on RPCs that cap the range (e.g. Chainstack Tron).
|
|
7
8
|
* @returns An array of block numbers at which upgrades occurred, sorted ascending.
|
|
8
9
|
*/
|
|
9
|
-
export declare function get1967Upgrades(contract: Contract, startBlock?: number, endBlock?: number): Promise<number[]>;
|
|
10
|
+
export declare function get1967Upgrades(contract: Contract, startBlock?: number, endBlock?: number, maxLookBack?: number): Promise<number[]>;
|
|
10
11
|
//# sourceMappingURL=UpgradeUtils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UpgradeUtils.d.ts","sourceRoot":"","sources":["../../../../../src/arch/evm/UpgradeUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAGlC
|
|
1
|
+
{"version":3,"file":"UpgradeUtils.d.ts","sourceRoot":"","sources":["../../../../../src/arch/evm/UpgradeUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAGlC;;;;;;;GAOG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,QAAQ,EAClB,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,EAAE,CAAC,CAOnB"}
|
|
@@ -2,6 +2,10 @@ import { Contract, providers } from "ethers";
|
|
|
2
2
|
import { FillStatus, FillWithBlock, RelayData } from "../../interfaces";
|
|
3
3
|
import { BigNumber } from "../../utils";
|
|
4
4
|
type BlockTag = providers.BlockTag;
|
|
5
|
+
type SearchConfig = {
|
|
6
|
+
from?: number;
|
|
7
|
+
maxLookBack?: number;
|
|
8
|
+
};
|
|
5
9
|
export { populateV3Relay, getTimestampForBlock, fillStatusArray } from "../evm/SpokeUtils";
|
|
6
10
|
/**
|
|
7
11
|
* @notice Retrieve the on-chain time at a specific block number.
|
|
@@ -16,7 +20,7 @@ export declare function getTimeAt(spokePool: Contract, blockNumber: number): Pro
|
|
|
16
20
|
* the value may have changed at the upgrade boundary. In that case, return
|
|
17
21
|
* the greater of the current value and a conservative 6-hour fallback.
|
|
18
22
|
*/
|
|
19
|
-
export declare function getMaxFillDeadlineInRange(spokePool: Contract, startBlock: number, endBlock: number): Promise<number>;
|
|
23
|
+
export declare function getMaxFillDeadlineInRange(spokePool: Contract, startBlock: number, endBlock: number, eventSearchConfig?: SearchConfig): Promise<number>;
|
|
20
24
|
/**
|
|
21
25
|
* @notice Not supported on TVM — callers should use findDepositBlock instead.
|
|
22
26
|
*/
|
|
@@ -26,7 +30,7 @@ export declare function getDepositIdAtBlock(_contract: Contract, _blockTag: numb
|
|
|
26
30
|
* TRON does not support historical eth_call, so event queries replace the
|
|
27
31
|
* EVM binary-search over numberOfDeposits().
|
|
28
32
|
*/
|
|
29
|
-
export declare function findDepositBlock(spokePool: Contract, depositId: BigNumber, lowBlock: number, highBlock?: number): Promise<number | undefined>;
|
|
33
|
+
export declare function findDepositBlock(spokePool: Contract, depositId: BigNumber, lowBlock: number, highBlock?: number, eventSearchConfig?: SearchConfig): Promise<number | undefined>;
|
|
30
34
|
/**
|
|
31
35
|
* @notice Determine the fill status of a relay at a given block.
|
|
32
36
|
* For "latest" queries, delegates to the EVM implementation (TRON's
|
|
@@ -34,16 +38,16 @@ export declare function findDepositBlock(spokePool: Contract, depositId: BigNumb
|
|
|
34
38
|
* status is reconstructed from on-chain events because TRON does not
|
|
35
39
|
* support eth_call with historical blockTags.
|
|
36
40
|
*/
|
|
37
|
-
export declare function relayFillStatus(spokePool: Contract, relayData: RelayData, blockTag?: BlockTag, destinationChainId?: number): Promise<FillStatus>;
|
|
41
|
+
export declare function relayFillStatus(spokePool: Contract, relayData: RelayData, blockTag?: BlockTag, destinationChainId?: number, eventSearchConfig?: SearchConfig): Promise<FillStatus>;
|
|
38
42
|
/**
|
|
39
43
|
* @notice Find the block at which a fill was completed.
|
|
40
44
|
* TRON does not support historical eth_call, so event queries replace the
|
|
41
45
|
* EVM binary-search over fillStatuses().
|
|
42
46
|
*/
|
|
43
|
-
export declare function findFillBlock(spokePool: Contract, relayData: RelayData, lowBlockNumber: number, highBlockNumber?: number): Promise<number | undefined>;
|
|
47
|
+
export declare function findFillBlock(spokePool: Contract, relayData: RelayData, lowBlockNumber: number, highBlockNumber?: number, eventSearchConfig?: SearchConfig): Promise<number | undefined>;
|
|
44
48
|
/**
|
|
45
49
|
* @notice Find the fill event for a deposit.
|
|
46
50
|
* Queries fill events directly rather than binary-searching then re-querying.
|
|
47
51
|
*/
|
|
48
|
-
export declare function findFillEvent(spokePool: Contract, relayData: RelayData, lowBlockNumber: number, highBlockNumber?: number): Promise<FillWithBlock | undefined>;
|
|
52
|
+
export declare function findFillEvent(spokePool: Contract, relayData: RelayData, lowBlockNumber: number, highBlockNumber?: number, eventSearchConfig?: SearchConfig): Promise<FillWithBlock | undefined>;
|
|
49
53
|
//# sourceMappingURL=SpokeUtils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SpokeUtils.d.ts","sourceRoot":"","sources":["../../../../../src/arch/tvm/SpokeUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGxE,OAAO,EACL,SAAS,EAOV,MAAM,aAAa,CAAC;AAErB,KAAK,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"SpokeUtils.d.ts","sourceRoot":"","sources":["../../../../../src/arch/tvm/SpokeUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGxE,OAAO,EACL,SAAS,EAOV,MAAM,aAAa,CAAC;AAErB,KAAK,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;AAEnC,KAAK,YAAY,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAG5D,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAK3F;;;;GAIG;AACH,wBAAsB,SAAS,CAAC,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAGzF;AAQD;;;;;;GAMG;AACH,wBAAsB,yBAAyB,CAC7C,SAAS,EAAE,QAAQ,EACnB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,iBAAiB,CAAC,EAAE,YAAY,GAC/B,OAAO,CAAC,MAAM,CAAC,CAajB;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAE9F;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,QAAQ,EACnB,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,MAAM,EAClB,iBAAiB,CAAC,EAAE,YAAY,GAC/B,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAmB7B;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CACnC,SAAS,EAAE,QAAQ,EACnB,SAAS,EAAE,SAAS,EACpB,QAAQ,GAAE,QAAmB,EAC7B,kBAAkB,CAAC,EAAE,MAAM,EAC3B,iBAAiB,CAAC,EAAE,YAAY,GAC/B,OAAO,CAAC,UAAU,CAAC,CA8CrB;AAED;;;;GAIG;AACH,wBAAsB,aAAa,CACjC,SAAS,EAAE,QAAQ,EACnB,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,MAAM,EACtB,eAAe,CAAC,EAAE,MAAM,EACxB,iBAAiB,CAAC,EAAE,YAAY,GAC/B,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAgB7B;AAED;;;GAGG;AACH,wBAAsB,aAAa,CACjC,SAAS,EAAE,QAAQ,EACnB,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,MAAM,EACtB,eAAe,CAAC,EAAE,MAAM,EACxB,iBAAiB,CAAC,EAAE,YAAY,GAC/B,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAuBpC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BundleDataClient.d.ts","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/BundleDataClient.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,uBAAuB,EAGvB,mBAAmB,EAOnB,OAAO,EACP,aAAa,EAEb,gBAAgB,EAChB,yBAAyB,EAC1B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AA4BrC,OAAO,OAAO,MAAM,SAAS,CAAC;AAa9B,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAgG7E,qBAAa,gBAAgB;IASzB,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM;IAC/B,QAAQ,CAAC,OAAO,EAAE,OAAO;IAEzB,QAAQ,CAAC,0CAA0C,EAAE,MAAM,EAAE;IAC7D,QAAQ,CAAC,wBAAwB,EAAE;QAAE,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;IAChE,QAAQ,CAAC,iBAAiB,CAAC,EAAE,yBAAyB;IAbxD,OAAO,CAAC,aAAa,CAAiB;IACtC,OAAO,CAAC,gBAAgB,CAAgE;IAExF,OAAO,CAAC,oBAAoB,CAAuD;IACnF,QAAQ,CAAC,sBAAsB,EAAE,gBAAgB,CAAC;gBAIvC,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,OAAO,EAAE,OAAO,EACzB,gBAAgB,EAAE;QAAE,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,CAAA;KAAE,EAC/C,0CAA0C,EAAE,MAAM,EAAE,EACpD,wBAAwB,GAAE;QAAE,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAA;KAAO,EAC5D,iBAAiB,CAAC,EAAE,yBAAyB,YAAA;IAOxD,UAAU,IAAI,IAAI;YAIJ,iBAAiB;IAM/B,4BAA4B,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG;QAAE,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE;IAOtF,0BAA0B,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE;QAAE,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,GAAG,IAAI;IAI1F,MAAM,CAAC,mBAAmB,CAAC,oBAAoB,EAAE,MAAM,EAAE,EAAE,GAAG,MAAM;IAQpE,OAAO,CAAC,6BAA6B;YAIvB,iCAAiC;YAuBjC,kCAAkC;YAqBlC,4BAA4B;YAsK5B,eAAe;IAgBvB,QAAQ,CACZ,oBAAoB,EAAE,MAAM,EAAE,EAAE,EAChC,gBAAgB,EAAE,uBAAuB,EACzC,kBAAkB,UAAQ,GACzB,OAAO,CAAC,mBAAmB,CAAC;YA4BjB,mBAAmB;cAi4BjB,qBAAqB,CACnC,OAAO,EAAE,gBAAgB,EACzB,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"BundleDataClient.d.ts","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/BundleDataClient.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,uBAAuB,EAGvB,mBAAmB,EAOnB,OAAO,EACP,aAAa,EAEb,gBAAgB,EAChB,yBAAyB,EAC1B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AA4BrC,OAAO,OAAO,MAAM,SAAS,CAAC;AAa9B,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAgG7E,qBAAa,gBAAgB;IASzB,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM;IAC/B,QAAQ,CAAC,OAAO,EAAE,OAAO;IAEzB,QAAQ,CAAC,0CAA0C,EAAE,MAAM,EAAE;IAC7D,QAAQ,CAAC,wBAAwB,EAAE;QAAE,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;IAChE,QAAQ,CAAC,iBAAiB,CAAC,EAAE,yBAAyB;IAbxD,OAAO,CAAC,aAAa,CAAiB;IACtC,OAAO,CAAC,gBAAgB,CAAgE;IAExF,OAAO,CAAC,oBAAoB,CAAuD;IACnF,QAAQ,CAAC,sBAAsB,EAAE,gBAAgB,CAAC;gBAIvC,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,OAAO,EAAE,OAAO,EACzB,gBAAgB,EAAE;QAAE,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,CAAA;KAAE,EAC/C,0CAA0C,EAAE,MAAM,EAAE,EACpD,wBAAwB,GAAE;QAAE,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAA;KAAO,EAC5D,iBAAiB,CAAC,EAAE,yBAAyB,YAAA;IAOxD,UAAU,IAAI,IAAI;YAIJ,iBAAiB;IAM/B,4BAA4B,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG;QAAE,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE;IAOtF,0BAA0B,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE;QAAE,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,GAAG,IAAI;IAI1F,MAAM,CAAC,mBAAmB,CAAC,oBAAoB,EAAE,MAAM,EAAE,EAAE,GAAG,MAAM;IAQpE,OAAO,CAAC,6BAA6B;YAIvB,iCAAiC;YAuBjC,kCAAkC;YAqBlC,4BAA4B;YAsK5B,eAAe;IAgBvB,QAAQ,CACZ,oBAAoB,EAAE,MAAM,EAAE,EAAE,EAChC,gBAAgB,EAAE,uBAAuB,EACzC,kBAAkB,UAAQ,GACzB,OAAO,CAAC,mBAAmB,CAAC;YA4BjB,mBAAmB;cAi4BjB,qBAAqB,CACnC,OAAO,EAAE,gBAAgB,EACzB,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IA+B/B,wBAAwB,CAC5B,QAAQ,EAAE,MAAM,EAAE,EAClB,oBAAoB,EAAE,MAAM,EAAE,EAAE,EAChC,gBAAgB,EAAE,uBAAuB,GACxC,OAAO,CAAC;QAAE,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC;CAqD5C"}
|
|
@@ -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,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;
|
|
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;IAU7E,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;IAahG,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;cASpG,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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@across-protocol/sdk",
|
|
3
3
|
"author": "UMA Team",
|
|
4
|
-
"version": "4.3.
|
|
4
|
+
"version": "4.3.169",
|
|
5
5
|
"license": "AGPL-3.0",
|
|
6
6
|
"homepage": "https://docs.across.to/reference/sdk",
|
|
7
7
|
"repository": {
|
|
@@ -80,8 +80,8 @@
|
|
|
80
80
|
"typescript": "^6"
|
|
81
81
|
},
|
|
82
82
|
"dependencies": {
|
|
83
|
-
"@across-protocol/constants": "^3.1.
|
|
84
|
-
"@across-protocol/contracts": "5.0.
|
|
83
|
+
"@across-protocol/constants": "^3.1.113",
|
|
84
|
+
"@across-protocol/contracts": "5.0.18",
|
|
85
85
|
"@coral-xyz/anchor": "^0.30.1",
|
|
86
86
|
"@eth-optimism/sdk": "^3.3.1",
|
|
87
87
|
"@ethersproject/bignumber": "^5.7.0",
|
|
@@ -6,13 +6,19 @@ import { paginatedEventQuery } from "../../utils";
|
|
|
6
6
|
* @param contract A contract instance (must be a UUPS or transparent proxy that emits the Upgraded event).
|
|
7
7
|
* @param startBlock Optional start of the block range (inclusive). Defaults to 0.
|
|
8
8
|
* @param endBlock Optional end of the block range (inclusive). Defaults to latest.
|
|
9
|
+
* @param maxLookBack Optional eth_getLogs chunk size. Required on RPCs that cap the range (e.g. Chainstack Tron).
|
|
9
10
|
* @returns An array of block numbers at which upgrades occurred, sorted ascending.
|
|
10
11
|
*/
|
|
11
|
-
export async function get1967Upgrades(
|
|
12
|
+
export async function get1967Upgrades(
|
|
13
|
+
contract: Contract,
|
|
14
|
+
startBlock?: number,
|
|
15
|
+
endBlock?: number,
|
|
16
|
+
maxLookBack?: number
|
|
17
|
+
): Promise<number[]> {
|
|
12
18
|
const from = startBlock ?? 0;
|
|
13
19
|
const to = endBlock ?? (await contract.provider.getBlockNumber());
|
|
14
20
|
|
|
15
|
-
const events = await paginatedEventQuery(contract, contract.filters.Upgraded(), { from, to });
|
|
21
|
+
const events = await paginatedEventQuery(contract, contract.filters.Upgraded(), { from, to, maxLookBack });
|
|
16
22
|
|
|
17
23
|
return events.map(({ blockNumber }) => blockNumber);
|
|
18
24
|
}
|
|
@@ -16,6 +16,8 @@ import {
|
|
|
16
16
|
|
|
17
17
|
type BlockTag = providers.BlockTag;
|
|
18
18
|
|
|
19
|
+
type SearchConfig = { from?: number; maxLookBack?: number };
|
|
20
|
+
|
|
19
21
|
// Re-export functions that work unchanged on TRON's JSON-RPC.
|
|
20
22
|
export { populateV3Relay, getTimestampForBlock, fillStatusArray } from "../evm/SpokeUtils";
|
|
21
23
|
|
|
@@ -48,11 +50,12 @@ const FALLBACK_FILL_DEADLINE_BUFFER = 21600; // 6 hours in seconds
|
|
|
48
50
|
export async function getMaxFillDeadlineInRange(
|
|
49
51
|
spokePool: Contract,
|
|
50
52
|
startBlock: number,
|
|
51
|
-
endBlock: number
|
|
53
|
+
endBlock: number,
|
|
54
|
+
eventSearchConfig?: SearchConfig
|
|
52
55
|
): Promise<number> {
|
|
53
56
|
const [fillDeadlineBuffer, upgrades] = await Promise.all([
|
|
54
57
|
spokePool.fillDeadlineBuffer(),
|
|
55
|
-
get1967Upgrades(spokePool, startBlock, endBlock),
|
|
58
|
+
get1967Upgrades(spokePool, startBlock, endBlock, eventSearchConfig?.maxLookBack),
|
|
56
59
|
]);
|
|
57
60
|
|
|
58
61
|
const currentBuffer = Number(fillDeadlineBuffer);
|
|
@@ -80,7 +83,8 @@ export async function findDepositBlock(
|
|
|
80
83
|
spokePool: Contract,
|
|
81
84
|
depositId: BigNumber,
|
|
82
85
|
lowBlock: number,
|
|
83
|
-
highBlock?: number
|
|
86
|
+
highBlock?: number,
|
|
87
|
+
eventSearchConfig?: SearchConfig
|
|
84
88
|
): Promise<number | undefined> {
|
|
85
89
|
if (isUnsafeDepositId(depositId)) {
|
|
86
90
|
throw new Error(`Cannot search for depositId ${depositId}`);
|
|
@@ -92,7 +96,7 @@ export async function findDepositBlock(
|
|
|
92
96
|
const events = await paginatedEventQuery(
|
|
93
97
|
spokePool,
|
|
94
98
|
spokePool.filters.FundsDeposited(null, null, null, null, null, depositId),
|
|
95
|
-
{ from: lowBlock, to: highBlock }
|
|
99
|
+
{ from: lowBlock, to: highBlock, maxLookBack: eventSearchConfig?.maxLookBack }
|
|
96
100
|
);
|
|
97
101
|
|
|
98
102
|
if (events.length === 0) {
|
|
@@ -113,7 +117,8 @@ export async function relayFillStatus(
|
|
|
113
117
|
spokePool: Contract,
|
|
114
118
|
relayData: RelayData,
|
|
115
119
|
blockTag: BlockTag = "latest",
|
|
116
|
-
destinationChainId?: number
|
|
120
|
+
destinationChainId?: number,
|
|
121
|
+
eventSearchConfig?: SearchConfig
|
|
117
122
|
): Promise<FillStatus> {
|
|
118
123
|
if (blockTag === "latest") {
|
|
119
124
|
return evmRelayFillStatus(spokePool, relayData, blockTag, destinationChainId);
|
|
@@ -132,14 +137,14 @@ export async function relayFillStatus(
|
|
|
132
137
|
return FillStatus.Unfilled;
|
|
133
138
|
}
|
|
134
139
|
|
|
135
|
-
|
|
136
|
-
const fromBlock = 0;
|
|
140
|
+
const fromBlock = eventSearchConfig?.from ?? 0;
|
|
137
141
|
const toBlock = Number(blockTag);
|
|
142
|
+
const { maxLookBack } = eventSearchConfig ?? {};
|
|
138
143
|
|
|
139
144
|
const fillEvents = await paginatedEventQuery(
|
|
140
145
|
spokePool,
|
|
141
146
|
spokePool.filters.FilledRelay(null, null, null, null, null, relayData.originChainId, relayData.depositId),
|
|
142
|
-
{ from: fromBlock, to: toBlock }
|
|
147
|
+
{ from: fromBlock, to: toBlock, maxLookBack }
|
|
143
148
|
);
|
|
144
149
|
|
|
145
150
|
if (fillEvents.length > 0) {
|
|
@@ -151,7 +156,7 @@ export async function relayFillStatus(
|
|
|
151
156
|
const slowFillEvents = await paginatedEventQuery(
|
|
152
157
|
spokePool,
|
|
153
158
|
spokePool.filters.RequestedSlowFill(null, null, null, null, relayData.originChainId, relayData.depositId),
|
|
154
|
-
{ from: fromBlock, to: toBlock }
|
|
159
|
+
{ from: fromBlock, to: toBlock, maxLookBack }
|
|
155
160
|
);
|
|
156
161
|
|
|
157
162
|
if (slowFillEvents.length > 0) {
|
|
@@ -171,7 +176,8 @@ export async function findFillBlock(
|
|
|
171
176
|
spokePool: Contract,
|
|
172
177
|
relayData: RelayData,
|
|
173
178
|
lowBlockNumber: number,
|
|
174
|
-
highBlockNumber?: number
|
|
179
|
+
highBlockNumber?: number,
|
|
180
|
+
eventSearchConfig?: SearchConfig
|
|
175
181
|
): Promise<number | undefined> {
|
|
176
182
|
const { provider } = spokePool;
|
|
177
183
|
highBlockNumber ??= await provider.getBlockNumber();
|
|
@@ -180,7 +186,7 @@ export async function findFillBlock(
|
|
|
180
186
|
const events = await paginatedEventQuery(
|
|
181
187
|
spokePool,
|
|
182
188
|
spokePool.filters.FilledRelay(null, null, null, null, null, relayData.originChainId, relayData.depositId),
|
|
183
|
-
{ from: lowBlockNumber, to: highBlockNumber }
|
|
189
|
+
{ from: lowBlockNumber, to: highBlockNumber, maxLookBack: eventSearchConfig?.maxLookBack }
|
|
184
190
|
);
|
|
185
191
|
|
|
186
192
|
if (events.length === 0) {
|
|
@@ -198,7 +204,8 @@ export async function findFillEvent(
|
|
|
198
204
|
spokePool: Contract,
|
|
199
205
|
relayData: RelayData,
|
|
200
206
|
lowBlockNumber: number,
|
|
201
|
-
highBlockNumber?: number
|
|
207
|
+
highBlockNumber?: number,
|
|
208
|
+
eventSearchConfig?: SearchConfig
|
|
202
209
|
): Promise<FillWithBlock | undefined> {
|
|
203
210
|
const { provider } = spokePool;
|
|
204
211
|
highBlockNumber ??= await provider.getBlockNumber();
|
|
@@ -206,7 +213,7 @@ export async function findFillEvent(
|
|
|
206
213
|
const events = await paginatedEventQuery(
|
|
207
214
|
spokePool,
|
|
208
215
|
spokePool.filters.FilledRelay(null, null, null, null, null, relayData.originChainId, relayData.depositId),
|
|
209
|
-
{ from: lowBlockNumber, to: highBlockNumber }
|
|
216
|
+
{ from: lowBlockNumber, to: highBlockNumber, maxLookBack: eventSearchConfig?.maxLookBack }
|
|
210
217
|
);
|
|
211
218
|
|
|
212
219
|
if (events.length === 0) {
|
|
@@ -1379,8 +1379,16 @@ export class BundleDataClient {
|
|
|
1379
1379
|
spokePoolClient.logger
|
|
1380
1380
|
);
|
|
1381
1381
|
} else if (isEVMSpokePoolClient(spokePoolClient)) {
|
|
1382
|
-
|
|
1383
|
-
|
|
1382
|
+
if (chainIsTvm(spokePoolClient.chainId)) {
|
|
1383
|
+
return await findTvmFillEvent(
|
|
1384
|
+
spokePoolClient.spokePool,
|
|
1385
|
+
deposit,
|
|
1386
|
+
spokePoolClient.deploymentBlock,
|
|
1387
|
+
spokePoolClient.latestHeightSearched,
|
|
1388
|
+
{ maxLookBack: spokePoolClient.eventSearchConfig.maxLookBack }
|
|
1389
|
+
);
|
|
1390
|
+
}
|
|
1391
|
+
return await findEvmFillEvent(
|
|
1384
1392
|
spokePoolClient.spokePool,
|
|
1385
1393
|
deposit,
|
|
1386
1394
|
spokePoolClient.deploymentBlock,
|