@aztec/cli 0.0.1-commit.d1f2d6c → 0.0.1-commit.d431d1c
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.js +1 -1
- package/dest/cmds/l1/assume_proven_through.d.ts +2 -3
- package/dest/cmds/l1/assume_proven_through.d.ts.map +1 -1
- package/dest/cmds/l1/assume_proven_through.js +5 -3
- package/dest/cmds/l1/index.d.ts +1 -1
- package/dest/cmds/l1/index.d.ts.map +1 -1
- package/dest/cmds/l1/index.js +2 -3
- package/dest/config/generated/networks.d.ts +1 -4
- package/dest/config/generated/networks.d.ts.map +1 -1
- package/dest/config/generated/networks.js +0 -3
- package/dest/utils/inspect.d.ts +1 -1
- package/dest/utils/inspect.d.ts.map +1 -1
- package/dest/utils/inspect.js +1 -4
- package/package.json +30 -30
- package/src/cmds/infrastructure/setup_l2_contract.ts +1 -1
- package/src/cmds/l1/assume_proven_through.ts +7 -4
- package/src/cmds/l1/index.ts +4 -5
- package/src/config/generated/networks.ts +0 -3
- package/src/utils/inspect.ts +1 -4
|
@@ -16,7 +16,7 @@ export async function setupL2Contracts(nodeUrl, testAccounts, json, log) {
|
|
|
16
16
|
if (testAccounts) {
|
|
17
17
|
log('setupL2Contracts: Deploying test accounts...');
|
|
18
18
|
const initialAccountsData = await getInitialTestAccountsData();
|
|
19
|
-
deployedAccountManagers = await deployFundedSchnorrAccounts(wallet, initialAccountsData, waitOpts);
|
|
19
|
+
deployedAccountManagers = await deployFundedSchnorrAccounts(wallet, node, initialAccountsData, waitOpts);
|
|
20
20
|
}
|
|
21
21
|
if (json) {
|
|
22
22
|
const toPrint = {
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { CheckpointNumber } from '@aztec/foundation/branded-types';
|
|
2
1
|
import type { LogFn } from '@aztec/foundation/log';
|
|
3
|
-
export declare function assumeProvenThrough(
|
|
4
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
2
|
+
export declare function assumeProvenThrough(blockNumberOrLatest: number | undefined, l1RpcUrls: string[], nodeUrl: string, log: LogFn): Promise<void>;
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXNzdW1lX3Byb3Zlbl90aHJvdWdoLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY21kcy9sMS9hc3N1bWVfcHJvdmVuX3Rocm91Z2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHbkQsd0JBQXNCLG1CQUFtQixDQUN2QyxtQkFBbUIsRUFBRSxNQUFNLEdBQUcsU0FBUyxFQUN2QyxTQUFTLEVBQUUsTUFBTSxFQUFFLEVBQ25CLE9BQU8sRUFBRSxNQUFNLEVBQ2YsR0FBRyxFQUFFLEtBQUssaUJBWVgifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assume_proven_through.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/assume_proven_through.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"assume_proven_through.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/assume_proven_through.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,wBAAsB,mBAAmB,CACvC,mBAAmB,EAAE,MAAM,GAAG,SAAS,EACvC,SAAS,EAAE,MAAM,EAAE,EACnB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,KAAK,iBAYX"}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { createAztecNodeClient } from '@aztec/aztec.js/node';
|
|
2
2
|
import { RollupCheatCodes } from '@aztec/ethereum/test';
|
|
3
|
+
import { BlockNumber } from '@aztec/foundation/branded-types';
|
|
3
4
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
4
|
-
export async function assumeProvenThrough(
|
|
5
|
+
export async function assumeProvenThrough(blockNumberOrLatest, l1RpcUrls, nodeUrl, log) {
|
|
5
6
|
const aztecNode = createAztecNodeClient(nodeUrl);
|
|
6
7
|
const rollupAddress = await aztecNode.getNodeInfo().then((i)=>i.l1ContractAddresses.rollupAddress);
|
|
8
|
+
const blockNumber = blockNumberOrLatest ? BlockNumber(blockNumberOrLatest) : await aztecNode.getBlockNumber();
|
|
7
9
|
const rollupCheatCodes = RollupCheatCodes.create(l1RpcUrls, {
|
|
8
10
|
rollupAddress
|
|
9
11
|
}, new DateProvider());
|
|
10
|
-
await rollupCheatCodes.markAsProven(
|
|
11
|
-
log(`Assumed proven through
|
|
12
|
+
await rollupCheatCodes.markAsProven(blockNumber);
|
|
13
|
+
log(`Assumed proven through block ${blockNumber}`);
|
|
12
14
|
}
|
package/dest/cmds/l1/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { LogFn, Logger } from '@aztec/foundation/log';
|
|
2
2
|
import { type Command } from 'commander';
|
|
3
3
|
export declare function injectCommands(program: Command, log: LogFn, debugLogger: Logger): Command;
|
|
4
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
4
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbWRzL2wxL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUUzRCxPQUFPLEVBQUUsS0FBSyxPQUFPLEVBQVUsTUFBTSxXQUFXLENBQUM7QUF3QmpELHdCQUFnQixjQUFjLENBQUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLFdBNmUvRSJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAwBjD,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WA6e/E"}
|
package/dest/cmds/l1/index.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { CheckpointNumber } from '@aztec/foundation/branded-types';
|
|
2
1
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
2
|
import { Option } from 'commander';
|
|
4
3
|
import { ETHEREUM_HOSTS, MNEMONIC, PRIVATE_KEY, l1ChainIdOption, nodeOption, parseAztecAddress, parseBigint, parseEthereumAddress } from '../../utils/commands.js';
|
|
@@ -189,9 +188,9 @@ export function injectCommands(program, log, debugLogger) {
|
|
|
189
188
|
});
|
|
190
189
|
program.command('set-proven-through', {
|
|
191
190
|
hidden: true
|
|
192
|
-
}).description('Instructs the L1 rollup contract to assume all blocks until the given
|
|
191
|
+
}).description('Instructs the L1 rollup contract to assume all blocks until the given number are automatically proven.').argument('[blockNumber]', 'The target block number, defaults to the latest pending block number.', parseBigint).addOption(l1RpcUrlsOption).addOption(nodeOption).action(async (blockNumber, options)=>{
|
|
193
192
|
const { assumeProvenThrough } = await import('./assume_proven_through.js');
|
|
194
|
-
await assumeProvenThrough(
|
|
193
|
+
await assumeProvenThrough(blockNumber, options.l1RpcUrls, options.nodeUrl, log);
|
|
195
194
|
});
|
|
196
195
|
program.command('advance-epoch').description('Use L1 cheat codes to warp time until the next epoch.').addOption(l1RpcUrlsOption).addOption(nodeOption).action(async (options)=>{
|
|
197
196
|
const { advanceEpoch } = await import('./advance_epoch.js');
|
|
@@ -10,7 +10,6 @@ export declare const devnetConfig: {
|
|
|
10
10
|
readonly AZTEC_PROOF_SUBMISSION_EPOCHS: 1;
|
|
11
11
|
readonly AZTEC_MANA_TARGET: 100000000;
|
|
12
12
|
readonly AZTEC_PROVING_COST_PER_MANA: 100;
|
|
13
|
-
readonly AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000;
|
|
14
13
|
readonly AZTEC_SLASHER_FLAVOR: "tally";
|
|
15
14
|
readonly AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4;
|
|
16
15
|
readonly AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5;
|
|
@@ -79,7 +78,6 @@ export declare const testnetConfig: {
|
|
|
79
78
|
readonly AZTEC_INBOX_LAG: 1;
|
|
80
79
|
readonly AZTEC_PROOF_SUBMISSION_EPOCHS: 1;
|
|
81
80
|
readonly AZTEC_PROVING_COST_PER_MANA: 100;
|
|
82
|
-
readonly AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000;
|
|
83
81
|
readonly AZTEC_SLASHER_FLAVOR: "tally";
|
|
84
82
|
readonly AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4;
|
|
85
83
|
readonly AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5;
|
|
@@ -139,7 +137,6 @@ export declare const mainnetConfig: {
|
|
|
139
137
|
readonly AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2;
|
|
140
138
|
readonly AZTEC_INBOX_LAG: 1;
|
|
141
139
|
readonly AZTEC_PROOF_SUBMISSION_EPOCHS: 1;
|
|
142
|
-
readonly AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000;
|
|
143
140
|
readonly AZTEC_SLASHER_FLAVOR: "tally";
|
|
144
141
|
readonly AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4;
|
|
145
142
|
readonly AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2;
|
|
@@ -202,4 +199,4 @@ export declare const mainnetConfig: {
|
|
|
202
199
|
readonly SLASH_INVALID_BLOCK_PENALTY: 2e+21;
|
|
203
200
|
readonly SLASH_GRACE_PERIOD_L2_SLOTS: 1200;
|
|
204
201
|
};
|
|
205
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
202
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV0d29ya3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb25maWcvZ2VuZXJhdGVkL25ldHdvcmtzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLGVBQU8sTUFBTSxZQUFZOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Q0FxRWYsQ0FBQztBQUVYLGVBQU8sTUFBTSxhQUFhOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0NBNkRoQixDQUFDO0FBRVgsZUFBTyxNQUFNLGFBQWE7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0NBb0VoQixDQUFDIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"networks.d.ts","sourceRoot":"","sources":["../../../src/config/generated/networks.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,YAAY
|
|
1
|
+
{"version":3,"file":"networks.d.ts","sourceRoot":"","sources":["../../../src/config/generated/networks.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqEf,CAAC;AAEX,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6DhB,CAAC;AAEX,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoEhB,CAAC"}
|
|
@@ -12,7 +12,6 @@ export const devnetConfig = {
|
|
|
12
12
|
AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
|
|
13
13
|
AZTEC_MANA_TARGET: 100000000,
|
|
14
14
|
AZTEC_PROVING_COST_PER_MANA: 100,
|
|
15
|
-
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
16
15
|
AZTEC_SLASHER_FLAVOR: 'tally',
|
|
17
16
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
18
17
|
AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
|
|
@@ -81,7 +80,6 @@ export const testnetConfig = {
|
|
|
81
80
|
AZTEC_INBOX_LAG: 1,
|
|
82
81
|
AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
|
|
83
82
|
AZTEC_PROVING_COST_PER_MANA: 100,
|
|
84
|
-
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
85
83
|
AZTEC_SLASHER_FLAVOR: 'tally',
|
|
86
84
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
87
85
|
AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
|
|
@@ -141,7 +139,6 @@ export const mainnetConfig = {
|
|
|
141
139
|
AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2,
|
|
142
140
|
AZTEC_INBOX_LAG: 1,
|
|
143
141
|
AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
|
|
144
|
-
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
145
142
|
AZTEC_SLASHER_FLAVOR: 'tally',
|
|
146
143
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
147
144
|
AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
|
package/dest/utils/inspect.d.ts
CHANGED
|
@@ -8,4 +8,4 @@ export declare function inspectBlock(aztecNode: AztecNode, blockNumber: BlockNum
|
|
|
8
8
|
export declare function inspectTx(aztecNode: AztecNode, txHash: TxHash, log: LogFn, opts?: {
|
|
9
9
|
includeBlockInfo?: boolean;
|
|
10
10
|
}): Promise<void>;
|
|
11
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
11
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zcGVjdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2luc3BlY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRS9DLHdCQUFzQixZQUFZLENBQ2hDLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLFdBQVcsRUFBRSxXQUFXLEVBQ3hCLEdBQUcsRUFBRSxLQUFLLEVBQ1YsSUFBSSxHQUFFO0lBQUUsT0FBTyxDQUFDLEVBQUUsT0FBTyxDQUFBO0NBQU8saUJBMEJqQztBQUVELHdCQUFzQixTQUFTLENBQzdCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLE1BQU0sRUFBRSxNQUFNLEVBQ2QsR0FBRyxFQUFFLEtBQUssRUFDVixJQUFJLEdBQUU7SUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQTtDQUFPLGlCQW1FMUMifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspect.d.ts","sourceRoot":"","sources":["../../src/utils/inspect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,wBAAsB,YAAY,CAChC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,EACxB,GAAG,EAAE,KAAK,EACV,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO,iBA0BjC;AAED,wBAAsB,SAAS,CAC7B,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,KAAK,EACV,IAAI,GAAE;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAO,
|
|
1
|
+
{"version":3,"file":"inspect.d.ts","sourceRoot":"","sources":["../../src/utils/inspect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,wBAAsB,YAAY,CAChC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,EACxB,GAAG,EAAE,KAAK,EACV,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO,iBA0BjC;AAED,wBAAsB,SAAS,CAC7B,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,KAAK,EACV,IAAI,GAAE;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAO,iBAmE1C"}
|
package/dest/utils/inspect.js
CHANGED
|
@@ -30,10 +30,7 @@ export async function inspectTx(aztecNode, txHash, log, opts = {}) {
|
|
|
30
30
|
]);
|
|
31
31
|
// Base tx data
|
|
32
32
|
log(`Tx ${txHash.toString()}`);
|
|
33
|
-
log(` Status: ${receipt.status}`);
|
|
34
|
-
if (receipt.executionResult) {
|
|
35
|
-
log(` Execution result: ${receipt.executionResult}`);
|
|
36
|
-
}
|
|
33
|
+
log(` Status: ${receipt.status} ${effectsInBlock ? `(${effectsInBlock.data.revertCode.getDescription()})` : ''}`);
|
|
37
34
|
if (receipt.error) {
|
|
38
35
|
log(` Error: ${receipt.error}`);
|
|
39
36
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/cli",
|
|
3
|
-
"version": "0.0.1-commit.
|
|
3
|
+
"version": "0.0.1-commit.d431d1c",
|
|
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": "0.0.1-commit.
|
|
81
|
-
"@aztec/archiver": "0.0.1-commit.
|
|
82
|
-
"@aztec/aztec.js": "0.0.1-commit.
|
|
83
|
-
"@aztec/constants": "0.0.1-commit.
|
|
84
|
-
"@aztec/entrypoints": "0.0.1-commit.
|
|
85
|
-
"@aztec/ethereum": "0.0.1-commit.
|
|
86
|
-
"@aztec/foundation": "0.0.1-commit.
|
|
87
|
-
"@aztec/l1-artifacts": "0.0.1-commit.
|
|
88
|
-
"@aztec/node-keystore": "0.0.1-commit.
|
|
89
|
-
"@aztec/node-lib": "0.0.1-commit.
|
|
90
|
-
"@aztec/p2p": "0.0.1-commit.
|
|
91
|
-
"@aztec/protocol-contracts": "0.0.1-commit.
|
|
92
|
-
"@aztec/sequencer-client": "0.0.1-commit.
|
|
93
|
-
"@aztec/slasher": "0.0.1-commit.
|
|
94
|
-
"@aztec/stdlib": "0.0.1-commit.
|
|
95
|
-
"@aztec/test-wallet": "0.0.1-commit.
|
|
96
|
-
"@aztec/world-state": "0.0.1-commit.
|
|
80
|
+
"@aztec/accounts": "0.0.1-commit.d431d1c",
|
|
81
|
+
"@aztec/archiver": "0.0.1-commit.d431d1c",
|
|
82
|
+
"@aztec/aztec.js": "0.0.1-commit.d431d1c",
|
|
83
|
+
"@aztec/constants": "0.0.1-commit.d431d1c",
|
|
84
|
+
"@aztec/entrypoints": "0.0.1-commit.d431d1c",
|
|
85
|
+
"@aztec/ethereum": "0.0.1-commit.d431d1c",
|
|
86
|
+
"@aztec/foundation": "0.0.1-commit.d431d1c",
|
|
87
|
+
"@aztec/l1-artifacts": "0.0.1-commit.d431d1c",
|
|
88
|
+
"@aztec/node-keystore": "0.0.1-commit.d431d1c",
|
|
89
|
+
"@aztec/node-lib": "0.0.1-commit.d431d1c",
|
|
90
|
+
"@aztec/p2p": "0.0.1-commit.d431d1c",
|
|
91
|
+
"@aztec/protocol-contracts": "0.0.1-commit.d431d1c",
|
|
92
|
+
"@aztec/sequencer-client": "0.0.1-commit.d431d1c",
|
|
93
|
+
"@aztec/slasher": "0.0.1-commit.d431d1c",
|
|
94
|
+
"@aztec/stdlib": "0.0.1-commit.d431d1c",
|
|
95
|
+
"@aztec/test-wallet": "0.0.1-commit.d431d1c",
|
|
96
|
+
"@aztec/world-state": "0.0.1-commit.d431d1c",
|
|
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": "0.0.1-commit.
|
|
111
|
-
"@aztec/kv-store": "0.0.1-commit.
|
|
112
|
-
"@aztec/telemetry-client": "0.0.1-commit.
|
|
110
|
+
"@aztec/aztec-node": "0.0.1-commit.d431d1c",
|
|
111
|
+
"@aztec/kv-store": "0.0.1-commit.d431d1c",
|
|
112
|
+
"@aztec/telemetry-client": "0.0.1-commit.d431d1c",
|
|
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": "0.0.1-commit.
|
|
130
|
-
"@aztec/bb-prover": "0.0.1-commit.
|
|
131
|
-
"@aztec/ethereum": "0.0.1-commit.
|
|
132
|
-
"@aztec/l1-artifacts": "0.0.1-commit.
|
|
133
|
-
"@aztec/noir-contracts.js": "0.0.1-commit.
|
|
134
|
-
"@aztec/noir-protocol-circuits-types": "0.0.1-commit.
|
|
135
|
-
"@aztec/noir-test-contracts.js": "0.0.1-commit.
|
|
136
|
-
"@aztec/protocol-contracts": "0.0.1-commit.
|
|
137
|
-
"@aztec/stdlib": "0.0.1-commit.
|
|
129
|
+
"@aztec/accounts": "0.0.1-commit.d431d1c",
|
|
130
|
+
"@aztec/bb-prover": "0.0.1-commit.d431d1c",
|
|
131
|
+
"@aztec/ethereum": "0.0.1-commit.d431d1c",
|
|
132
|
+
"@aztec/l1-artifacts": "0.0.1-commit.d431d1c",
|
|
133
|
+
"@aztec/noir-contracts.js": "0.0.1-commit.d431d1c",
|
|
134
|
+
"@aztec/noir-protocol-circuits-types": "0.0.1-commit.d431d1c",
|
|
135
|
+
"@aztec/noir-test-contracts.js": "0.0.1-commit.d431d1c",
|
|
136
|
+
"@aztec/protocol-contracts": "0.0.1-commit.d431d1c",
|
|
137
|
+
"@aztec/stdlib": "0.0.1-commit.d431d1c"
|
|
138
138
|
},
|
|
139
139
|
"files": [
|
|
140
140
|
"dest",
|
|
@@ -22,7 +22,7 @@ export async function setupL2Contracts(nodeUrl: string, testAccounts: boolean, j
|
|
|
22
22
|
if (testAccounts) {
|
|
23
23
|
log('setupL2Contracts: Deploying test accounts...');
|
|
24
24
|
const initialAccountsData = await getInitialTestAccountsData();
|
|
25
|
-
deployedAccountManagers = await deployFundedSchnorrAccounts(wallet, initialAccountsData, waitOpts);
|
|
25
|
+
deployedAccountManagers = await deployFundedSchnorrAccounts(wallet, node, initialAccountsData, waitOpts);
|
|
26
26
|
}
|
|
27
27
|
|
|
28
28
|
if (json) {
|
|
@@ -1,20 +1,23 @@
|
|
|
1
1
|
import { createAztecNodeClient } from '@aztec/aztec.js/node';
|
|
2
2
|
import { RollupCheatCodes } from '@aztec/ethereum/test';
|
|
3
|
-
import {
|
|
3
|
+
import { BlockNumber } from '@aztec/foundation/branded-types';
|
|
4
4
|
import type { LogFn } from '@aztec/foundation/log';
|
|
5
5
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
6
6
|
|
|
7
7
|
export async function assumeProvenThrough(
|
|
8
|
-
|
|
8
|
+
blockNumberOrLatest: number | undefined,
|
|
9
9
|
l1RpcUrls: string[],
|
|
10
10
|
nodeUrl: string,
|
|
11
11
|
log: LogFn,
|
|
12
12
|
) {
|
|
13
13
|
const aztecNode = createAztecNodeClient(nodeUrl);
|
|
14
14
|
const rollupAddress = await aztecNode.getNodeInfo().then(i => i.l1ContractAddresses.rollupAddress);
|
|
15
|
+
const blockNumber: BlockNumber = blockNumberOrLatest
|
|
16
|
+
? BlockNumber(blockNumberOrLatest)
|
|
17
|
+
: await aztecNode.getBlockNumber();
|
|
15
18
|
|
|
16
19
|
const rollupCheatCodes = RollupCheatCodes.create(l1RpcUrls, { rollupAddress }, new DateProvider());
|
|
17
20
|
|
|
18
|
-
await rollupCheatCodes.markAsProven(
|
|
19
|
-
log(`Assumed proven through
|
|
21
|
+
await rollupCheatCodes.markAsProven(blockNumber);
|
|
22
|
+
log(`Assumed proven through block ${blockNumber}`);
|
|
20
23
|
}
|
package/src/cmds/l1/index.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { CheckpointNumber } from '@aztec/foundation/branded-types';
|
|
2
1
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
2
|
import type { LogFn, Logger } from '@aztec/foundation/log';
|
|
4
3
|
|
|
@@ -498,14 +497,14 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
|
|
|
498
497
|
program
|
|
499
498
|
.command('set-proven-through', { hidden: true })
|
|
500
499
|
.description(
|
|
501
|
-
'Instructs the L1 rollup contract to assume all blocks until the given
|
|
500
|
+
'Instructs the L1 rollup contract to assume all blocks until the given number are automatically proven.',
|
|
502
501
|
)
|
|
503
|
-
.argument('[
|
|
502
|
+
.argument('[blockNumber]', 'The target block number, defaults to the latest pending block number.', parseBigint)
|
|
504
503
|
.addOption(l1RpcUrlsOption)
|
|
505
504
|
.addOption(nodeOption)
|
|
506
|
-
.action(async (
|
|
505
|
+
.action(async (blockNumber, options) => {
|
|
507
506
|
const { assumeProvenThrough } = await import('./assume_proven_through.js');
|
|
508
|
-
await assumeProvenThrough(
|
|
507
|
+
await assumeProvenThrough(blockNumber, options.l1RpcUrls, options.nodeUrl, log);
|
|
509
508
|
});
|
|
510
509
|
|
|
511
510
|
program
|
|
@@ -13,7 +13,6 @@ export const devnetConfig = {
|
|
|
13
13
|
AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
|
|
14
14
|
AZTEC_MANA_TARGET: 100000000,
|
|
15
15
|
AZTEC_PROVING_COST_PER_MANA: 100,
|
|
16
|
-
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
17
16
|
AZTEC_SLASHER_FLAVOR: 'tally',
|
|
18
17
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
19
18
|
AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
|
|
@@ -83,7 +82,6 @@ export const testnetConfig = {
|
|
|
83
82
|
AZTEC_INBOX_LAG: 1,
|
|
84
83
|
AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
|
|
85
84
|
AZTEC_PROVING_COST_PER_MANA: 100,
|
|
86
|
-
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
87
85
|
AZTEC_SLASHER_FLAVOR: 'tally',
|
|
88
86
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
89
87
|
AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
|
|
@@ -144,7 +142,6 @@ export const mainnetConfig = {
|
|
|
144
142
|
AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2,
|
|
145
143
|
AZTEC_INBOX_LAG: 1,
|
|
146
144
|
AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
|
|
147
|
-
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
148
145
|
AZTEC_SLASHER_FLAVOR: 'tally',
|
|
149
146
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
150
147
|
AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
|
package/src/utils/inspect.ts
CHANGED
|
@@ -44,10 +44,7 @@ export async function inspectTx(
|
|
|
44
44
|
const [receipt, effectsInBlock] = await Promise.all([aztecNode.getTxReceipt(txHash), aztecNode.getTxEffect(txHash)]);
|
|
45
45
|
// Base tx data
|
|
46
46
|
log(`Tx ${txHash.toString()}`);
|
|
47
|
-
log(` Status: ${receipt.status}`);
|
|
48
|
-
if (receipt.executionResult) {
|
|
49
|
-
log(` Execution result: ${receipt.executionResult}`);
|
|
50
|
-
}
|
|
47
|
+
log(` Status: ${receipt.status} ${effectsInBlock ? `(${effectsInBlock.data.revertCode.getDescription()})` : ''}`);
|
|
51
48
|
if (receipt.error) {
|
|
52
49
|
log(` Error: ${receipt.error}`);
|
|
53
50
|
}
|