@aztec/cli 6.0.0-nightly.20260602 → 6.0.0-nightly.20260604
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/dest/cmds/infrastructure/setup_l2_contract.d.ts +1 -1
- package/dest/cmds/infrastructure/setup_l2_contract.d.ts.map +1 -1
- package/dest/cmds/infrastructure/setup_l2_contract.js +5 -1
- package/dest/utils/inspect.js +5 -6
- package/package.json +30 -30
- package/src/cmds/infrastructure/setup_l2_contract.ts +4 -0
- package/src/utils/inspect.ts +3 -3
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { LogFn } from '@aztec/foundation/log';
|
|
2
2
|
export declare function setupL2Contracts(nodeUrl: string, testAccounts: boolean, json: boolean, log: LogFn): Promise<void>;
|
|
3
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBfbDJfY29udHJhY3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbWRzL2luZnJhc3RydWN0dXJlL3NldHVwX2wyX2NvbnRyYWN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU9BLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBS25ELHdCQUFzQixnQkFBZ0IsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLFlBQVksRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsS0FBSyxpQkEyQnZHIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup_l2_contract.d.ts","sourceRoot":"","sources":["../../../src/cmds/infrastructure/setup_l2_contract.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setup_l2_contract.d.ts","sourceRoot":"","sources":["../../../src/cmds/infrastructure/setup_l2_contract.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAKnD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,iBA2BvG"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { getInitialTestAccountsData } from '@aztec/accounts/testing';
|
|
2
2
|
import { createAztecNodeClient } from '@aztec/aztec.js/node';
|
|
3
|
+
import { TxStatus } from '@aztec/aztec.js/tx';
|
|
3
4
|
import { jsonStringify } from '@aztec/foundation/json-rpc';
|
|
4
5
|
import { ProtocolContractAddress } from '@aztec/protocol-contracts';
|
|
5
6
|
import { EmbeddedWallet } from '@aztec/wallets/embedded';
|
|
@@ -7,7 +8,10 @@ import { deployFundedSchnorrAccounts } from '@aztec/wallets/testing';
|
|
|
7
8
|
export async function setupL2Contracts(nodeUrl, testAccounts, json, log) {
|
|
8
9
|
const waitOpts = {
|
|
9
10
|
timeout: 180,
|
|
10
|
-
interval: 1
|
|
11
|
+
interval: 1,
|
|
12
|
+
// The embedded wallet defaults to PROPOSED, which can be dropped if its proposed block is pruned
|
|
13
|
+
// before the checkpoint lands. Wait for the checkpoint so serial setup is reliable.
|
|
14
|
+
waitForStatus: TxStatus.CHECKPOINTED
|
|
11
15
|
};
|
|
12
16
|
log('setupL2Contracts: Wait options' + jsonStringify(waitOpts));
|
|
13
17
|
log('setupL2Contracts: Creating PXE client...');
|
package/dest/utils/inspect.js
CHANGED
|
@@ -25,10 +25,9 @@ export async function inspectBlock(aztecNode, blockNumber, log, opts = {}) {
|
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
27
|
export async function inspectTx(aztecNode, txHash, log, opts = {}) {
|
|
28
|
-
const
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
]);
|
|
28
|
+
const receipt = await aztecNode.getTxReceipt(txHash, {
|
|
29
|
+
includeTxEffect: true
|
|
30
|
+
});
|
|
32
31
|
// Base tx data
|
|
33
32
|
log(`Tx ${txHash.toString()}`);
|
|
34
33
|
log(` Status: ${receipt.status}`);
|
|
@@ -38,10 +37,10 @@ export async function inspectTx(aztecNode, txHash, log, opts = {}) {
|
|
|
38
37
|
if (receipt.error) {
|
|
39
38
|
log(` Error: ${receipt.error}`);
|
|
40
39
|
}
|
|
41
|
-
if (!
|
|
40
|
+
if (!receipt.isMined() || !receipt.txEffect) {
|
|
42
41
|
return;
|
|
43
42
|
}
|
|
44
|
-
const effects =
|
|
43
|
+
const effects = receipt.txEffect;
|
|
45
44
|
if (opts.includeBlockInfo) {
|
|
46
45
|
log(` Block: ${receipt.blockNumber} (${receipt.blockHash?.toString()})`);
|
|
47
46
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/cli",
|
|
3
|
-
"version": "6.0.0-nightly.
|
|
3
|
+
"version": "6.0.0-nightly.20260604",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
"./contracts": "./dest/cmds/contracts/index.js",
|
|
@@ -77,23 +77,23 @@
|
|
|
77
77
|
]
|
|
78
78
|
},
|
|
79
79
|
"dependencies": {
|
|
80
|
-
"@aztec/accounts": "6.0.0-nightly.
|
|
81
|
-
"@aztec/archiver": "6.0.0-nightly.
|
|
82
|
-
"@aztec/aztec.js": "6.0.0-nightly.
|
|
83
|
-
"@aztec/constants": "6.0.0-nightly.
|
|
84
|
-
"@aztec/entrypoints": "6.0.0-nightly.
|
|
85
|
-
"@aztec/ethereum": "6.0.0-nightly.
|
|
86
|
-
"@aztec/foundation": "6.0.0-nightly.
|
|
87
|
-
"@aztec/l1-artifacts": "6.0.0-nightly.
|
|
88
|
-
"@aztec/node-keystore": "6.0.0-nightly.
|
|
89
|
-
"@aztec/node-lib": "6.0.0-nightly.
|
|
90
|
-
"@aztec/p2p": "6.0.0-nightly.
|
|
91
|
-
"@aztec/protocol-contracts": "6.0.0-nightly.
|
|
92
|
-
"@aztec/sequencer-client": "6.0.0-nightly.
|
|
93
|
-
"@aztec/slasher": "6.0.0-nightly.
|
|
94
|
-
"@aztec/stdlib": "6.0.0-nightly.
|
|
95
|
-
"@aztec/wallets": "6.0.0-nightly.
|
|
96
|
-
"@aztec/world-state": "6.0.0-nightly.
|
|
80
|
+
"@aztec/accounts": "6.0.0-nightly.20260604",
|
|
81
|
+
"@aztec/archiver": "6.0.0-nightly.20260604",
|
|
82
|
+
"@aztec/aztec.js": "6.0.0-nightly.20260604",
|
|
83
|
+
"@aztec/constants": "6.0.0-nightly.20260604",
|
|
84
|
+
"@aztec/entrypoints": "6.0.0-nightly.20260604",
|
|
85
|
+
"@aztec/ethereum": "6.0.0-nightly.20260604",
|
|
86
|
+
"@aztec/foundation": "6.0.0-nightly.20260604",
|
|
87
|
+
"@aztec/l1-artifacts": "6.0.0-nightly.20260604",
|
|
88
|
+
"@aztec/node-keystore": "6.0.0-nightly.20260604",
|
|
89
|
+
"@aztec/node-lib": "6.0.0-nightly.20260604",
|
|
90
|
+
"@aztec/p2p": "6.0.0-nightly.20260604",
|
|
91
|
+
"@aztec/protocol-contracts": "6.0.0-nightly.20260604",
|
|
92
|
+
"@aztec/sequencer-client": "6.0.0-nightly.20260604",
|
|
93
|
+
"@aztec/slasher": "6.0.0-nightly.20260604",
|
|
94
|
+
"@aztec/stdlib": "6.0.0-nightly.20260604",
|
|
95
|
+
"@aztec/wallets": "6.0.0-nightly.20260604",
|
|
96
|
+
"@aztec/world-state": "6.0.0-nightly.20260604",
|
|
97
97
|
"@ethersproject/wallet": "^5.8.0",
|
|
98
98
|
"@iarna/toml": "^2.2.5",
|
|
99
99
|
"@libp2p/peer-id-factory": "^3.0.4",
|
|
@@ -107,9 +107,9 @@
|
|
|
107
107
|
"viem": "npm:@aztec/viem@2.38.2"
|
|
108
108
|
},
|
|
109
109
|
"devDependencies": {
|
|
110
|
-
"@aztec/aztec-node": "6.0.0-nightly.
|
|
111
|
-
"@aztec/kv-store": "6.0.0-nightly.
|
|
112
|
-
"@aztec/telemetry-client": "6.0.0-nightly.
|
|
110
|
+
"@aztec/aztec-node": "6.0.0-nightly.20260604",
|
|
111
|
+
"@aztec/kv-store": "6.0.0-nightly.20260604",
|
|
112
|
+
"@aztec/telemetry-client": "6.0.0-nightly.20260604",
|
|
113
113
|
"@jest/globals": "^30.0.0",
|
|
114
114
|
"@types/jest": "^30.0.0",
|
|
115
115
|
"@types/lodash.chunk": "^4.2.9",
|
|
@@ -126,15 +126,15 @@
|
|
|
126
126
|
"typescript": "^5.3.3"
|
|
127
127
|
},
|
|
128
128
|
"peerDependencies": {
|
|
129
|
-
"@aztec/accounts": "6.0.0-nightly.
|
|
130
|
-
"@aztec/bb-prover": "6.0.0-nightly.
|
|
131
|
-
"@aztec/ethereum": "6.0.0-nightly.
|
|
132
|
-
"@aztec/l1-artifacts": "6.0.0-nightly.
|
|
133
|
-
"@aztec/noir-contracts.js": "6.0.0-nightly.
|
|
134
|
-
"@aztec/noir-protocol-circuits-types": "6.0.0-nightly.
|
|
135
|
-
"@aztec/noir-test-contracts.js": "6.0.0-nightly.
|
|
136
|
-
"@aztec/protocol-contracts": "6.0.0-nightly.
|
|
137
|
-
"@aztec/stdlib": "6.0.0-nightly.
|
|
129
|
+
"@aztec/accounts": "6.0.0-nightly.20260604",
|
|
130
|
+
"@aztec/bb-prover": "6.0.0-nightly.20260604",
|
|
131
|
+
"@aztec/ethereum": "6.0.0-nightly.20260604",
|
|
132
|
+
"@aztec/l1-artifacts": "6.0.0-nightly.20260604",
|
|
133
|
+
"@aztec/noir-contracts.js": "6.0.0-nightly.20260604",
|
|
134
|
+
"@aztec/noir-protocol-circuits-types": "6.0.0-nightly.20260604",
|
|
135
|
+
"@aztec/noir-test-contracts.js": "6.0.0-nightly.20260604",
|
|
136
|
+
"@aztec/protocol-contracts": "6.0.0-nightly.20260604",
|
|
137
|
+
"@aztec/stdlib": "6.0.0-nightly.20260604"
|
|
138
138
|
},
|
|
139
139
|
"files": [
|
|
140
140
|
"dest",
|
|
@@ -2,6 +2,7 @@ import { getInitialTestAccountsData } from '@aztec/accounts/testing';
|
|
|
2
2
|
import { AztecAddress } from '@aztec/aztec.js/addresses';
|
|
3
3
|
import type { WaitOpts } from '@aztec/aztec.js/contracts';
|
|
4
4
|
import { createAztecNodeClient } from '@aztec/aztec.js/node';
|
|
5
|
+
import { TxStatus } from '@aztec/aztec.js/tx';
|
|
5
6
|
import { AccountManager } from '@aztec/aztec.js/wallet';
|
|
6
7
|
import { jsonStringify } from '@aztec/foundation/json-rpc';
|
|
7
8
|
import type { LogFn } from '@aztec/foundation/log';
|
|
@@ -13,6 +14,9 @@ export async function setupL2Contracts(nodeUrl: string, testAccounts: boolean, j
|
|
|
13
14
|
const waitOpts: WaitOpts = {
|
|
14
15
|
timeout: 180,
|
|
15
16
|
interval: 1,
|
|
17
|
+
// The embedded wallet defaults to PROPOSED, which can be dropped if its proposed block is pruned
|
|
18
|
+
// before the checkpoint lands. Wait for the checkpoint so serial setup is reliable.
|
|
19
|
+
waitForStatus: TxStatus.CHECKPOINTED,
|
|
16
20
|
};
|
|
17
21
|
log('setupL2Contracts: Wait options' + jsonStringify(waitOpts));
|
|
18
22
|
log('setupL2Contracts: Creating PXE client...');
|
package/src/utils/inspect.ts
CHANGED
|
@@ -40,7 +40,7 @@ export async function inspectTx(
|
|
|
40
40
|
log: LogFn,
|
|
41
41
|
opts: { includeBlockInfo?: boolean } = {},
|
|
42
42
|
) {
|
|
43
|
-
const
|
|
43
|
+
const receipt = await aztecNode.getTxReceipt(txHash, { includeTxEffect: true });
|
|
44
44
|
// Base tx data
|
|
45
45
|
log(`Tx ${txHash.toString()}`);
|
|
46
46
|
log(` Status: ${receipt.status}`);
|
|
@@ -51,11 +51,11 @@ export async function inspectTx(
|
|
|
51
51
|
log(` Error: ${receipt.error}`);
|
|
52
52
|
}
|
|
53
53
|
|
|
54
|
-
if (!
|
|
54
|
+
if (!receipt.isMined() || !receipt.txEffect) {
|
|
55
55
|
return;
|
|
56
56
|
}
|
|
57
57
|
|
|
58
|
-
const effects =
|
|
58
|
+
const effects = receipt.txEffect;
|
|
59
59
|
|
|
60
60
|
if (opts.includeBlockInfo) {
|
|
61
61
|
log(` Block: ${receipt.blockNumber} (${receipt.blockHash?.toString()})`);
|