@aztec/cli 5.0.0-private.20260319 → 5.0.0-rc.1
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/aztec_node/block_number.js +1 -1
- package/dest/cmds/aztec_node/get_logs.d.ts +30 -4
- package/dest/cmds/aztec_node/get_logs.d.ts.map +1 -1
- package/dest/cmds/aztec_node/get_logs.js +39 -29
- package/dest/cmds/aztec_node/get_node_info.d.ts +1 -1
- package/dest/cmds/aztec_node/get_node_info.d.ts.map +1 -1
- package/dest/cmds/aztec_node/get_node_info.js +0 -2
- package/dest/cmds/aztec_node/index.d.ts +1 -1
- package/dest/cmds/aztec_node/index.d.ts.map +1 -1
- package/dest/cmds/aztec_node/index.js +13 -3
- 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 +10 -6
- package/dest/cmds/l1/deploy_l1_contracts_cmd.d.ts +1 -1
- package/dest/cmds/l1/deploy_l1_contracts_cmd.d.ts.map +1 -1
- package/dest/cmds/l1/deploy_l1_contracts_cmd.js +0 -1
- package/dest/cmds/l1/deploy_new_rollup.d.ts +1 -1
- package/dest/cmds/l1/deploy_new_rollup.d.ts.map +1 -1
- package/dest/cmds/l1/deploy_new_rollup.js +2 -4
- package/dest/cmds/l1/update_l1_validators.d.ts +1 -1
- package/dest/cmds/l1/update_l1_validators.d.ts.map +1 -1
- package/dest/cmds/l1/update_l1_validators.js +0 -1
- package/dest/config/chain_l2_config.d.ts +7 -2
- package/dest/config/chain_l2_config.d.ts.map +1 -1
- package/dest/config/chain_l2_config.js +14 -1
- package/dest/config/generated/networks.d.ts +41 -36
- package/dest/config/generated/networks.d.ts.map +1 -1
- package/dest/config/generated/networks.js +40 -35
- package/dest/utils/aztec.d.ts +1 -2
- package/dest/utils/aztec.d.ts.map +1 -1
- package/dest/utils/aztec.js +4 -5
- package/dest/utils/commands.d.ts +14 -6
- package/dest/utils/commands.d.ts.map +1 -1
- package/dest/utils/commands.js +19 -9
- package/dest/utils/inspect.d.ts +1 -1
- package/dest/utils/inspect.d.ts.map +1 -1
- package/dest/utils/inspect.js +11 -11
- package/package.json +30 -30
- package/src/cmds/aztec_node/block_number.ts +1 -1
- package/src/cmds/aztec_node/get_logs.ts +70 -38
- package/src/cmds/aztec_node/get_node_info.ts +0 -2
- package/src/cmds/aztec_node/index.ts +13 -8
- package/src/cmds/infrastructure/setup_l2_contract.ts +9 -5
- package/src/cmds/l1/deploy_l1_contracts_cmd.ts +0 -1
- package/src/cmds/l1/deploy_new_rollup.ts +1 -3
- package/src/cmds/l1/update_l1_validators.ts +0 -1
- package/src/config/chain_l2_config.ts +14 -1
- package/src/config/generated/networks.ts +40 -35
- package/src/utils/aztec.ts +14 -20
- package/src/utils/commands.ts +22 -9
- package/src/utils/inspect.ts +7 -8
|
@@ -3,8 +3,6 @@
|
|
|
3
3
|
|
|
4
4
|
export const devnetConfig = {
|
|
5
5
|
ETHEREUM_SLOT_DURATION: 12,
|
|
6
|
-
AZTEC_SLOT_DURATION: 72,
|
|
7
|
-
AZTEC_TARGET_COMMITTEE_SIZE: 48,
|
|
8
6
|
AZTEC_ACTIVATION_THRESHOLD: 100000000000000000000,
|
|
9
7
|
AZTEC_EJECTION_THRESHOLD: 50000000000000000000,
|
|
10
8
|
AZTEC_LOCAL_EJECTION_THRESHOLD: 98000000000000000000,
|
|
@@ -14,7 +12,7 @@ export const devnetConfig = {
|
|
|
14
12
|
AZTEC_MANA_TARGET: 100000000,
|
|
15
13
|
AZTEC_PROVING_COST_PER_MANA: 100,
|
|
16
14
|
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
17
|
-
|
|
15
|
+
AZTEC_SLASHER_ENABLED: true,
|
|
18
16
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
19
17
|
AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
|
|
20
18
|
AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
|
|
@@ -24,17 +22,16 @@ export const devnetConfig = {
|
|
|
24
22
|
AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000,
|
|
25
23
|
AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000,
|
|
26
24
|
AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 300,
|
|
27
|
-
SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
|
|
28
|
-
SLASH_MAX_PENALTY_PERCENTAGE: 2,
|
|
29
25
|
SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
|
|
30
26
|
SLASH_MAX_PAYLOAD_SIZE: 80,
|
|
31
27
|
SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
|
|
28
|
+
SLASH_DATA_WITHHOLDING_TOLERANCE_SLOTS: 3,
|
|
32
29
|
P2P_ENABLED: true,
|
|
33
30
|
BOOTSTRAP_NODES: '',
|
|
34
31
|
SEQ_MIN_TX_PER_BLOCK: 1,
|
|
35
32
|
SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
|
|
36
33
|
SEQ_BLOCK_DURATION_MS: 6000,
|
|
37
|
-
|
|
34
|
+
CHECKPOINT_PROPOSAL_SYNC_GRACE_SECONDS: 12,
|
|
38
35
|
DATA_STORE_MAP_SIZE_KB: 134217728,
|
|
39
36
|
ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
|
|
40
37
|
NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
|
|
@@ -42,10 +39,15 @@ export const devnetConfig = {
|
|
|
42
39
|
PUBLIC_DATA_TREE_MAP_SIZE_KB: 1073741824,
|
|
43
40
|
PUBLIC_OTEL_INCLUDE_METRICS: 'aztec.validator,aztec.tx_collector,aztec.mempool,aztec.p2p.gossip.agg_,aztec.ivc_verifier.agg_',
|
|
44
41
|
SENTINEL_ENABLED: true,
|
|
42
|
+
AZTEC_SLOT_DURATION: 36,
|
|
45
43
|
AZTEC_EPOCH_DURATION: 8,
|
|
46
44
|
AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 1,
|
|
47
45
|
AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 1,
|
|
46
|
+
AZTEC_TARGET_COMMITTEE_SIZE: 1,
|
|
47
|
+
MAX_BLOCKS_PER_CHECKPOINT: 4,
|
|
48
48
|
AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS: 1,
|
|
49
|
+
AZTEC_SLASHING_QUORUM: 17,
|
|
50
|
+
AZTEC_GOVERNANCE_PROPOSER_QUORUM: 151,
|
|
49
51
|
L1_CHAIN_ID: 11155111,
|
|
50
52
|
TEST_ACCOUNTS: true,
|
|
51
53
|
SPONSORED_FPC: true,
|
|
@@ -61,7 +63,6 @@ export const devnetConfig = {
|
|
|
61
63
|
PUBLIC_OTEL_OPT_OUT: true,
|
|
62
64
|
PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: '',
|
|
63
65
|
PUBLIC_OTEL_COLLECT_FROM: '',
|
|
64
|
-
SLASH_PRUNE_PENALTY: 10000000000000000000,
|
|
65
66
|
SLASH_DATA_WITHHOLDING_PENALTY: 10000000000000000000,
|
|
66
67
|
SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.9,
|
|
67
68
|
SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 1,
|
|
@@ -69,9 +70,11 @@ export const devnetConfig = {
|
|
|
69
70
|
SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 10000000000000000000,
|
|
70
71
|
SLASH_DUPLICATE_PROPOSAL_PENALTY: 10000000000000000000,
|
|
71
72
|
SLASH_DUPLICATE_ATTESTATION_PENALTY: 10000000000000000000,
|
|
72
|
-
|
|
73
|
+
SLASH_PROPOSE_DESCENDANT_OF_CHECKPOINT_WITH_INVALID_ATTESTATIONS_PENALTY: 10000000000000000000,
|
|
74
|
+
SLASH_ATTEST_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 10000000000000000000,
|
|
73
75
|
SLASH_UNKNOWN_PENALTY: 10000000000000000000,
|
|
74
76
|
SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000,
|
|
77
|
+
SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 0,
|
|
75
78
|
SLASH_GRACE_PERIOD_L2_SLOTS: 0,
|
|
76
79
|
ENABLE_VERSION_CHECK: true,
|
|
77
80
|
} as const;
|
|
@@ -86,22 +89,22 @@ export const testnetConfig = {
|
|
|
86
89
|
AZTEC_INBOX_LAG: 1,
|
|
87
90
|
AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
|
|
88
91
|
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
89
|
-
|
|
92
|
+
AZTEC_SLASHER_ENABLED: true,
|
|
90
93
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
91
94
|
AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
|
|
92
95
|
AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
|
|
93
96
|
AZTEC_SLASHING_DISABLE_DURATION: 432000,
|
|
94
|
-
SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
|
|
95
|
-
SLASH_MAX_PENALTY_PERCENTAGE: 2,
|
|
96
97
|
SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
|
|
97
98
|
SLASH_MAX_PAYLOAD_SIZE: 80,
|
|
98
99
|
SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
|
|
100
|
+
SLASH_DATA_WITHHOLDING_TOLERANCE_SLOTS: 3,
|
|
99
101
|
P2P_ENABLED: true,
|
|
100
102
|
BOOTSTRAP_NODES: '',
|
|
101
103
|
SEQ_MIN_TX_PER_BLOCK: 1,
|
|
102
104
|
SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
|
|
103
105
|
SEQ_BLOCK_DURATION_MS: 6000,
|
|
104
|
-
|
|
106
|
+
MAX_BLOCKS_PER_CHECKPOINT: 10,
|
|
107
|
+
CHECKPOINT_PROPOSAL_SYNC_GRACE_SECONDS: 12,
|
|
105
108
|
DATA_STORE_MAP_SIZE_KB: 134217728,
|
|
106
109
|
ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
|
|
107
110
|
NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
|
|
@@ -119,10 +122,10 @@ export const testnetConfig = {
|
|
|
119
122
|
AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 100,
|
|
120
123
|
AZTEC_GOVERNANCE_PROPOSER_QUORUM: 60,
|
|
121
124
|
AZTEC_MANA_TARGET: 75000000,
|
|
122
|
-
AZTEC_PROVING_COST_PER_MANA:
|
|
125
|
+
AZTEC_PROVING_COST_PER_MANA: 12500000,
|
|
123
126
|
AZTEC_SLASH_AMOUNT_SMALL: 1E+23,
|
|
124
|
-
AZTEC_SLASH_AMOUNT_MEDIUM:
|
|
125
|
-
AZTEC_SLASH_AMOUNT_LARGE:
|
|
127
|
+
AZTEC_SLASH_AMOUNT_MEDIUM: 2.5E+23,
|
|
128
|
+
AZTEC_SLASH_AMOUNT_LARGE: 2.5E+23,
|
|
126
129
|
L1_CHAIN_ID: 11155111,
|
|
127
130
|
TEST_ACCOUNTS: false,
|
|
128
131
|
SPONSORED_FPC: false,
|
|
@@ -131,17 +134,18 @@ export const testnetConfig = {
|
|
|
131
134
|
PROVER_REAL_PROOFS: true,
|
|
132
135
|
P2P_MAX_PENDING_TX_COUNT: 1000,
|
|
133
136
|
P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true,
|
|
134
|
-
|
|
135
|
-
SLASH_DATA_WITHHOLDING_PENALTY: 10000000000000000000,
|
|
137
|
+
SLASH_DATA_WITHHOLDING_PENALTY: 0,
|
|
136
138
|
SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.9,
|
|
137
139
|
SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 1,
|
|
138
|
-
SLASH_INACTIVITY_PENALTY:
|
|
139
|
-
SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY:
|
|
140
|
-
SLASH_DUPLICATE_PROPOSAL_PENALTY:
|
|
141
|
-
SLASH_DUPLICATE_ATTESTATION_PENALTY:
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
140
|
+
SLASH_INACTIVITY_PENALTY: 1E+23,
|
|
141
|
+
SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 1E+23,
|
|
142
|
+
SLASH_DUPLICATE_PROPOSAL_PENALTY: 2.5E+23,
|
|
143
|
+
SLASH_DUPLICATE_ATTESTATION_PENALTY: 2.5E+23,
|
|
144
|
+
SLASH_PROPOSE_DESCENDANT_OF_CHECKPOINT_WITH_INVALID_ATTESTATIONS_PENALTY: 0,
|
|
145
|
+
SLASH_ATTEST_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 0,
|
|
146
|
+
SLASH_UNKNOWN_PENALTY: 1E+23,
|
|
147
|
+
SLASH_INVALID_BLOCK_PENALTY: 1E+23,
|
|
148
|
+
SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 1E+23,
|
|
145
149
|
SLASH_GRACE_PERIOD_L2_SLOTS: 64,
|
|
146
150
|
ENABLE_VERSION_CHECK: true,
|
|
147
151
|
} as const;
|
|
@@ -155,20 +159,20 @@ export const mainnetConfig = {
|
|
|
155
159
|
AZTEC_INBOX_LAG: 1,
|
|
156
160
|
AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
|
|
157
161
|
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
158
|
-
|
|
162
|
+
AZTEC_SLASHER_ENABLED: true,
|
|
159
163
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
160
164
|
AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
|
|
161
|
-
SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
|
|
162
|
-
SLASH_MAX_PENALTY_PERCENTAGE: 2,
|
|
163
165
|
SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
|
|
164
166
|
SLASH_MAX_PAYLOAD_SIZE: 80,
|
|
165
167
|
SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
|
|
168
|
+
SLASH_DATA_WITHHOLDING_TOLERANCE_SLOTS: 3,
|
|
166
169
|
P2P_ENABLED: true,
|
|
167
170
|
BOOTSTRAP_NODES: '',
|
|
168
171
|
SEQ_MIN_TX_PER_BLOCK: 1,
|
|
169
172
|
SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
|
|
170
173
|
SEQ_BLOCK_DURATION_MS: 6000,
|
|
171
|
-
|
|
174
|
+
MAX_BLOCKS_PER_CHECKPOINT: 10,
|
|
175
|
+
CHECKPOINT_PROPOSAL_SYNC_GRACE_SECONDS: 12,
|
|
172
176
|
DATA_STORE_MAP_SIZE_KB: 134217728,
|
|
173
177
|
ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
|
|
174
178
|
NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
|
|
@@ -181,8 +185,8 @@ export const mainnetConfig = {
|
|
|
181
185
|
AZTEC_EJECTION_THRESHOLD: 1E+23,
|
|
182
186
|
AZTEC_LOCAL_EJECTION_THRESHOLD: 1.9E+23,
|
|
183
187
|
AZTEC_SLASH_AMOUNT_SMALL: 2E+21,
|
|
184
|
-
AZTEC_SLASH_AMOUNT_MEDIUM:
|
|
185
|
-
AZTEC_SLASH_AMOUNT_LARGE:
|
|
188
|
+
AZTEC_SLASH_AMOUNT_MEDIUM: 5E+21,
|
|
189
|
+
AZTEC_SLASH_AMOUNT_LARGE: 5E+21,
|
|
186
190
|
AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 34,
|
|
187
191
|
AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS: 28,
|
|
188
192
|
AZTEC_SLASHING_VETOER: '0xBbB4aF368d02827945748b28CD4b2D42e4A37480',
|
|
@@ -190,7 +194,7 @@ export const mainnetConfig = {
|
|
|
190
194
|
AZTEC_GOVERNANCE_PROPOSER_QUORUM: 600,
|
|
191
195
|
AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 1000,
|
|
192
196
|
AZTEC_MANA_TARGET: 75000000,
|
|
193
|
-
AZTEC_PROVING_COST_PER_MANA:
|
|
197
|
+
AZTEC_PROVING_COST_PER_MANA: 12500000,
|
|
194
198
|
AZTEC_EXIT_DELAY_SECONDS: 345600,
|
|
195
199
|
AZTEC_SLASHING_DISABLE_DURATION: 259200,
|
|
196
200
|
AZTEC_ENTRY_QUEUE_BOOTSTRAP_VALIDATOR_SET_SIZE: 500,
|
|
@@ -210,17 +214,18 @@ export const mainnetConfig = {
|
|
|
210
214
|
PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: '',
|
|
211
215
|
PUBLIC_OTEL_COLLECT_FROM: '',
|
|
212
216
|
ENABLE_VERSION_CHECK: false,
|
|
213
|
-
SLASH_PRUNE_PENALTY: 0,
|
|
214
217
|
SLASH_DATA_WITHHOLDING_PENALTY: 0,
|
|
215
218
|
SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.8,
|
|
216
219
|
SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 2,
|
|
217
220
|
SLASH_INACTIVITY_PENALTY: 2E+21,
|
|
218
221
|
SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 2E+21,
|
|
219
|
-
SLASH_DUPLICATE_PROPOSAL_PENALTY:
|
|
220
|
-
SLASH_DUPLICATE_ATTESTATION_PENALTY:
|
|
221
|
-
|
|
222
|
+
SLASH_DUPLICATE_PROPOSAL_PENALTY: 5E+21,
|
|
223
|
+
SLASH_DUPLICATE_ATTESTATION_PENALTY: 5E+21,
|
|
224
|
+
SLASH_PROPOSE_DESCENDANT_OF_CHECKPOINT_WITH_INVALID_ATTESTATIONS_PENALTY: 0,
|
|
225
|
+
SLASH_ATTEST_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 0,
|
|
222
226
|
SLASH_UNKNOWN_PENALTY: 2E+21,
|
|
223
227
|
SLASH_INVALID_BLOCK_PENALTY: 2E+21,
|
|
228
|
+
SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 2E+21,
|
|
224
229
|
SLASH_GRACE_PERIOD_L2_SLOTS: 1200,
|
|
225
230
|
} as const;
|
|
226
231
|
|
package/src/utils/aztec.ts
CHANGED
|
@@ -3,7 +3,7 @@ import {
|
|
|
3
3
|
type FunctionAbi,
|
|
4
4
|
FunctionType,
|
|
5
5
|
getAllFunctionAbis,
|
|
6
|
-
|
|
6
|
+
loadContractArtifactWithValidation,
|
|
7
7
|
} from '@aztec/aztec.js/abi';
|
|
8
8
|
import { EthAddress } from '@aztec/aztec.js/addresses';
|
|
9
9
|
import type { L1ContractsConfig } from '@aztec/ethereum/config';
|
|
@@ -49,7 +49,7 @@ export async function deployNewRollupContracts(
|
|
|
49
49
|
feeJuicePortalInitialBalance: bigint,
|
|
50
50
|
config: L1ContractsConfig,
|
|
51
51
|
realVerifier: boolean,
|
|
52
|
-
): Promise<{ rollup: RollupContract
|
|
52
|
+
): Promise<{ rollup: RollupContract }> {
|
|
53
53
|
const { deployRollupForUpgrade } = await import('@aztec/ethereum/deploy-aztec-l1-contracts');
|
|
54
54
|
const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
|
|
55
55
|
const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
|
|
@@ -80,23 +80,17 @@ export async function deployNewRollupContracts(
|
|
|
80
80
|
logger.info('Initializing new rollup with old attesters', { initialValidators });
|
|
81
81
|
}
|
|
82
82
|
|
|
83
|
-
const { rollup
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
realVerifier,
|
|
95
|
-
...config,
|
|
96
|
-
},
|
|
97
|
-
);
|
|
98
|
-
|
|
99
|
-
return { rollup, slashFactoryAddress: EthAddress.fromString(slashFactoryAddress!) };
|
|
83
|
+
const { rollup } = await deployRollupForUpgrade(privateKey as Hex, rpcUrls[0], chainId, registryAddress, {
|
|
84
|
+
vkTreeRoot: getVKTreeRoot(),
|
|
85
|
+
protocolContractsHash,
|
|
86
|
+
genesisArchiveRoot,
|
|
87
|
+
initialValidators,
|
|
88
|
+
feeJuicePortalInitialBalance,
|
|
89
|
+
realVerifier,
|
|
90
|
+
...config,
|
|
91
|
+
});
|
|
92
|
+
|
|
93
|
+
return { rollup };
|
|
100
94
|
}
|
|
101
95
|
|
|
102
96
|
/**
|
|
@@ -138,7 +132,7 @@ export async function getContractArtifact(fileDir: string, log: LogFn) {
|
|
|
138
132
|
}
|
|
139
133
|
|
|
140
134
|
try {
|
|
141
|
-
return
|
|
135
|
+
return loadContractArtifactWithValidation(JSON.parse(contents));
|
|
142
136
|
} catch (err) {
|
|
143
137
|
log('Invalid file used. Please try again.');
|
|
144
138
|
throw err;
|
package/src/utils/commands.ts
CHANGED
|
@@ -5,13 +5,15 @@ import type { PXE } from '@aztec/pxe/server';
|
|
|
5
5
|
import { FunctionSelector } from '@aztec/stdlib/abi/function-selector';
|
|
6
6
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
7
7
|
import { PublicKeys } from '@aztec/stdlib/keys';
|
|
8
|
-
import {
|
|
8
|
+
import { LogCursor, Tag } from '@aztec/stdlib/logs';
|
|
9
9
|
import { TxHash } from '@aztec/stdlib/tx/tx-hash';
|
|
10
10
|
|
|
11
11
|
import { type Command, CommanderError, InvalidArgumentError, Option } from 'commander';
|
|
12
12
|
import { lookup } from 'dns/promises';
|
|
13
13
|
import { rename, writeFile } from 'fs/promises';
|
|
14
14
|
|
|
15
|
+
export { LogCursor };
|
|
16
|
+
|
|
15
17
|
/**
|
|
16
18
|
* If we can successfully resolve 'host.docker.internal', then we are running in a container, and we should treat
|
|
17
19
|
* localhost as being host.docker.internal.
|
|
@@ -227,16 +229,27 @@ export function parseOptionalAztecAddress(address: string): AztecAddress | undef
|
|
|
227
229
|
}
|
|
228
230
|
|
|
229
231
|
/**
|
|
230
|
-
* Parses an optional
|
|
231
|
-
*
|
|
232
|
-
* @
|
|
233
|
-
* @
|
|
232
|
+
* Parses an optional `<blockNumber>-<txIndexWithinBlock>-<logIndexWithinTx>` triple into a {@link LogCursor},
|
|
233
|
+
* used as the `--after-log` argument of `get-logs` to resume pagination strictly after a previously-seen log.
|
|
234
|
+
* Thin wrapper over {@link LogCursor.parseOptional} that surfaces parse errors as commander's
|
|
235
|
+
* {@link InvalidArgumentError}.
|
|
234
236
|
*/
|
|
235
|
-
export function
|
|
236
|
-
|
|
237
|
-
return
|
|
237
|
+
export function parseOptionalLogCursor(value: string): LogCursor | undefined {
|
|
238
|
+
try {
|
|
239
|
+
return LogCursor.parseOptional(value);
|
|
240
|
+
} catch (err) {
|
|
241
|
+
throw new InvalidArgumentError(err instanceof Error ? err.message : String(err));
|
|
238
242
|
}
|
|
239
|
-
|
|
243
|
+
}
|
|
244
|
+
|
|
245
|
+
/**
|
|
246
|
+
* Parses a log tag from a string. Tags are field-element values; we delegate to the {@link parseField} parser.
|
|
247
|
+
*
|
|
248
|
+
* @param tag - A hex string, integer, or boolean string representing the tag.
|
|
249
|
+
* @returns A {@link Tag} wrapping the parsed field.
|
|
250
|
+
*/
|
|
251
|
+
export function parseTag(tag: string): Tag {
|
|
252
|
+
return new Tag(parseField(tag));
|
|
240
253
|
}
|
|
241
254
|
|
|
242
255
|
/**
|
package/src/utils/inspect.ts
CHANGED
|
@@ -9,14 +9,13 @@ export async function inspectBlock(
|
|
|
9
9
|
log: LogFn,
|
|
10
10
|
opts: { showTxs?: boolean } = {},
|
|
11
11
|
) {
|
|
12
|
-
const block = await aztecNode.getBlock(blockNumber);
|
|
12
|
+
const block = await aztecNode.getBlock(blockNumber, { includeTransactions: opts.showTxs });
|
|
13
13
|
if (!block) {
|
|
14
14
|
log(`No block found for block number ${blockNumber}`);
|
|
15
15
|
return;
|
|
16
16
|
}
|
|
17
17
|
|
|
18
|
-
|
|
19
|
-
log(`Block ${blockNumber} (${blockHash.toString()})`);
|
|
18
|
+
log(`Block ${blockNumber} (${block.hash.toString()})`);
|
|
20
19
|
log(` Total fees: ${block.header.totalFees.toBigInt()}`);
|
|
21
20
|
log(` Total mana used: ${block.header.totalManaUsed.toBigInt()}`);
|
|
22
21
|
log(
|
|
@@ -25,12 +24,12 @@ export async function inspectBlock(
|
|
|
25
24
|
log(` Coinbase: ${block.header.globalVariables.coinbase}`);
|
|
26
25
|
log(` Fee recipient: ${block.header.globalVariables.feeRecipient}`);
|
|
27
26
|
log(` Timestamp: ${new Date(Number(block.header.globalVariables.timestamp) * 500)}`);
|
|
28
|
-
if (opts.showTxs) {
|
|
27
|
+
if (opts.showTxs && block.body) {
|
|
29
28
|
log(``);
|
|
30
29
|
for (const txHash of block.body.txEffects.map(tx => tx.txHash)) {
|
|
31
30
|
await inspectTx(aztecNode, txHash, log, { includeBlockInfo: false });
|
|
32
31
|
}
|
|
33
|
-
} else {
|
|
32
|
+
} else if (block.body) {
|
|
34
33
|
log(` Transactions: ${block.body.txEffects.length}`);
|
|
35
34
|
}
|
|
36
35
|
}
|
|
@@ -41,7 +40,7 @@ export async function inspectTx(
|
|
|
41
40
|
log: LogFn,
|
|
42
41
|
opts: { includeBlockInfo?: boolean } = {},
|
|
43
42
|
) {
|
|
44
|
-
const
|
|
43
|
+
const receipt = await aztecNode.getTxReceipt(txHash, { includeTxEffect: true });
|
|
45
44
|
// Base tx data
|
|
46
45
|
log(`Tx ${txHash.toString()}`);
|
|
47
46
|
log(` Status: ${receipt.status}`);
|
|
@@ -52,11 +51,11 @@ export async function inspectTx(
|
|
|
52
51
|
log(` Error: ${receipt.error}`);
|
|
53
52
|
}
|
|
54
53
|
|
|
55
|
-
if (!
|
|
54
|
+
if (!receipt.isMined() || !receipt.txEffect) {
|
|
56
55
|
return;
|
|
57
56
|
}
|
|
58
57
|
|
|
59
|
-
const effects =
|
|
58
|
+
const effects = receipt.txEffect;
|
|
60
59
|
|
|
61
60
|
if (opts.includeBlockInfo) {
|
|
62
61
|
log(` Block: ${receipt.blockNumber} (${receipt.blockHash?.toString()})`);
|