@chainlink/ccip-cli 0.92.0 → 0.93.0
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/commands/lane-latency.d.ts +26 -0
- package/dist/commands/lane-latency.d.ts.map +1 -0
- package/dist/commands/lane-latency.js +73 -0
- package/dist/commands/lane-latency.js.map +1 -0
- package/dist/commands/manual-exec.d.ts.map +1 -1
- package/dist/commands/manual-exec.js +20 -269
- package/dist/commands/manual-exec.js.map +1 -1
- package/dist/commands/send.d.ts +1 -1
- package/dist/commands/send.js +11 -2
- package/dist/commands/send.js.map +1 -1
- package/dist/commands/show.d.ts.map +1 -1
- package/dist/commands/show.js +36 -16
- package/dist/commands/show.js.map +1 -1
- package/dist/commands/types.d.ts +1 -1
- package/dist/commands/utils.d.ts.map +1 -1
- package/dist/commands/utils.js +2 -1
- package/dist/commands/utils.js.map +1 -1
- package/dist/index.d.ts +6 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +7 -3
- package/dist/index.js.map +1 -1
- package/dist/providers/aptos.js +1 -1
- package/dist/providers/aptos.js.map +1 -1
- package/dist/providers/evm.js +1 -1
- package/dist/providers/evm.js.map +1 -1
- package/dist/providers/index.d.ts +6 -1
- package/dist/providers/index.d.ts.map +1 -1
- package/dist/providers/index.js +11 -8
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/sui.d.ts.map +1 -1
- package/dist/providers/sui.js +1 -2
- package/dist/providers/sui.js.map +1 -1
- package/dist/providers/ton.d.ts +9 -3
- package/dist/providers/ton.d.ts.map +1 -1
- package/dist/providers/ton.js +100 -26
- package/dist/providers/ton.js.map +1 -1
- package/package.json +10 -6
- package/src/commands/lane-latency.ts +93 -0
- package/src/commands/manual-exec.ts +18 -267
- package/src/commands/send.ts +11 -8
- package/src/commands/show.ts +40 -22
- package/src/commands/types.ts +1 -1
- package/src/commands/utils.ts +6 -4
- package/src/index.ts +8 -4
- package/src/providers/aptos.ts +1 -1
- package/src/providers/evm.ts +1 -1
- package/src/providers/index.ts +18 -14
- package/src/providers/sui.ts +1 -2
- package/src/providers/ton.ts +106 -30
- package/tsconfig.json +3 -2
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import type { Argv } from 'yargs';
|
|
2
|
+
import type { GlobalOpts } from '../index.ts';
|
|
3
|
+
import { type Ctx } from './types.ts';
|
|
4
|
+
export declare const command: string[];
|
|
5
|
+
export declare const describe = "Query real-time lane latency between source and destination chains";
|
|
6
|
+
export declare const aliases: string[];
|
|
7
|
+
/**
|
|
8
|
+
* Yargs builder for the lane-latency command.
|
|
9
|
+
* @param yargs - Yargs instance.
|
|
10
|
+
* @returns Configured yargs instance with command options.
|
|
11
|
+
*/
|
|
12
|
+
export declare const builder: (yargs: Argv) => Argv<{
|
|
13
|
+
source: string;
|
|
14
|
+
} & {
|
|
15
|
+
dest: string;
|
|
16
|
+
} & {
|
|
17
|
+
"api-url": string | undefined;
|
|
18
|
+
}>;
|
|
19
|
+
/**
|
|
20
|
+
* Handler for the lane-latency command.
|
|
21
|
+
* @param argv - Command line arguments.
|
|
22
|
+
*/
|
|
23
|
+
export declare function handler(argv: Awaited<ReturnType<typeof builder>['argv']> & GlobalOpts): Promise<void>;
|
|
24
|
+
/** Exported for testing */
|
|
25
|
+
export declare function getLaneLatencyCmd(ctx: Ctx, argv: Parameters<typeof handler>[0]): Promise<void>;
|
|
26
|
+
//# sourceMappingURL=lane-latency.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lane-latency.d.ts","sourceRoot":"","sources":["../../src/commands/lane-latency.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEjC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,EAAE,KAAK,GAAG,EAAU,MAAM,YAAY,CAAA;AAG7C,eAAO,MAAM,OAAO,UAAkE,CAAA;AACtF,eAAO,MAAM,QAAQ,uEAAuE,CAAA;AAC5F,eAAO,MAAM,OAAO,UAAc,CAAA;AAElC;;;;GAIG;AACH,eAAO,MAAM,OAAO,GAAI,OAAO,IAAI;;;;;;EAe7B,CAAA;AAEN;;;GAGG;AACH,wBAAsB,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,UAAU,iBAQ3F;AAED,2BAA2B;AAC3B,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC,iBAuCpF"}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import { CCIPAPIClient, CCIPApiClientNotAvailableError, bigIntReplacer, networkInfo, } from '@chainlink/ccip-sdk';
|
|
2
|
+
import { Format } from "./types.js";
|
|
3
|
+
import { formatDuration, getCtx, logParsedError, prettyTable } from "./utils.js";
|
|
4
|
+
export const command = ['laneLatency <source> <dest>', 'lane-latency <source> <dest>'];
|
|
5
|
+
export const describe = 'Query real-time lane latency between source and destination chains';
|
|
6
|
+
export const aliases = ['latency'];
|
|
7
|
+
/**
|
|
8
|
+
* Yargs builder for the lane-latency command.
|
|
9
|
+
* @param yargs - Yargs instance.
|
|
10
|
+
* @returns Configured yargs instance with command options.
|
|
11
|
+
*/
|
|
12
|
+
export const builder = (yargs) => yargs
|
|
13
|
+
.positional('source', {
|
|
14
|
+
type: 'string',
|
|
15
|
+
demandOption: true,
|
|
16
|
+
describe: 'Source network (chainId, selector, or name). Example: ethereum-mainnet',
|
|
17
|
+
})
|
|
18
|
+
.positional('dest', {
|
|
19
|
+
type: 'string',
|
|
20
|
+
demandOption: true,
|
|
21
|
+
describe: 'Destination network (chainId, selector, or name). Example: arbitrum-mainnet',
|
|
22
|
+
})
|
|
23
|
+
.option('api-url', {
|
|
24
|
+
type: 'string',
|
|
25
|
+
describe: 'Custom CCIP API URL (defaults to api.ccip.chain.link)',
|
|
26
|
+
});
|
|
27
|
+
/**
|
|
28
|
+
* Handler for the lane-latency command.
|
|
29
|
+
* @param argv - Command line arguments.
|
|
30
|
+
*/
|
|
31
|
+
export async function handler(argv) {
|
|
32
|
+
const [ctx, destroy] = getCtx(argv);
|
|
33
|
+
return getLaneLatencyCmd(ctx, argv)
|
|
34
|
+
.catch((err) => {
|
|
35
|
+
process.exitCode = 1;
|
|
36
|
+
if (!logParsedError.call(ctx, err))
|
|
37
|
+
ctx.logger.error(err);
|
|
38
|
+
})
|
|
39
|
+
.finally(destroy);
|
|
40
|
+
}
|
|
41
|
+
/** Exported for testing */
|
|
42
|
+
export async function getLaneLatencyCmd(ctx, argv) {
|
|
43
|
+
const { logger } = ctx;
|
|
44
|
+
// Respect --no-api flag - this command requires API access
|
|
45
|
+
if (argv.noApi) {
|
|
46
|
+
throw new CCIPApiClientNotAvailableError({
|
|
47
|
+
context: {
|
|
48
|
+
reason: 'The lane-latency command requires API access. Remove --no-api flag to use this command.',
|
|
49
|
+
},
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
const sourceNetwork = networkInfo(argv.source);
|
|
53
|
+
const destNetwork = networkInfo(argv.dest);
|
|
54
|
+
const apiClient = new CCIPAPIClient(argv.apiUrl, { logger });
|
|
55
|
+
const result = await apiClient.getLaneLatency(sourceNetwork.chainSelector, destNetwork.chainSelector);
|
|
56
|
+
switch (argv.format) {
|
|
57
|
+
case Format.json:
|
|
58
|
+
logger.log(JSON.stringify(result, bigIntReplacer, 2));
|
|
59
|
+
break;
|
|
60
|
+
case Format.log:
|
|
61
|
+
logger.log('Lane Latency:', result);
|
|
62
|
+
break;
|
|
63
|
+
default: {
|
|
64
|
+
prettyTable.call(ctx, {
|
|
65
|
+
Source: `${sourceNetwork.name} [${sourceNetwork.chainSelector}]`,
|
|
66
|
+
Destination: `${destNetwork.name} [${destNetwork.chainSelector}]`,
|
|
67
|
+
'Estimated Delivery': `~${formatDuration(result.totalMs / 1000)}`,
|
|
68
|
+
'Latency (ms)': result.totalMs.toLocaleString(),
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
//# sourceMappingURL=lane-latency.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lane-latency.js","sourceRoot":"","sources":["../../src/commands/lane-latency.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manual-exec.d.ts","sourceRoot":"","sources":["../../src/commands/manual-exec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"manual-exec.d.ts","sourceRoot":"","sources":["../../src/commands/manual-exec.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEjC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAiB7C,eAAO,MAAM,OAAO,yBAAyB,CAAA;AAC7C,eAAO,MAAM,QAAQ,gDAAgD,CAAA;AAErE;;;;GAIG;AACH,eAAO,MAAM,OAAO,GAAI,OAAO,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiE7B,CAAA;AAEN;;;GAGG;AACH,wBAAsB,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,UAAU,iBAW3F"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CCIPChainFamilyUnsupportedError,
|
|
1
|
+
import { CCIPChainFamilyUnsupportedError, ChainFamily, bigIntReplacer, calculateManualExecProof, discoverOffRamp, estimateExecGasForRequest, isSupportedTxHash, } from '@chainlink/ccip-sdk';
|
|
2
2
|
import { Format } from "./types.js";
|
|
3
3
|
import { getCtx, logParsedError, prettyCommit, prettyReceipt, prettyRequest, selectRequest, withDateTimestamp, } from "./utils.js";
|
|
4
4
|
import { fetchChainsFromRpcs, loadChainWallet } from "../providers/index.js";
|
|
@@ -95,7 +95,7 @@ async function manualExec(ctx, argv) {
|
|
|
95
95
|
// messageId not yet implemented for Solana
|
|
96
96
|
const [getChain, tx$] = fetchChainsFromRpcs(ctx, argv, argv.txHash);
|
|
97
97
|
const [source, tx] = await tx$;
|
|
98
|
-
const request = await selectRequest(await source.
|
|
98
|
+
const request = await selectRequest(await source.getMessagesInTx(tx), 'to know more', argv);
|
|
99
99
|
switch (argv.format) {
|
|
100
100
|
case Format.log: {
|
|
101
101
|
const logPrefix = 'log' in request ? `message ${request.log.index} = ` : 'message = ';
|
|
@@ -112,21 +112,22 @@ async function manualExec(ctx, argv) {
|
|
|
112
112
|
const dest = await getChain(request.lane.destChainSelector);
|
|
113
113
|
const offRamp = await discoverOffRamp(source, dest, request.lane.onRamp, source);
|
|
114
114
|
const commitStore = await dest.getCommitStoreForOffRamp(offRamp);
|
|
115
|
-
const commit = await dest.
|
|
115
|
+
const commit = await dest.getCommitReport({ ...argv, commitStore, request });
|
|
116
116
|
switch (argv.format) {
|
|
117
117
|
case Format.log:
|
|
118
118
|
logger.log('commit =', commit);
|
|
119
119
|
break;
|
|
120
120
|
case Format.pretty:
|
|
121
|
+
logger.info('Commit (dest):');
|
|
121
122
|
await prettyCommit.call(ctx, dest, commit, request);
|
|
122
123
|
break;
|
|
123
124
|
case Format.json:
|
|
124
125
|
logger.info(JSON.stringify(commit, bigIntReplacer, 2));
|
|
125
126
|
break;
|
|
126
127
|
}
|
|
127
|
-
const messagesInBatch = await source.
|
|
128
|
+
const messagesInBatch = await source.getMessagesInBatch(request, commit.report, argv);
|
|
128
129
|
const execReportProof = calculateManualExecProof(messagesInBatch, request.lane, request.message.messageId, commit.report.merkleRoot, dest);
|
|
129
|
-
const offchainTokenData = await source.
|
|
130
|
+
const offchainTokenData = await source.getOffchainTokenData(request);
|
|
130
131
|
const execReport = {
|
|
131
132
|
...execReportProof,
|
|
132
133
|
message: request.message,
|
|
@@ -150,270 +151,20 @@ async function manualExec(ctx, argv) {
|
|
|
150
151
|
}
|
|
151
152
|
}
|
|
152
153
|
const [, wallet] = await loadChainWallet(dest, argv);
|
|
153
|
-
const
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
case Format.pretty:
|
|
167
|
-
if (!found)
|
|
168
|
-
logger.info('Receipts (dest):');
|
|
169
|
-
prettyReceipt.call(ctx, receipt, request, receipt.log.tx?.from ??
|
|
170
|
-
(await dest.getTransaction(receipt.log.transactionHash).catch(() => null))?.from);
|
|
171
|
-
break;
|
|
172
|
-
case Format.json:
|
|
173
|
-
logger.info(JSON.stringify(execReceipt, bigIntReplacer, 2));
|
|
174
|
-
break;
|
|
175
|
-
}
|
|
176
|
-
found = true;
|
|
177
|
-
}
|
|
178
|
-
if (!found)
|
|
179
|
-
throw new CCIPReceiptNotFoundError(manualExecTx.hash);
|
|
180
|
-
}
|
|
181
|
-
/*
|
|
182
|
-
export async function manualExecSenderQueue(
|
|
183
|
-
providers: Providers,
|
|
184
|
-
txHash: string,
|
|
185
|
-
argv: {
|
|
186
|
-
gasLimit?: number
|
|
187
|
-
tokensGasLimit?: number
|
|
188
|
-
logIndex?: number
|
|
189
|
-
execFailed?: boolean
|
|
190
|
-
format: Format
|
|
191
|
-
page: number
|
|
192
|
-
wallet?: string
|
|
193
|
-
},
|
|
194
|
-
) {
|
|
195
|
-
const tx = await providers.getTxReceipt(txHash)
|
|
196
|
-
const source = tx.provider
|
|
197
|
-
|
|
198
|
-
let firstRequest
|
|
199
|
-
if (argv.logIndex != null) {
|
|
200
|
-
firstRequest = await fetchCCIPMessageInLog(tx, argv.logIndex)
|
|
201
|
-
} else {
|
|
202
|
-
firstRequest = await selectRequest(await fetchCCIPMessagesInTx(tx), 'to execute')
|
|
203
|
-
}
|
|
204
|
-
switch (argv.format) {
|
|
205
|
-
case Format.log:
|
|
206
|
-
console.log(`message ${firstRequest.log.index} =`, withDateTimestamp(firstRequest))
|
|
207
|
-
break
|
|
208
|
-
case Format.pretty:
|
|
209
|
-
await prettyRequest(source, firstRequest)
|
|
210
|
-
break
|
|
211
|
-
case Format.json:
|
|
212
|
-
console.info(JSON.stringify(firstRequest, bigIntReplacer, 2))
|
|
213
|
-
break
|
|
214
|
-
}
|
|
215
|
-
|
|
216
|
-
const dest = await providers.forChainId(chainIdFromSelector(firstRequest.lane.destChainSelector))
|
|
217
|
-
|
|
218
|
-
const requests: Omit<CCIPRequest, 'timestamp' | 'tx'>[] = []
|
|
219
|
-
for await (const request of fetchRequestsForSender(source, firstRequest)) {
|
|
220
|
-
requests.push(request)
|
|
221
|
-
if (requests.length >= MAX_QUEUE) break
|
|
222
|
-
}
|
|
223
|
-
console.info('Found', requests.length, `requests for "${firstRequest.message.sender}"`)
|
|
224
|
-
if (!requests.length) return
|
|
225
|
-
|
|
226
|
-
let startBlock = await getSomeBlockNumberBefore(dest, firstRequest.timestamp)
|
|
227
|
-
const wallet = (await getWallet(argv)).connect(dest)
|
|
228
|
-
const offRampContract = await discoverOffRamp(wallet, firstRequest.lane, {
|
|
229
|
-
fromBlock: startBlock,
|
|
230
|
-
page: argv.page,
|
|
231
|
-
})
|
|
232
|
-
const senderNonce = await offRampContract.getSenderNonce(firstRequest.message.sender)
|
|
233
|
-
const origRequestsCnt = requests.length,
|
|
234
|
-
last = requests[requests.length - 1]
|
|
235
|
-
while (requests.length && requests[0].message.header.sequenceNumber <= senderNonce) {
|
|
236
|
-
requests.shift()
|
|
237
|
-
}
|
|
238
|
-
console.info(
|
|
239
|
-
'Found',
|
|
240
|
-
requests.length,
|
|
241
|
-
`requests for "${firstRequest.message.sender}", removed `,
|
|
242
|
-
origRequestsCnt - requests.length,
|
|
243
|
-
'already executed before senderNonce =',
|
|
244
|
-
senderNonce,
|
|
245
|
-
'. Last source txHash =',
|
|
246
|
-
last.log.transactionHash,
|
|
247
|
-
)
|
|
248
|
-
if (!requests.length) return
|
|
249
|
-
let nonce = await wallet.getNonce()
|
|
250
|
-
|
|
251
|
-
let lastBatch:
|
|
252
|
-
| readonly [CCIPCommit, Omit<CCIPRequest<CCIPVersion>, 'tx' | 'timestamp'>[]]
|
|
253
|
-
| undefined
|
|
254
|
-
const txsPending = []
|
|
255
|
-
for (let i = 0; i < requests.length; ) {
|
|
256
|
-
let commit, batch
|
|
257
|
-
if (!lastBatch || requests[i].message.header.sequenceNumber > lastBatch[0].report.maxSeqNr) {
|
|
258
|
-
commit = await fetchCommitReport(dest, requests[i], {
|
|
259
|
-
startBlock,
|
|
260
|
-
page: argv.page,
|
|
261
|
-
})
|
|
262
|
-
startBlock = commit.log.blockNumber + 1
|
|
263
|
-
|
|
264
|
-
batch = await fetchAllMessagesInBatch(
|
|
265
|
-
source,
|
|
266
|
-
requests[i].lane.destChainSelector,
|
|
267
|
-
requests[i].log,
|
|
268
|
-
commit.report,
|
|
269
|
-
{ page: argv.page },
|
|
270
|
-
)
|
|
271
|
-
lastBatch = [commit, batch]
|
|
272
|
-
} else {
|
|
273
|
-
;[commit, batch] = lastBatch
|
|
274
|
-
}
|
|
275
|
-
|
|
276
|
-
const msgIdsToExec = [] as string[]
|
|
277
|
-
while (
|
|
278
|
-
i < requests.length &&
|
|
279
|
-
requests[i].message.header.sequenceNumber <= commit.report.maxSeqNr &&
|
|
280
|
-
msgIdsToExec.length < MAX_EXECS_IN_BATCH
|
|
281
|
-
) {
|
|
282
|
-
msgIdsToExec.push(requests[i++].message.header.messageId)
|
|
283
|
-
}
|
|
284
|
-
|
|
285
|
-
const manualExecReport = calculateManualExecProof(
|
|
286
|
-
batch.map(({ message }) => message),
|
|
287
|
-
firstRequest.lane,
|
|
288
|
-
msgIdsToExec,
|
|
289
|
-
commit.report.merkleRoot,
|
|
290
|
-
)
|
|
291
|
-
const requestsToExec = manualExecReport.messages.map(
|
|
292
|
-
({ header }) =>
|
|
293
|
-
requests.find(({ message }) => message.header.messageId === header.messageId)!,
|
|
294
|
-
)
|
|
295
|
-
const offchainTokenData = await Promise.all(
|
|
296
|
-
requestsToExec.map(async (request) => {
|
|
297
|
-
const tx = await lazyCached(`tx ${request.log.transactionHash}`, () =>
|
|
298
|
-
source.getTransactionReceipt(request.log.transactionHash).then((res) => {
|
|
299
|
-
if (!res) throw new Error(`Tx not found: ${request.log.transactionHash}`)
|
|
300
|
-
return res
|
|
301
|
-
}),
|
|
302
|
-
)
|
|
303
|
-
return fetchOffchainTokenData({ ...request, tx })
|
|
304
|
-
}),
|
|
305
|
-
)
|
|
306
|
-
const execReport = { ...manualExecReport, offchainTokenData }
|
|
307
|
-
const getGasLimitOverride = (message: { gasLimit: bigint } | { extraArgs: string }): bigint => {
|
|
308
|
-
if (argv.gasLimit != null) {
|
|
309
|
-
const argvGasLimit = BigInt(argv.gasLimit)
|
|
310
|
-
let msgGasLimit
|
|
311
|
-
if ('gasLimit' in message) {
|
|
312
|
-
msgGasLimit = message.gasLimit
|
|
313
|
-
} else {
|
|
314
|
-
const parsedArgs = parseExtraArgs(message.extraArgs, source.network.family)
|
|
315
|
-
if (!parsedArgs || !('gasLimit' in parsedArgs) || !parsedArgs.gasLimit) {
|
|
316
|
-
throw new Error(`Missing gasLimit argument`)
|
|
317
|
-
}
|
|
318
|
-
msgGasLimit = BigInt(parsedArgs.gasLimit)
|
|
319
|
-
}
|
|
320
|
-
if (argvGasLimit > msgGasLimit) {
|
|
321
|
-
return argvGasLimit
|
|
322
|
-
}
|
|
323
|
-
}
|
|
324
|
-
return 0n
|
|
325
|
-
}
|
|
326
|
-
|
|
327
|
-
let manualExecTx
|
|
328
|
-
if (firstRequest.lane.version === CCIPVersion.V1_2) {
|
|
329
|
-
const gasOverrides = manualExecReport.messages.map((message) =>
|
|
330
|
-
getGasLimitOverride(message as CCIPMessage<typeof CCIPVersion.V1_2>),
|
|
331
|
-
)
|
|
332
|
-
manualExecTx = await (
|
|
333
|
-
offRampContract as CCIPContract<typeof CCIPContractType.OffRamp, typeof CCIPVersion.V1_2>
|
|
334
|
-
).manuallyExecute(
|
|
335
|
-
execReport as {
|
|
336
|
-
offchainTokenData: string[][]
|
|
337
|
-
messages: CCIPMessage<typeof CCIPVersion.V1_2>[]
|
|
338
|
-
proofs: string[]
|
|
339
|
-
proofFlagBits: bigint
|
|
340
|
-
},
|
|
341
|
-
gasOverrides,
|
|
342
|
-
{ nonce: nonce++, gasLimit: argv.gasLimit ? argv.gasLimit : undefined },
|
|
343
|
-
)
|
|
344
|
-
} else if (firstRequest.lane.version === CCIPVersion.V1_5) {
|
|
345
|
-
const gasOverrides = manualExecReport.messages.map((message) => ({
|
|
346
|
-
receiverExecutionGasLimit: getGasLimitOverride(
|
|
347
|
-
message as CCIPMessage<typeof CCIPVersion.V1_5>,
|
|
348
|
-
),
|
|
349
|
-
tokenGasOverrides: message.tokenAmounts.map(() => BigInt(argv.tokensGasLimit ?? 0)),
|
|
350
|
-
}))
|
|
351
|
-
manualExecTx = await (
|
|
352
|
-
offRampContract as CCIPContract<typeof CCIPContractType.OffRamp, typeof CCIPVersion.V1_5>
|
|
353
|
-
).manuallyExecute(
|
|
354
|
-
execReport as {
|
|
355
|
-
offchainTokenData: string[][]
|
|
356
|
-
messages: CCIPMessage<typeof CCIPVersion.V1_5>[]
|
|
357
|
-
proofs: string[]
|
|
358
|
-
proofFlagBits: bigint
|
|
359
|
-
},
|
|
360
|
-
gasOverrides,
|
|
361
|
-
{ nonce: nonce++, gasLimit: argv.gasLimit ? argv.gasLimit : undefined },
|
|
362
|
-
)
|
|
363
|
-
} else {
|
|
364
|
-
const gasOverrides = manualExecReport.messages.map((message) => ({
|
|
365
|
-
receiverExecutionGasLimit: getGasLimitOverride(
|
|
366
|
-
message as CCIPMessage<typeof CCIPVersion.V1_6>,
|
|
367
|
-
),
|
|
368
|
-
tokenGasOverrides: message.tokenAmounts.map(() => BigInt(argv.tokensGasLimit ?? 0)),
|
|
369
|
-
}))
|
|
370
|
-
manualExecTx = await (
|
|
371
|
-
offRampContract as CCIPContract<typeof CCIPContractType.OffRamp, typeof CCIPVersion.V1_6>
|
|
372
|
-
).manuallyExecute(
|
|
373
|
-
[
|
|
374
|
-
{
|
|
375
|
-
sourceChainSelector: firstRequest.lane.sourceChainSelector,
|
|
376
|
-
messages: execReport.messages as (CCIPMessage<typeof CCIPVersion.V1_6> & {
|
|
377
|
-
gasLimit: bigint
|
|
378
|
-
})[],
|
|
379
|
-
proofs: execReport.proofs,
|
|
380
|
-
proofFlagBits: execReport.proofFlagBits,
|
|
381
|
-
offchainTokenData: execReport.offchainTokenData,
|
|
382
|
-
},
|
|
383
|
-
],
|
|
384
|
-
[gasOverrides],
|
|
385
|
-
{ nonce: nonce++, gasLimit: argv.gasLimit ? argv.gasLimit : undefined },
|
|
386
|
-
)
|
|
387
|
-
}
|
|
388
|
-
|
|
389
|
-
const toExec = requests[i - 1] // log only request data for last msg in msgIdsToExec
|
|
390
|
-
console.log(
|
|
391
|
-
`🚀 [${i}/${requests.length}, ${batch.length} batch, ${msgIdsToExec.length} to exec]`,
|
|
392
|
-
'source tx =',
|
|
393
|
-
toExec.log.transactionHash,
|
|
394
|
-
'msgId =',
|
|
395
|
-
toExec.message.header.messageId,
|
|
396
|
-
'nonce =',
|
|
397
|
-
toExec.message.header.nonce,
|
|
398
|
-
'manualExec tx =',
|
|
399
|
-
manualExecTx.hash,
|
|
400
|
-
'to =',
|
|
401
|
-
manualExecTx.to,
|
|
402
|
-
'gasLimit =',
|
|
403
|
-
manualExecTx.gasLimit,
|
|
404
|
-
)
|
|
405
|
-
txsPending.push(manualExecTx)
|
|
406
|
-
if (txsPending.length >= MAX_PENDING_TXS) {
|
|
407
|
-
console.debug(
|
|
408
|
-
'awaiting',
|
|
409
|
-
txsPending.length,
|
|
410
|
-
'txs:',
|
|
411
|
-
txsPending.map((tx) => tx.hash),
|
|
412
|
-
)
|
|
413
|
-
await txsPending[txsPending.length - 1].wait()
|
|
414
|
-
txsPending.length = 0
|
|
154
|
+
const receipt = await dest.executeReport({ ...argv, offRamp, execReport, wallet });
|
|
155
|
+
switch (argv.format) {
|
|
156
|
+
case Format.log:
|
|
157
|
+
logger.log('receipt =', withDateTimestamp(receipt));
|
|
158
|
+
break;
|
|
159
|
+
case Format.pretty:
|
|
160
|
+
logger.info('Receipt (dest):');
|
|
161
|
+
prettyReceipt.call(ctx, receipt, request, receipt.log.tx?.from ??
|
|
162
|
+
(await dest.getTransaction(receipt.log.transactionHash).catch(() => null))?.from);
|
|
163
|
+
break;
|
|
164
|
+
case Format.json:
|
|
165
|
+
logger.info(JSON.stringify(receipt, bigIntReplacer, 2));
|
|
166
|
+
break;
|
|
415
167
|
}
|
|
416
|
-
}
|
|
417
168
|
}
|
|
418
|
-
|
|
169
|
+
// TODO: re-implement executing `sender` queue
|
|
419
170
|
//# sourceMappingURL=manual-exec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manual-exec.js","sourceRoot":"","sources":["../../src/commands/manual-exec.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"manual-exec.js","sourceRoot":"","sources":["../../src/commands/manual-exec.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/send.d.ts
CHANGED
|
@@ -13,7 +13,7 @@ export declare const builder: (yargs: Argv) => Argv<import("yargs").Omit<{
|
|
|
13
13
|
router: string;
|
|
14
14
|
} & {
|
|
15
15
|
dest: string;
|
|
16
|
-
}, "data" | "
|
|
16
|
+
}, "data" | "wallet" | "receiver" | "account" | "gas-limit" | "estimate-gas-limit" | "wait" | "allow-out-of-order-exec" | "fee-token" | "transfer-tokens" | "token-receiver" | "only-get-fee" | "only-estimate" | "approve-max"> & import("yargs").InferredOptionTypes<{
|
|
17
17
|
receiver: {
|
|
18
18
|
alias: string;
|
|
19
19
|
type: "string";
|
package/dist/commands/send.js
CHANGED
|
@@ -251,7 +251,11 @@ async function sendMessage(ctx, argv) {
|
|
|
251
251
|
tokenAmounts,
|
|
252
252
|
};
|
|
253
253
|
// calculate fee
|
|
254
|
-
const fee = await source.getFee(
|
|
254
|
+
const fee = await source.getFee({
|
|
255
|
+
...argv,
|
|
256
|
+
destChainSelector: destNetwork.chainSelector,
|
|
257
|
+
message,
|
|
258
|
+
});
|
|
255
259
|
logger.info('Fee:', fee, '=', formatUnits(fee, feeTokenInfo.decimals), !argv.feeToken && feeTokenInfo.symbol.startsWith('W')
|
|
256
260
|
? feeTokenInfo.symbol.substring(1)
|
|
257
261
|
: feeTokenInfo.symbol);
|
|
@@ -259,7 +263,12 @@ async function sendMessage(ctx, argv) {
|
|
|
259
263
|
return;
|
|
260
264
|
if (!walletAddress)
|
|
261
265
|
[walletAddress, wallet] = await loadChainWallet(source, argv);
|
|
262
|
-
const request = await source.sendMessage(
|
|
266
|
+
const request = await source.sendMessage({
|
|
267
|
+
...argv,
|
|
268
|
+
destChainSelector: destNetwork.chainSelector,
|
|
269
|
+
message: { ...message, fee },
|
|
270
|
+
wallet,
|
|
271
|
+
});
|
|
263
272
|
logger.info('🚀 Sending message to', tokenReceiver && tokenReceiver !== '11111111111111111111111111111111'
|
|
264
273
|
? tokenReceiver
|
|
265
274
|
: receiver, '@', destNetwork.name, ', tx =>', request.tx.hash, ', messageId =>', request.message.messageId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send.js","sourceRoot":"","sources":["../../src/commands/send.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"send.js","sourceRoot":"","sources":["../../src/commands/send.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"show.d.ts","sourceRoot":"","sources":["../../src/commands/show.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"show.d.ts","sourceRoot":"","sources":["../../src/commands/show.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEjC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,EAAE,KAAK,GAAG,EAAU,MAAM,YAAY,CAAA;AAa7C,eAAO,MAAM,OAAO,UAAoC,CAAA;AACxD,eAAO,MAAM,QAAQ,mCAAmC,CAAA;AAExD;;;;GAIG;AACH,eAAO,MAAM,OAAO,GAAI,OAAO,IAAI;;;;;;;;;;;;;;;GAuB7B,CAAA;AAEN;;;GAGG;AACH,wBAAsB,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,UAAU,iBAQ3F;AAED;;GAEG;AACH,wBAAsB,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC,iBAwJ/E"}
|