@across-protocol/sdk 4.3.161 → 4.3.163
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/svm/utils.d.ts +0 -1
- package/dist/cjs/src/arch/svm/utils.js +0 -17
- package/dist/cjs/src/arch/svm/utils.js.map +1 -1
- package/dist/cjs/src/clients/BundleDataClient/utils/PoolRebalanceUtils.js +11 -3
- package/dist/cjs/src/clients/BundleDataClient/utils/PoolRebalanceUtils.js.map +1 -1
- package/dist/cjs/src/utils/BlockExplorerUtils.js +10 -2
- package/dist/cjs/src/utils/BlockExplorerUtils.js.map +1 -1
- package/dist/esm/src/arch/svm/utils.d.ts +0 -6
- package/dist/esm/src/arch/svm/utils.js +1 -22
- package/dist/esm/src/arch/svm/utils.js.map +1 -1
- package/dist/esm/src/clients/BundleDataClient/utils/PoolRebalanceUtils.js +12 -4
- package/dist/esm/src/clients/BundleDataClient/utils/PoolRebalanceUtils.js.map +1 -1
- package/dist/esm/src/utils/BlockExplorerUtils.js +10 -2
- package/dist/esm/src/utils/BlockExplorerUtils.js.map +1 -1
- package/dist/types/src/arch/svm/utils.d.ts +0 -6
- package/dist/types/src/arch/svm/utils.d.ts.map +1 -1
- package/dist/types/src/clients/BundleDataClient/utils/PoolRebalanceUtils.d.ts.map +1 -1
- package/dist/types/src/utils/BlockExplorerUtils.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/arch/svm/utils.ts +1 -31
- package/src/clients/BundleDataClient/utils/PoolRebalanceUtils.ts +13 -8
- package/src/utils/BlockExplorerUtils.ts +9 -2
|
@@ -16,7 +16,6 @@ export declare function getNearestSlotTime(provider: SVMProvider, opts?: {
|
|
|
16
16
|
slot: bigint;
|
|
17
17
|
timestamp: number;
|
|
18
18
|
}>;
|
|
19
|
-
export declare function getLatestFinalizedSlotWithBlock(provider: SVMProvider, logger: winston.Logger, maxSlot: bigint, maxLookback?: number): Promise<number>;
|
|
20
19
|
export declare function parseEventData(eventData: any): any;
|
|
21
20
|
export declare function decodeEvent(idl: Idl, rawEvent: string): {
|
|
22
21
|
data: unknown;
|
|
@@ -4,7 +4,6 @@ exports.numberToU8a32 = exports.bigToU8a32 = exports.getEmergencyDeleteRootBundl
|
|
|
4
4
|
exports.isDevnet = isDevnet;
|
|
5
5
|
exports.toAddress = toAddress;
|
|
6
6
|
exports.getNearestSlotTime = getNearestSlotTime;
|
|
7
|
-
exports.getLatestFinalizedSlotWithBlock = getLatestFinalizedSlotWithBlock;
|
|
8
7
|
exports.parseEventData = parseEventData;
|
|
9
8
|
exports.decodeEvent = decodeEvent;
|
|
10
9
|
exports.getEventName = getEventName;
|
|
@@ -60,22 +59,6 @@ async function getNearestSlotTime(provider, opts = { commitment: "confirmed" },
|
|
|
60
59
|
(0, assert_1.default)((0, utils_1.isDefined)(timestamp), `Unable to resolve block time for SVM slot ${slot}`);
|
|
61
60
|
return { slot, timestamp };
|
|
62
61
|
}
|
|
63
|
-
async function getLatestFinalizedSlotWithBlock(provider, logger, maxSlot, maxLookback = 1000) {
|
|
64
|
-
const opts = { maxSupportedTransactionVersion: 0, transactionDetails: "none", rewards: false };
|
|
65
|
-
const { slot: finalizedSlot } = await getNearestSlotTime(provider, { commitment: "finalized" }, logger);
|
|
66
|
-
const endSlot = (0, utils_1.biMin)(maxSlot, finalizedSlot);
|
|
67
|
-
let slot = endSlot;
|
|
68
|
-
do {
|
|
69
|
-
const block = await provider.getBlock(slot, opts).send();
|
|
70
|
-
if ((0, utils_1.isDefined)(block) && [block.blockHeight, block.blockTime].every(utils_1.isDefined)) {
|
|
71
|
-
break;
|
|
72
|
-
}
|
|
73
|
-
} while (--maxLookback > 0 && --slot > 0);
|
|
74
|
-
if (maxLookback === 0) {
|
|
75
|
-
throw new Error(`Unable to find Solana block between slots [${slot}, ${endSlot}]`);
|
|
76
|
-
}
|
|
77
|
-
return Number(slot);
|
|
78
|
-
}
|
|
79
62
|
function parseEventData(eventData) {
|
|
80
63
|
if (!eventData)
|
|
81
64
|
return eventData;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/arch/svm/utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/arch/svm/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,11 +17,19 @@ const svm_1 = require("../../../arch/svm");
|
|
|
17
17
|
const assert_1 = tslib_1.__importDefault(require("assert"));
|
|
18
18
|
async function getWidestPossibleExpectedBlockRange(chainIds, spokeClients, endBlockBuffers, clients, latestMainnetBlock, enabledChains, optimistic = false) {
|
|
19
19
|
const resolveEndBlock = (chainId, idx) => Math.max(spokeClients[chainId].latestHeightSearched - endBlockBuffers[idx], 0);
|
|
20
|
-
const resolveSVMEndBlock = (chainId, idx) => {
|
|
20
|
+
const resolveSVMEndBlock = async (chainId, idx) => {
|
|
21
21
|
const spokePoolClient = spokeClients[chainId];
|
|
22
22
|
(0, assert_1.default)((0, SpokePoolClient_1.isSVMSpokePoolClient)(spokePoolClient));
|
|
23
|
-
const
|
|
24
|
-
|
|
23
|
+
const provider = spokePoolClient.svmEventsClient.getRpc();
|
|
24
|
+
const { logger } = spokePoolClient;
|
|
25
|
+
const maxSlot = BigInt(resolveEndBlock(chainId, idx));
|
|
26
|
+
let slot;
|
|
27
|
+
let opts = { commitment: "finalized" };
|
|
28
|
+
do {
|
|
29
|
+
({ slot } = await (0, svm_1.getNearestSlotTime)(provider, opts, logger));
|
|
30
|
+
opts = { slot: maxSlot };
|
|
31
|
+
} while (slot > maxSlot);
|
|
32
|
+
return Number(slot);
|
|
25
33
|
};
|
|
26
34
|
const latestPossibleBundleEndBlockNumbers = await Promise.all(chainIds.map((chainId, idx) => {
|
|
27
35
|
if (!enabledChains.includes(chainId) || !(0, utils_1.isDefined)(spokeClients[chainId])) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PoolRebalanceUtils.js","sourceRoot":"","sources":["../../../../../../src/clients/BundleDataClient/utils/PoolRebalanceUtils.ts"],"names":[],"mappings":";;AAqBA,
|
|
1
|
+
{"version":3,"file":"PoolRebalanceUtils.js","sourceRoot":"","sources":["../../../../../../src/clients/BundleDataClient/utils/PoolRebalanceUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,8 @@ const FormattingUtils_1 = require("./FormattingUtils");
|
|
|
10
10
|
const NetworkUtils_1 = require("./NetworkUtils");
|
|
11
11
|
const TypeGuards_1 = require("./TypeGuards");
|
|
12
12
|
const bs58_1 = tslib_1.__importDefault(require("bs58"));
|
|
13
|
+
const tronweb_1 = require("tronweb");
|
|
14
|
+
const AddressUtils_1 = require("./AddressUtils");
|
|
13
15
|
function blockExplorerLink(txHashOrAddress, chainId) {
|
|
14
16
|
return _createBlockExplorerLinkMarkdown(txHashOrAddress, Number(chainId)) ?? "<>";
|
|
15
17
|
}
|
|
@@ -40,8 +42,14 @@ function _createBlockExplorerLinkMarkdown(addr, chainId = 1) {
|
|
|
40
42
|
const txIdForUrl = txHexNoPrefix.toLowerCase();
|
|
41
43
|
return `<${constructURL(explorerDomain, ["#", "transaction", txIdForUrl])} | ${shortURLString}>`;
|
|
42
44
|
}
|
|
43
|
-
|
|
44
|
-
|
|
45
|
+
try {
|
|
46
|
+
const addressTvm = tronweb_1.TronWeb.isAddress(addr) ? addr : AddressUtils_1.TvmAddress.from(addr).toNative();
|
|
47
|
+
if (/^T[1-9A-HJ-NP-Za-km-z]{33}$/.test(addressTvm)) {
|
|
48
|
+
return `<${constructURL(explorerDomain, ["#", "address", addressTvm])} | ${shortURLString}>`;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
catch {
|
|
52
|
+
return null;
|
|
45
53
|
}
|
|
46
54
|
return null;
|
|
47
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BlockExplorerUtils.js","sourceRoot":"","sources":["../../../../src/utils/BlockExplorerUtils.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"BlockExplorerUtils.js","sourceRoot":"","sources":["../../../../src/utils/BlockExplorerUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,12 +31,6 @@ export declare function getNearestSlotTime(provider: SVMProvider, opts?: {
|
|
|
31
31
|
slot: bigint;
|
|
32
32
|
timestamp: number;
|
|
33
33
|
}>;
|
|
34
|
-
/**
|
|
35
|
-
* Resolve the latest finalized slot, and then work backwards to find the nearest slot containing a block.
|
|
36
|
-
* In most cases the first-resolved slot should also have a block. Avoid making arbitrary decisions about
|
|
37
|
-
* how many slots to rotate through.
|
|
38
|
-
*/
|
|
39
|
-
export declare function getLatestFinalizedSlotWithBlock(provider: SVMProvider, logger: winston.Logger, maxSlot: bigint, maxLookback?: number): Promise<number>;
|
|
40
34
|
/**
|
|
41
35
|
* Parses event data from a transaction.
|
|
42
36
|
*/
|
|
@@ -6,7 +6,7 @@ import assert from "assert";
|
|
|
6
6
|
import bs58 from "bs58";
|
|
7
7
|
import { ethers } from "ethers";
|
|
8
8
|
import { FillType } from "../../interfaces";
|
|
9
|
-
import { BigNumber,
|
|
9
|
+
import { BigNumber, getMessageHash, isDefined, isUint8Array } from "../../utils";
|
|
10
10
|
import { getTimestampForSlot, getSlot, getRelayDataHash } from "./SpokeUtils";
|
|
11
11
|
import { SVMEventNames, } from "./types";
|
|
12
12
|
/**
|
|
@@ -49,27 +49,6 @@ export async function getNearestSlotTime(provider, opts = { commitment: "confirm
|
|
|
49
49
|
assert(isDefined(timestamp), `Unable to resolve block time for SVM slot ${slot}`);
|
|
50
50
|
return { slot, timestamp };
|
|
51
51
|
}
|
|
52
|
-
/**
|
|
53
|
-
* Resolve the latest finalized slot, and then work backwards to find the nearest slot containing a block.
|
|
54
|
-
* In most cases the first-resolved slot should also have a block. Avoid making arbitrary decisions about
|
|
55
|
-
* how many slots to rotate through.
|
|
56
|
-
*/
|
|
57
|
-
export async function getLatestFinalizedSlotWithBlock(provider, logger, maxSlot, maxLookback = 1000) {
|
|
58
|
-
const opts = { maxSupportedTransactionVersion: 0, transactionDetails: "none", rewards: false };
|
|
59
|
-
const { slot: finalizedSlot } = await getNearestSlotTime(provider, { commitment: "finalized" }, logger);
|
|
60
|
-
const endSlot = biMin(maxSlot, finalizedSlot);
|
|
61
|
-
let slot = endSlot;
|
|
62
|
-
do {
|
|
63
|
-
const block = await provider.getBlock(slot, opts).send();
|
|
64
|
-
if (isDefined(block) && [block.blockHeight, block.blockTime].every(isDefined)) {
|
|
65
|
-
break;
|
|
66
|
-
}
|
|
67
|
-
} while (--maxLookback > 0 && --slot > 0);
|
|
68
|
-
if (maxLookback === 0) {
|
|
69
|
-
throw new Error(`Unable to find Solana block between slots [${slot}, ${endSlot}]`);
|
|
70
|
-
}
|
|
71
|
-
return Number(slot);
|
|
72
|
-
}
|
|
73
52
|
/**
|
|
74
53
|
* Parses event data from a transaction.
|
|
75
54
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/arch/svm/utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/arch/svm/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { isSVMSpokePoolClient } from "../../SpokePoolClient";
|
|
2
2
|
import { bnZero, chainIsEvm, chainIsSvm, compareAddresses, EvmAddress, isDefined } from "../../../utils";
|
|
3
|
-
import {
|
|
3
|
+
import { getNearestSlotTime } from "../../../arch/svm";
|
|
4
4
|
import assert from "assert";
|
|
5
5
|
// This returns a possible next block range that could be submitted as a new root bundle, or used as a reference
|
|
6
6
|
// when evaluating pending root bundle. The block end numbers must be less than the latest blocks for each chain ID
|
|
@@ -13,11 +13,19 @@ export async function getWidestPossibleExpectedBlockRange(chainIds, spokeClients
|
|
|
13
13
|
// filled during the challenge period.
|
|
14
14
|
const resolveEndBlock = (chainId, idx) => Math.max(spokeClients[chainId].latestHeightSearched - endBlockBuffers[idx], 0);
|
|
15
15
|
// Across bundles are bounded by slots on Solana. The UMIP requires that the bundle end slot is backed by a block.
|
|
16
|
-
const resolveSVMEndBlock = (chainId, idx) => {
|
|
16
|
+
const resolveSVMEndBlock = async (chainId, idx) => {
|
|
17
17
|
const spokePoolClient = spokeClients[chainId];
|
|
18
18
|
assert(isSVMSpokePoolClient(spokePoolClient));
|
|
19
|
-
const
|
|
20
|
-
|
|
19
|
+
const provider = spokePoolClient.svmEventsClient.getRpc();
|
|
20
|
+
const { logger } = spokePoolClient;
|
|
21
|
+
const maxSlot = BigInt(resolveEndBlock(chainId, idx)); // Respect any configured buffer for Solana.
|
|
22
|
+
let slot;
|
|
23
|
+
let opts = { commitment: "finalized" };
|
|
24
|
+
do {
|
|
25
|
+
({ slot } = await getNearestSlotTime(provider, opts, logger));
|
|
26
|
+
opts = { slot: maxSlot };
|
|
27
|
+
} while (slot > maxSlot);
|
|
28
|
+
return Number(slot);
|
|
21
29
|
};
|
|
22
30
|
const latestPossibleBundleEndBlockNumbers = await Promise.all(chainIds.map((chainId, idx) => {
|
|
23
31
|
if (!enabledChains.includes(chainId) || !isDefined(spokeClients[chainId])) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PoolRebalanceUtils.js","sourceRoot":"","sources":["../../../../../../src/clients/BundleDataClient/utils/PoolRebalanceUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAmB,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EAAa,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,gBAAgB,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACpH,OAAO,EAAE
|
|
1
|
+
{"version":3,"file":"PoolRebalanceUtils.js","sourceRoot":"","sources":["../../../../../../src/clients/BundleDataClient/utils/PoolRebalanceUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,8 @@ import { createShortenedString } from "./FormattingUtils";
|
|
|
4
4
|
import { chainIsEvm, chainIsTvm } from "./NetworkUtils";
|
|
5
5
|
import { isDefined } from "./TypeGuards";
|
|
6
6
|
import bs58 from "bs58";
|
|
7
|
+
import { TronWeb } from "tronweb";
|
|
8
|
+
import { TvmAddress } from "./AddressUtils";
|
|
7
9
|
/**
|
|
8
10
|
* Creates a block explorer link for a transaction or address on a given network.
|
|
9
11
|
* @param txHashOrAddress The transaction hash or address to link to.
|
|
@@ -70,8 +72,14 @@ function _createBlockExplorerLinkMarkdown(addr, chainId = 1) {
|
|
|
70
72
|
const txIdForUrl = txHexNoPrefix.toLowerCase();
|
|
71
73
|
return `<${constructURL(explorerDomain, ["#", "transaction", txIdForUrl])} | ${shortURLString}>`;
|
|
72
74
|
}
|
|
73
|
-
|
|
74
|
-
|
|
75
|
+
try {
|
|
76
|
+
const addressTvm = TronWeb.isAddress(addr) ? addr : TvmAddress.from(addr).toNative();
|
|
77
|
+
if (/^T[1-9A-HJ-NP-Za-km-z]{33}$/.test(addressTvm)) {
|
|
78
|
+
return `<${constructURL(explorerDomain, ["#", "address", addressTvm])} | ${shortURLString}>`;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
catch {
|
|
82
|
+
return null;
|
|
75
83
|
}
|
|
76
84
|
return null;
|
|
77
85
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BlockExplorerUtils.js","sourceRoot":"","sources":["../../../../src/utils/BlockExplorerUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,IAAI,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"BlockExplorerUtils.js","sourceRoot":"","sources":["../../../../src/utils/BlockExplorerUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,12 +31,6 @@ export declare function getNearestSlotTime(provider: SVMProvider, opts?: {
|
|
|
31
31
|
slot: bigint;
|
|
32
32
|
timestamp: number;
|
|
33
33
|
}>;
|
|
34
|
-
/**
|
|
35
|
-
* Resolve the latest finalized slot, and then work backwards to find the nearest slot containing a block.
|
|
36
|
-
* In most cases the first-resolved slot should also have a block. Avoid making arbitrary decisions about
|
|
37
|
-
* how many slots to rotate through.
|
|
38
|
-
*/
|
|
39
|
-
export declare function getLatestFinalizedSlotWithBlock(provider: SVMProvider, logger: winston.Logger, maxSlot: bigint, maxLookback?: number): Promise<number>;
|
|
40
34
|
/**
|
|
41
35
|
* Parses event data from a transaction.
|
|
42
36
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/arch/svm/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEtF,OAAO,EAAuB,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EACL,OAAO,EACP,WAAW,EACX,aAAa,EAcb,KAAK,UAAU,EACf,KAAK,iBAAiB,EACvB,MAAM,aAAa,CAAC;AAIrB,OAAO,EAAY,SAAS,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AACjF,OAAO,EAAE,SAAS,EAAE,OAAO,IAAI,UAAU,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/arch/svm/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PoolRebalanceUtils.d.ts","sourceRoot":"","sources":["../../../../../../src/clients/BundleDataClient/utils/PoolRebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC1G,OAAO,EAAwB,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EAAE,SAAS,EAA2E,MAAM,gBAAgB,CAAC;AAEpH,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAGxE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,eAAe,EAAE,eAAe,CAAC;IACjC,cAAc,EAAE,eAAe,CAAC;IAChC,MAAM,EAAE,iBAAiB,EAAE,CAAC;IAC5B,IAAI,EAAE,UAAU,CAAC,iBAAiB,CAAC,CAAC;CACrC,CAAC;AAMF,wBAAsB,mCAAmC,CACvD,QAAQ,EAAE,MAAM,EAAE,EAClB,YAAY,EAAE;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,CAAA;CAAE,EACpD,eAAe,EAAE,MAAM,EAAE,EACzB,OAAO,EAAE,OAAO,EAChB,kBAAkB,EAAE,MAAM,EAC1B,aAAa,EAAE,MAAM,EAAE,EACvB,UAAU,GAAE,OAAe,GAC1B,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"PoolRebalanceUtils.d.ts","sourceRoot":"","sources":["../../../../../../src/clients/BundleDataClient/utils/PoolRebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC1G,OAAO,EAAwB,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EAAE,SAAS,EAA2E,MAAM,gBAAgB,CAAC;AAEpH,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAGxE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,eAAe,EAAE,eAAe,CAAC;IACjC,cAAc,EAAE,eAAe,CAAC;IAChC,MAAM,EAAE,iBAAiB,EAAE,CAAC;IAC5B,IAAI,EAAE,UAAU,CAAC,iBAAiB,CAAC,CAAC;CACrC,CAAC;AAMF,wBAAsB,mCAAmC,CACvD,QAAQ,EAAE,MAAM,EAAE,EAClB,YAAY,EAAE;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,CAAA;CAAE,EACpD,eAAe,EAAE,MAAM,EAAE,EACzB,OAAO,EAAE,OAAO,EAChB,kBAAkB,EAAE,MAAM,EAC1B,aAAa,EAAE,MAAM,EAAE,EACvB,UAAU,GAAE,OAAe,GAC1B,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CA0ErB;AAED,wBAAgB,aAAa,CAAC,kBAAkB,EAAE,MAAM,EAAE,GAAG,OAAO,CAEnE;AAED,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,uBAAuB,GACzC,OAAO,CAET;AAID,wBAAgB,mCAAmC,CACjD,cAAc,EAAE,SAAS,EACzB,sBAAsB,EAAE,sBAAsB,GAC7C,SAAS,CAyBX;AAMD,wBAAgB,0BAA0B,CACxC,sBAAsB,EAAE,sBAAsB,EAC9C,cAAc,EAAE,SAAS,GACxB,SAAS,CAEX;AAED,wBAAgB,2BAA2B,CACzC,sBAAsB,EAAE,sBAAsB,EAC9C,cAAc,EAAE,SAAS,GACxB,SAAS,CAGX;AAED,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,SAAS,GACtB,IAAI,CAWN;AAED,wBAAgB,qBAAqB,CACnC,kBAAkB,EAAE,MAAM,EAC1B,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,aAAa,GAC3B,IAAI,CAaN;AAED,wBAAgB,8BAA8B,CAC5C,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE,kBAAkB,EAC3B,YAAY,EAAE,SAAS,EACvB,qBAAqB,EAAE,MAAM,GAC5B,IAAI,CASN;AAED,wBAAgB,4BAA4B,CAC1C,kBAAkB,EAAE,MAAM,EAC1B,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,eAAe,EAC/B,qBAAqB,EAAE,MAAM,EAAE,EAC/B,iBAAiB,EAAE,uBAAuB,EAC1C,eAAe,CAAC,EAAE,MAAM,GACvB,iBAAiB,EAAE,CA6ErB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BlockExplorerUtils.d.ts","sourceRoot":"","sources":["../../../../src/utils/BlockExplorerUtils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"BlockExplorerUtils.d.ts","sourceRoot":"","sources":["../../../../src/utils/BlockExplorerUtils.ts"],"names":[],"mappings":"AASA;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,eAAe,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAE3F;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEhF;AAgFD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,mBAAmB,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAElG"}
|
package/package.json
CHANGED
package/src/arch/svm/utils.ts
CHANGED
|
@@ -25,7 +25,7 @@ import assert from "assert";
|
|
|
25
25
|
import bs58 from "bs58";
|
|
26
26
|
import { ethers } from "ethers";
|
|
27
27
|
import { FillType, RelayData, RelayDataWithMessageHash } from "../../interfaces";
|
|
28
|
-
import { BigNumber, Address as SdkAddress,
|
|
28
|
+
import { BigNumber, Address as SdkAddress, getMessageHash, isDefined, isUint8Array } from "../../utils";
|
|
29
29
|
import { getTimestampForSlot, getSlot, getRelayDataHash } from "./SpokeUtils";
|
|
30
30
|
import {
|
|
31
31
|
AttestedCCTPMessage,
|
|
@@ -88,36 +88,6 @@ export async function getNearestSlotTime(
|
|
|
88
88
|
return { slot, timestamp };
|
|
89
89
|
}
|
|
90
90
|
|
|
91
|
-
/**
|
|
92
|
-
* Resolve the latest finalized slot, and then work backwards to find the nearest slot containing a block.
|
|
93
|
-
* In most cases the first-resolved slot should also have a block. Avoid making arbitrary decisions about
|
|
94
|
-
* how many slots to rotate through.
|
|
95
|
-
*/
|
|
96
|
-
export async function getLatestFinalizedSlotWithBlock(
|
|
97
|
-
provider: SVMProvider,
|
|
98
|
-
logger: winston.Logger,
|
|
99
|
-
maxSlot: bigint,
|
|
100
|
-
maxLookback = 1000
|
|
101
|
-
): Promise<number> {
|
|
102
|
-
const opts = { maxSupportedTransactionVersion: 0, transactionDetails: "none", rewards: false } as const;
|
|
103
|
-
const { slot: finalizedSlot } = await getNearestSlotTime(provider, { commitment: "finalized" }, logger);
|
|
104
|
-
const endSlot = biMin(maxSlot, finalizedSlot);
|
|
105
|
-
|
|
106
|
-
let slot = endSlot;
|
|
107
|
-
do {
|
|
108
|
-
const block = await provider.getBlock(slot, opts).send();
|
|
109
|
-
if (isDefined(block) && [block.blockHeight, block.blockTime].every(isDefined)) {
|
|
110
|
-
break;
|
|
111
|
-
}
|
|
112
|
-
} while (--maxLookback > 0 && --slot > 0);
|
|
113
|
-
|
|
114
|
-
if (maxLookback === 0) {
|
|
115
|
-
throw new Error(`Unable to find Solana block between slots [${slot}, ${endSlot}]`);
|
|
116
|
-
}
|
|
117
|
-
|
|
118
|
-
return Number(slot);
|
|
119
|
-
}
|
|
120
|
-
|
|
121
91
|
/**
|
|
122
92
|
* Parses event data from a transaction.
|
|
123
93
|
*/
|
|
@@ -2,7 +2,7 @@ import { MerkleTree } from "@across-protocol/contracts/dist/utils/MerkleTree";
|
|
|
2
2
|
import { RunningBalances, PoolRebalanceLeaf, Clients, SpokePoolTargetBalance } from "../../../interfaces";
|
|
3
3
|
import { isSVMSpokePoolClient, SpokePoolClient } from "../../SpokePoolClient";
|
|
4
4
|
import { BigNumber, bnZero, chainIsEvm, chainIsSvm, compareAddresses, EvmAddress, isDefined } from "../../../utils";
|
|
5
|
-
import {
|
|
5
|
+
import { getNearestSlotTime } from "../../../arch/svm";
|
|
6
6
|
import { HubPoolClient } from "../../HubPoolClient";
|
|
7
7
|
import { V3DepositWithBlock } from "./shims";
|
|
8
8
|
import { AcrossConfigStoreClient } from "../../AcrossConfigStoreClient";
|
|
@@ -36,16 +36,21 @@ export async function getWidestPossibleExpectedBlockRange(
|
|
|
36
36
|
Math.max(spokeClients[chainId].latestHeightSearched - endBlockBuffers[idx], 0);
|
|
37
37
|
|
|
38
38
|
// Across bundles are bounded by slots on Solana. The UMIP requires that the bundle end slot is backed by a block.
|
|
39
|
-
const resolveSVMEndBlock = (chainId: number, idx: number): Promise<number> => {
|
|
39
|
+
const resolveSVMEndBlock = async (chainId: number, idx: number): Promise<number> => {
|
|
40
40
|
const spokePoolClient = spokeClients[chainId];
|
|
41
41
|
assert(isSVMSpokePoolClient(spokePoolClient));
|
|
42
42
|
|
|
43
|
-
const
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
43
|
+
const provider = spokePoolClient.svmEventsClient.getRpc();
|
|
44
|
+
const { logger } = spokePoolClient;
|
|
45
|
+
const maxSlot = BigInt(resolveEndBlock(chainId, idx)); // Respect any configured buffer for Solana.
|
|
46
|
+
|
|
47
|
+
let slot: bigint;
|
|
48
|
+
let opts: { slot: bigint } | { commitment: "finalized" } = { commitment: "finalized" };
|
|
49
|
+
do {
|
|
50
|
+
({ slot } = await getNearestSlotTime(provider, opts, logger));
|
|
51
|
+
opts = { slot: maxSlot };
|
|
52
|
+
} while (slot > maxSlot);
|
|
53
|
+
return Number(slot);
|
|
49
54
|
};
|
|
50
55
|
|
|
51
56
|
const latestPossibleBundleEndBlockNumbers = await Promise.all(
|
|
@@ -4,6 +4,8 @@ import { createShortenedString } from "./FormattingUtils";
|
|
|
4
4
|
import { chainIsEvm, chainIsTvm } from "./NetworkUtils";
|
|
5
5
|
import { isDefined } from "./TypeGuards";
|
|
6
6
|
import bs58 from "bs58";
|
|
7
|
+
import { TronWeb } from "tronweb";
|
|
8
|
+
import { TvmAddress } from "./AddressUtils";
|
|
7
9
|
|
|
8
10
|
/**
|
|
9
11
|
* Creates a block explorer link for a transaction or address on a given network.
|
|
@@ -74,8 +76,13 @@ function _createBlockExplorerLinkMarkdown(addr: string, chainId = 1): string | n
|
|
|
74
76
|
const txIdForUrl = txHexNoPrefix.toLowerCase();
|
|
75
77
|
return `<${constructURL(explorerDomain, ["#", "transaction", txIdForUrl])} | ${shortURLString}>`;
|
|
76
78
|
}
|
|
77
|
-
|
|
78
|
-
|
|
79
|
+
try {
|
|
80
|
+
const addressTvm = TronWeb.isAddress(addr) ? addr : TvmAddress.from(addr).toNative();
|
|
81
|
+
if (/^T[1-9A-HJ-NP-Za-km-z]{33}$/.test(addressTvm)) {
|
|
82
|
+
return `<${constructURL(explorerDomain, ["#", "address", addressTvm])} | ${shortURLString}>`;
|
|
83
|
+
}
|
|
84
|
+
} catch {
|
|
85
|
+
return null;
|
|
79
86
|
}
|
|
80
87
|
return null;
|
|
81
88
|
} else if (chainIsEvm(chainId)) {
|