@aztec/cli 2.0.0-rc.36 → 2.0.0-rc.39
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.
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { type L1ContractsConfig } from '@aztec/ethereum';
|
|
2
2
|
import type { NetworkNames } from '@aztec/foundation/config';
|
|
3
3
|
import type { SharedNodeConfig } from '@aztec/node-lib/config';
|
|
4
|
+
import type { P2PConfig } from '@aztec/p2p/config';
|
|
4
5
|
import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
|
|
5
|
-
export type L2ChainConfig = L1ContractsConfig & Omit<SlasherConfig, 'slashValidatorsNever' | 'slashValidatorsAlways'> & {
|
|
6
|
+
export type L2ChainConfig = L1ContractsConfig & Pick<P2PConfig, 'txPoolDeleteTxsAfterReorg'> & Omit<SlasherConfig, 'slashValidatorsNever' | 'slashValidatorsAlways'> & {
|
|
6
7
|
l1ChainId: number;
|
|
7
8
|
testAccounts: boolean;
|
|
8
9
|
sponsoredFPC: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/config/chain_l2_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnF,OAAO,KAAK,EAAU,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAErE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAOrE,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAC3C,IAAI,CAAC,aAAa,EAAE,sBAAsB,GAAG,uBAAuB,CAAC,GAAG;IACtE,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;IAGpC,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC;AAoCJ,eAAO,MAAM,4BAA4B,EAAE,
|
|
1
|
+
{"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/config/chain_l2_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnF,OAAO,KAAK,EAAU,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAErE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAOrE,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAC3C,IAAI,CAAC,SAAS,EAAE,2BAA2B,CAAC,GAC5C,IAAI,CAAC,aAAa,EAAE,sBAAsB,GAAG,uBAAuB,CAAC,GAAG;IACtE,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;IAGpC,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC;AAoCJ,eAAO,MAAM,4BAA4B,EAAE,aA2E1C,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,aAgDxC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAmDlC,CAAC;AAIF,wBAAsB,YAAY,CAAC,WAAW,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAE,MAAM,gBAgC9E;AAED,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,YAAY,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAkBpC;AAuBD,wBAAsB,gCAAgC,CAAC,WAAW,EAAE,YAAY,iBAyF/E"}
|
|
@@ -52,6 +52,7 @@ export const stagingIgnitionL2ChainConfig = {
|
|
|
52
52
|
publicMetricsCollectFrom: [
|
|
53
53
|
'sequencer'
|
|
54
54
|
],
|
|
55
|
+
txPoolDeleteTxsAfterReorg: false,
|
|
55
56
|
/** How many seconds an L1 slot lasts. */ ethereumSlotDuration: 12,
|
|
56
57
|
/** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */ aztecSlotDuration: 72,
|
|
57
58
|
/** How many L2 slots an epoch lasts. */ aztecEpochDuration: 32,
|
|
@@ -113,6 +114,7 @@ export const stagingPublicL2ChainConfig = {
|
|
|
113
114
|
'sequencer'
|
|
114
115
|
],
|
|
115
116
|
maxTxPoolSize: 100_000_000,
|
|
117
|
+
txPoolDeleteTxsAfterReorg: true,
|
|
116
118
|
// Deployment stuff
|
|
117
119
|
/** How many seconds an L1 slot lasts. */ ethereumSlotDuration: 12,
|
|
118
120
|
/** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */ aztecSlotDuration: 36,
|
|
@@ -134,9 +136,9 @@ export const testnetL2ChainConfig = {
|
|
|
134
136
|
sponsoredFPC: true,
|
|
135
137
|
p2pEnabled: true,
|
|
136
138
|
p2pBootstrapNodes: [],
|
|
137
|
-
registryAddress: '
|
|
138
|
-
slashFactoryAddress: '
|
|
139
|
-
feeAssetHandlerAddress: '
|
|
139
|
+
registryAddress: '0xc2f24280f5c7f4897370dfdeb30f79ded14f1c81',
|
|
140
|
+
slashFactoryAddress: '0x76291684ae928d6e5bcff348e36917f4cc532db8',
|
|
141
|
+
feeAssetHandlerAddress: '0x50513c3713ffd33301e85f30d86ab764df421fe9',
|
|
140
142
|
seqMinTxsPerBlock: 0,
|
|
141
143
|
seqMaxTxsPerBlock: 20,
|
|
142
144
|
realProofs: true,
|
|
@@ -149,6 +151,7 @@ export const testnetL2ChainConfig = {
|
|
|
149
151
|
publicMetricsCollectFrom: [
|
|
150
152
|
'sequencer'
|
|
151
153
|
],
|
|
154
|
+
txPoolDeleteTxsAfterReorg: true,
|
|
152
155
|
// Deployment stuff
|
|
153
156
|
/** How many seconds an L1 slot lasts. */ ethereumSlotDuration: 12,
|
|
154
157
|
/** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */ aztecSlotDuration: 36,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/cli",
|
|
3
|
-
"version": "2.0.0-rc.
|
|
3
|
+
"version": "2.0.0-rc.39",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
"./contracts": "./dest/cmds/contracts/index.js",
|
|
@@ -70,17 +70,17 @@
|
|
|
70
70
|
]
|
|
71
71
|
},
|
|
72
72
|
"dependencies": {
|
|
73
|
-
"@aztec/archiver": "2.0.0-rc.
|
|
74
|
-
"@aztec/aztec.js": "2.0.0-rc.
|
|
75
|
-
"@aztec/constants": "2.0.0-rc.
|
|
76
|
-
"@aztec/entrypoints": "2.0.0-rc.
|
|
77
|
-
"@aztec/ethereum": "2.0.0-rc.
|
|
78
|
-
"@aztec/foundation": "2.0.0-rc.
|
|
79
|
-
"@aztec/l1-artifacts": "2.0.0-rc.
|
|
80
|
-
"@aztec/node-lib": "2.0.0-rc.
|
|
81
|
-
"@aztec/p2p": "2.0.0-rc.
|
|
82
|
-
"@aztec/stdlib": "2.0.0-rc.
|
|
83
|
-
"@aztec/world-state": "2.0.0-rc.
|
|
73
|
+
"@aztec/archiver": "2.0.0-rc.39",
|
|
74
|
+
"@aztec/aztec.js": "2.0.0-rc.39",
|
|
75
|
+
"@aztec/constants": "2.0.0-rc.39",
|
|
76
|
+
"@aztec/entrypoints": "2.0.0-rc.39",
|
|
77
|
+
"@aztec/ethereum": "2.0.0-rc.39",
|
|
78
|
+
"@aztec/foundation": "2.0.0-rc.39",
|
|
79
|
+
"@aztec/l1-artifacts": "2.0.0-rc.39",
|
|
80
|
+
"@aztec/node-lib": "2.0.0-rc.39",
|
|
81
|
+
"@aztec/p2p": "2.0.0-rc.39",
|
|
82
|
+
"@aztec/stdlib": "2.0.0-rc.39",
|
|
83
|
+
"@aztec/world-state": "2.0.0-rc.39",
|
|
84
84
|
"@iarna/toml": "^2.2.5",
|
|
85
85
|
"@libp2p/peer-id-factory": "^3.0.4",
|
|
86
86
|
"commander": "^12.1.0",
|
|
@@ -92,8 +92,8 @@
|
|
|
92
92
|
"viem": "2.23.7"
|
|
93
93
|
},
|
|
94
94
|
"devDependencies": {
|
|
95
|
-
"@aztec/accounts": "2.0.0-rc.
|
|
96
|
-
"@aztec/protocol-contracts": "2.0.0-rc.
|
|
95
|
+
"@aztec/accounts": "2.0.0-rc.39",
|
|
96
|
+
"@aztec/protocol-contracts": "2.0.0-rc.39",
|
|
97
97
|
"@jest/globals": "^30.0.0",
|
|
98
98
|
"@types/jest": "^30.0.0",
|
|
99
99
|
"@types/lodash.chunk": "^4.2.9",
|
|
@@ -109,15 +109,15 @@
|
|
|
109
109
|
"typescript": "^5.3.3"
|
|
110
110
|
},
|
|
111
111
|
"peerDependencies": {
|
|
112
|
-
"@aztec/accounts": "2.0.0-rc.
|
|
113
|
-
"@aztec/bb-prover": "2.0.0-rc.
|
|
114
|
-
"@aztec/ethereum": "2.0.0-rc.
|
|
115
|
-
"@aztec/l1-artifacts": "2.0.0-rc.
|
|
116
|
-
"@aztec/noir-contracts.js": "2.0.0-rc.
|
|
117
|
-
"@aztec/noir-protocol-circuits-types": "2.0.0-rc.
|
|
118
|
-
"@aztec/noir-test-contracts.js": "2.0.0-rc.
|
|
119
|
-
"@aztec/protocol-contracts": "2.0.0-rc.
|
|
120
|
-
"@aztec/stdlib": "2.0.0-rc.
|
|
112
|
+
"@aztec/accounts": "2.0.0-rc.39",
|
|
113
|
+
"@aztec/bb-prover": "2.0.0-rc.39",
|
|
114
|
+
"@aztec/ethereum": "2.0.0-rc.39",
|
|
115
|
+
"@aztec/l1-artifacts": "2.0.0-rc.39",
|
|
116
|
+
"@aztec/noir-contracts.js": "2.0.0-rc.39",
|
|
117
|
+
"@aztec/noir-protocol-circuits-types": "2.0.0-rc.39",
|
|
118
|
+
"@aztec/noir-test-contracts.js": "2.0.0-rc.39",
|
|
119
|
+
"@aztec/protocol-contracts": "2.0.0-rc.39",
|
|
120
|
+
"@aztec/stdlib": "2.0.0-rc.39"
|
|
121
121
|
},
|
|
122
122
|
"files": [
|
|
123
123
|
"dest",
|
|
@@ -2,6 +2,7 @@ import { DefaultL1ContractsConfig, type L1ContractsConfig } from '@aztec/ethereu
|
|
|
2
2
|
import type { EnvVar, NetworkNames } from '@aztec/foundation/config';
|
|
3
3
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
4
|
import type { SharedNodeConfig } from '@aztec/node-lib/config';
|
|
5
|
+
import type { P2PConfig } from '@aztec/p2p/config';
|
|
5
6
|
import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
|
|
6
7
|
|
|
7
8
|
import { mkdir, readFile, stat, writeFile } from 'fs/promises';
|
|
@@ -10,6 +11,7 @@ import path, { dirname, join } from 'path';
|
|
|
10
11
|
import publicIncludeMetrics from '../../public_include_metric_prefixes.json' with { type: 'json' };
|
|
11
12
|
|
|
12
13
|
export type L2ChainConfig = L1ContractsConfig &
|
|
14
|
+
Pick<P2PConfig, 'txPoolDeleteTxsAfterReorg'> &
|
|
13
15
|
Omit<SlasherConfig, 'slashValidatorsNever' | 'slashValidatorsAlways'> & {
|
|
14
16
|
l1ChainId: number;
|
|
15
17
|
testAccounts: boolean;
|
|
@@ -87,6 +89,7 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
|
|
|
87
89
|
publicIncludeMetrics,
|
|
88
90
|
publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
|
|
89
91
|
publicMetricsCollectFrom: ['sequencer'],
|
|
92
|
+
txPoolDeleteTxsAfterReorg: false,
|
|
90
93
|
|
|
91
94
|
/** How many seconds an L1 slot lasts. */
|
|
92
95
|
ethereumSlotDuration: 12,
|
|
@@ -163,6 +166,7 @@ export const stagingPublicL2ChainConfig: L2ChainConfig = {
|
|
|
163
166
|
publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
|
|
164
167
|
publicMetricsCollectFrom: ['sequencer'],
|
|
165
168
|
maxTxPoolSize: 100_000_000, // 100MB
|
|
169
|
+
txPoolDeleteTxsAfterReorg: true,
|
|
166
170
|
|
|
167
171
|
// Deployment stuff
|
|
168
172
|
/** How many seconds an L1 slot lasts. */
|
|
@@ -199,9 +203,9 @@ export const testnetL2ChainConfig: L2ChainConfig = {
|
|
|
199
203
|
sponsoredFPC: true,
|
|
200
204
|
p2pEnabled: true,
|
|
201
205
|
p2pBootstrapNodes: [],
|
|
202
|
-
registryAddress: '
|
|
203
|
-
slashFactoryAddress: '
|
|
204
|
-
feeAssetHandlerAddress: '
|
|
206
|
+
registryAddress: '0xc2f24280f5c7f4897370dfdeb30f79ded14f1c81',
|
|
207
|
+
slashFactoryAddress: '0x76291684ae928d6e5bcff348e36917f4cc532db8',
|
|
208
|
+
feeAssetHandlerAddress: '0x50513c3713ffd33301e85f30d86ab764df421fe9',
|
|
205
209
|
seqMinTxsPerBlock: 0,
|
|
206
210
|
seqMaxTxsPerBlock: 20,
|
|
207
211
|
realProofs: true,
|
|
@@ -212,6 +216,7 @@ export const testnetL2ChainConfig: L2ChainConfig = {
|
|
|
212
216
|
publicIncludeMetrics,
|
|
213
217
|
publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
|
|
214
218
|
publicMetricsCollectFrom: ['sequencer'],
|
|
219
|
+
txPoolDeleteTxsAfterReorg: true,
|
|
215
220
|
|
|
216
221
|
// Deployment stuff
|
|
217
222
|
/** How many seconds an L1 slot lasts. */
|