@aztec/cli 0.85.0-nightly.20250421 → 0.85.0-nightly.20250423
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/l1/deploy_l1_contracts.d.ts.map +1 -1
- package/dest/cmds/l1/deploy_l1_contracts.js +2 -3
- package/dest/cmds/l1/deploy_new_rollup.d.ts.map +1 -1
- package/dest/cmds/l1/deploy_new_rollup.js +2 -4
- package/dest/utils/aztec.d.ts +2 -2
- package/dest/utils/aztec.d.ts.map +1 -1
- package/dest/utils/aztec.js +2 -4
- package/package.json +21 -21
- package/src/cmds/l1/deploy_l1_contracts.ts +1 -3
- package/src/cmds/l1/deploy_new_rollup.ts +1 -4
- package/src/utils/aztec.ts +0 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_l1_contracts.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAM3D,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,0BAA0B,EAAE,OAAO,EACnC,IAAI,EAAE,OAAO,EACb,iBAAiB,EAAE,UAAU,EAAE,EAC/B,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_l1_contracts.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAM3D,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,0BAA0B,EAAE,OAAO,EACnC,IAAI,EAAE,OAAO,EACb,iBAAiB,EAAE,UAAU,EAAE,EAC/B,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBAmDpB"}
|
|
@@ -8,8 +8,8 @@ export async function deployL1Contracts(rpcUrls, chainId, privateKey, mnemonic,
|
|
|
8
8
|
const initialAccounts = testAccounts ? await getInitialTestAccounts() : [];
|
|
9
9
|
const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
|
|
10
10
|
const initialFundedAccounts = initialAccounts.map((a)=>a.address).concat(sponsoredFPCAddress);
|
|
11
|
-
const {
|
|
12
|
-
const { l1ContractAddresses } = await deployAztecContracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot,
|
|
11
|
+
const { genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);
|
|
12
|
+
const { l1ContractAddresses } = await deployAztecContracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, fundingNeeded, acceleratedTestDeployments, config, debugLogger);
|
|
13
13
|
if (json) {
|
|
14
14
|
log(JSON.stringify(Object.fromEntries(Object.entries(l1ContractAddresses).map(([k, v])=>[
|
|
15
15
|
k,
|
|
@@ -32,7 +32,6 @@ export async function deployL1Contracts(rpcUrls, chainId, privateKey, mnemonic,
|
|
|
32
32
|
log(`StakingAssetHandler Address: ${l1ContractAddresses.stakingAssetHandlerAddress?.toString()}`);
|
|
33
33
|
log(`Initial funded accounts: ${initialFundedAccounts.map((a)=>a.toString()).join(', ')}`);
|
|
34
34
|
log(`Initial validators: ${initialValidators.map((a)=>a.toString()).join(', ')}`);
|
|
35
|
-
log(`Genesis block hash: ${genesisBlockHash.toString()}`);
|
|
36
35
|
log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
|
|
37
36
|
}
|
|
38
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy_new_rollup.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_new_rollup.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAM3D,wBAAsB,eAAe,CACnC,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,EACb,iBAAiB,EAAE,UAAU,EAAE,EAC/B,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"deploy_new_rollup.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_new_rollup.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAM3D,wBAAsB,eAAe,CACnC,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,EACb,iBAAiB,EAAE,UAAU,EAAE,EAC/B,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBA6CpB"}
|
|
@@ -8,14 +8,13 @@ export async function deployNewRollup(registryAddress, rpcUrls, chainId, private
|
|
|
8
8
|
const initialAccounts = testAccounts ? await getInitialTestAccounts() : [];
|
|
9
9
|
const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
|
|
10
10
|
const initialFundedAccounts = initialAccounts.map((a)=>a.address).concat(sponsoredFPCAddress);
|
|
11
|
-
const {
|
|
12
|
-
const { rollup, slashFactoryAddress } = await deployNewRollupContracts(registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot,
|
|
11
|
+
const { genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);
|
|
12
|
+
const { rollup, slashFactoryAddress } = await deployNewRollupContracts(registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, fundingNeeded, config, debugLogger);
|
|
13
13
|
if (json) {
|
|
14
14
|
log(JSON.stringify({
|
|
15
15
|
rollupAddress: rollup.address,
|
|
16
16
|
initialFundedAccounts: initialFundedAccounts.map((a)=>a.toString()),
|
|
17
17
|
initialValidators: initialValidators.map((a)=>a.toString()),
|
|
18
|
-
genesisBlockHash: genesisBlockHash.toString(),
|
|
19
18
|
genesisArchiveRoot: genesisArchiveRoot.toString(),
|
|
20
19
|
slashFactoryAddress: slashFactoryAddress.toString()
|
|
21
20
|
}, null, 2));
|
|
@@ -23,7 +22,6 @@ export async function deployNewRollup(registryAddress, rpcUrls, chainId, private
|
|
|
23
22
|
log(`Rollup Address: ${rollup.address}`);
|
|
24
23
|
log(`Initial funded accounts: ${initialFundedAccounts.map((a)=>a.toString()).join(', ')}`);
|
|
25
24
|
log(`Initial validators: ${initialValidators.map((a)=>a.toString()).join(', ')}`);
|
|
26
|
-
log(`Genesis block hash: ${genesisBlockHash.toString()}`);
|
|
27
25
|
log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
|
|
28
26
|
log(`Slash Factory Address: ${slashFactoryAddress.toString()}`);
|
|
29
27
|
}
|
package/dest/utils/aztec.d.ts
CHANGED
|
@@ -18,8 +18,8 @@ export declare function getFunctionAbi(artifact: ContractArtifact, fnName: strin
|
|
|
18
18
|
* @param privateKey - The private key to be used in contract deployment.
|
|
19
19
|
* @param mnemonic - The mnemonic to be used in contract deployment.
|
|
20
20
|
*/
|
|
21
|
-
export declare function deployAztecContracts(rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, initialValidators: EthAddress[], genesisArchiveRoot: Fr,
|
|
22
|
-
export declare function deployNewRollupContracts(registryAddress: EthAddress, rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, initialValidators: EthAddress[], genesisArchiveRoot: Fr,
|
|
21
|
+
export declare function deployAztecContracts(rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, initialValidators: EthAddress[], genesisArchiveRoot: Fr, feeJuicePortalInitialBalance: bigint, acceleratedTestDeployments: boolean, config: L1ContractsConfig, debugLogger: Logger): Promise<DeployL1ContractsReturnType>;
|
|
22
|
+
export declare function deployNewRollupContracts(registryAddress: EthAddress, rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, initialValidators: EthAddress[], genesisArchiveRoot: Fr, feeJuicePortalInitialBalance: bigint, config: L1ContractsConfig, logger: Logger): Promise<{
|
|
23
23
|
rollup: RollupContract;
|
|
24
24
|
slashFactoryAddress: EthAddress;
|
|
25
25
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aztec.d.ts","sourceRoot":"","sources":["../../src/utils/aztec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAIjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,iBAAiB,EAEtB,cAAc,EACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAShE;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAMtF;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,UAAU,EAAE,EAC/B,kBAAkB,EAAE,EAAE,EACtB,
|
|
1
|
+
{"version":3,"file":"aztec.d.ts","sourceRoot":"","sources":["../../src/utils/aztec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAIjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,iBAAiB,EAEtB,cAAc,EACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAShE;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAMtF;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,UAAU,EAAE,EAC/B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,0BAA0B,EAAE,OAAO,EACnC,MAAM,EAAE,iBAAiB,EACzB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,2BAA2B,CAAC,CA4BtC;AAED,wBAAsB,wBAAwB,CAC5C,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,UAAU,EAAE,EAC/B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,CAAC;IAAC,mBAAmB,EAAE,UAAU,CAAA;CAAE,CAAC,CAmCtE;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAKjE;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,6BA4BpE;AAED;;;;;;;GAOG;AACH,wBAAsB,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK;;;;GAO3G;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,QAAS,MAAM,WAK1C,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAUtE;AAKD;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,oBAAoB,EAAE,MAAM,iBAyB9E"}
|
package/dest/utils/aztec.js
CHANGED
|
@@ -24,7 +24,7 @@ import { encodeArgs } from './encoding.js';
|
|
|
24
24
|
* @param chainId - The chain ID of the L1 host.
|
|
25
25
|
* @param privateKey - The private key to be used in contract deployment.
|
|
26
26
|
* @param mnemonic - The mnemonic to be used in contract deployment.
|
|
27
|
-
*/ export async function deployAztecContracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot,
|
|
27
|
+
*/ export async function deployAztecContracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, feeJuicePortalInitialBalance, acceleratedTestDeployments, config, debugLogger) {
|
|
28
28
|
const { createEthereumChain, deployL1Contracts } = await import('@aztec/ethereum');
|
|
29
29
|
const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
|
|
30
30
|
const account = !privateKey ? mnemonicToAccount(mnemonic, {
|
|
@@ -36,7 +36,6 @@ import { encodeArgs } from './encoding.js';
|
|
|
36
36
|
vkTreeRoot: getVKTreeRoot(),
|
|
37
37
|
protocolContractTreeRoot,
|
|
38
38
|
genesisArchiveRoot,
|
|
39
|
-
genesisBlockHash,
|
|
40
39
|
salt,
|
|
41
40
|
initialValidators,
|
|
42
41
|
acceleratedTestDeployments,
|
|
@@ -44,7 +43,7 @@ import { encodeArgs } from './encoding.js';
|
|
|
44
43
|
...config
|
|
45
44
|
}, config);
|
|
46
45
|
}
|
|
47
|
-
export async function deployNewRollupContracts(registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot,
|
|
46
|
+
export async function deployNewRollupContracts(registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, feeJuicePortalInitialBalance, config, logger) {
|
|
48
47
|
const { createEthereumChain, deployRollupForUpgrade, createL1Clients } = await import('@aztec/ethereum');
|
|
49
48
|
const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
|
|
50
49
|
const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
|
|
@@ -66,7 +65,6 @@ export async function deployNewRollupContracts(registryAddress, rpcUrls, chainId
|
|
|
66
65
|
vkTreeRoot: getVKTreeRoot(),
|
|
67
66
|
protocolContractTreeRoot,
|
|
68
67
|
genesisArchiveRoot,
|
|
69
|
-
genesisBlockHash,
|
|
70
68
|
initialValidators,
|
|
71
69
|
feeJuicePortalInitialBalance,
|
|
72
70
|
...config
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/cli",
|
|
3
|
-
"version": "0.85.0-nightly.
|
|
3
|
+
"version": "0.85.0-nightly.20250423",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
"./contracts": "./dest/cmds/contracts/index.js",
|
|
@@ -65,15 +65,15 @@
|
|
|
65
65
|
]
|
|
66
66
|
},
|
|
67
67
|
"dependencies": {
|
|
68
|
-
"@aztec/archiver": "0.85.0-nightly.
|
|
69
|
-
"@aztec/aztec.js": "0.85.0-nightly.
|
|
70
|
-
"@aztec/constants": "0.85.0-nightly.
|
|
71
|
-
"@aztec/entrypoints": "0.85.0-nightly.
|
|
72
|
-
"@aztec/foundation": "0.85.0-nightly.
|
|
73
|
-
"@aztec/l1-artifacts": "0.85.0-nightly.
|
|
74
|
-
"@aztec/p2p": "0.85.0-nightly.
|
|
75
|
-
"@aztec/stdlib": "0.85.0-nightly.
|
|
76
|
-
"@aztec/world-state": "0.85.0-nightly.
|
|
68
|
+
"@aztec/archiver": "0.85.0-nightly.20250423",
|
|
69
|
+
"@aztec/aztec.js": "0.85.0-nightly.20250423",
|
|
70
|
+
"@aztec/constants": "0.85.0-nightly.20250423",
|
|
71
|
+
"@aztec/entrypoints": "0.85.0-nightly.20250423",
|
|
72
|
+
"@aztec/foundation": "0.85.0-nightly.20250423",
|
|
73
|
+
"@aztec/l1-artifacts": "0.85.0-nightly.20250423",
|
|
74
|
+
"@aztec/p2p": "0.85.0-nightly.20250423",
|
|
75
|
+
"@aztec/stdlib": "0.85.0-nightly.20250423",
|
|
76
|
+
"@aztec/world-state": "0.85.0-nightly.20250423",
|
|
77
77
|
"@iarna/toml": "^2.2.5",
|
|
78
78
|
"@libp2p/peer-id-factory": "^3.0.4",
|
|
79
79
|
"commander": "^12.1.0",
|
|
@@ -85,9 +85,9 @@
|
|
|
85
85
|
"viem": "2.23.7"
|
|
86
86
|
},
|
|
87
87
|
"devDependencies": {
|
|
88
|
-
"@aztec/accounts": "0.85.0-nightly.
|
|
89
|
-
"@aztec/ethereum": "0.85.0-nightly.
|
|
90
|
-
"@aztec/protocol-contracts": "0.85.0-nightly.
|
|
88
|
+
"@aztec/accounts": "0.85.0-nightly.20250423",
|
|
89
|
+
"@aztec/ethereum": "0.85.0-nightly.20250423",
|
|
90
|
+
"@aztec/protocol-contracts": "0.85.0-nightly.20250423",
|
|
91
91
|
"@jest/globals": "^29.5.0",
|
|
92
92
|
"@types/jest": "^29.5.0",
|
|
93
93
|
"@types/lodash.chunk": "^4.2.9",
|
|
@@ -103,14 +103,14 @@
|
|
|
103
103
|
"typescript": "^5.0.4"
|
|
104
104
|
},
|
|
105
105
|
"peerDependencies": {
|
|
106
|
-
"@aztec/accounts": "0.85.0-nightly.
|
|
107
|
-
"@aztec/bb-prover": "0.85.0-nightly.
|
|
108
|
-
"@aztec/ethereum": "0.85.0-nightly.
|
|
109
|
-
"@aztec/l1-artifacts": "0.85.0-nightly.
|
|
110
|
-
"@aztec/noir-contracts.js": "0.85.0-nightly.
|
|
111
|
-
"@aztec/noir-protocol-circuits-types": "0.85.0-nightly.
|
|
112
|
-
"@aztec/protocol-contracts": "0.85.0-nightly.
|
|
113
|
-
"@aztec/stdlib": "0.85.0-nightly.
|
|
106
|
+
"@aztec/accounts": "0.85.0-nightly.20250423",
|
|
107
|
+
"@aztec/bb-prover": "0.85.0-nightly.20250423",
|
|
108
|
+
"@aztec/ethereum": "0.85.0-nightly.20250423",
|
|
109
|
+
"@aztec/l1-artifacts": "0.85.0-nightly.20250423",
|
|
110
|
+
"@aztec/noir-contracts.js": "0.85.0-nightly.20250423",
|
|
111
|
+
"@aztec/noir-protocol-circuits-types": "0.85.0-nightly.20250423",
|
|
112
|
+
"@aztec/protocol-contracts": "0.85.0-nightly.20250423",
|
|
113
|
+
"@aztec/stdlib": "0.85.0-nightly.20250423"
|
|
114
114
|
},
|
|
115
115
|
"files": [
|
|
116
116
|
"dest",
|
|
@@ -27,7 +27,7 @@ export async function deployL1Contracts(
|
|
|
27
27
|
const initialAccounts = testAccounts ? await getInitialTestAccounts() : [];
|
|
28
28
|
const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
|
|
29
29
|
const initialFundedAccounts = initialAccounts.map(a => a.address).concat(sponsoredFPCAddress);
|
|
30
|
-
const {
|
|
30
|
+
const { genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);
|
|
31
31
|
|
|
32
32
|
const { l1ContractAddresses } = await deployAztecContracts(
|
|
33
33
|
rpcUrls,
|
|
@@ -38,7 +38,6 @@ export async function deployL1Contracts(
|
|
|
38
38
|
salt,
|
|
39
39
|
initialValidators,
|
|
40
40
|
genesisArchiveRoot,
|
|
41
|
-
genesisBlockHash,
|
|
42
41
|
fundingNeeded,
|
|
43
42
|
acceleratedTestDeployments,
|
|
44
43
|
config,
|
|
@@ -70,7 +69,6 @@ export async function deployL1Contracts(
|
|
|
70
69
|
log(`StakingAssetHandler Address: ${l1ContractAddresses.stakingAssetHandlerAddress?.toString()}`);
|
|
71
70
|
log(`Initial funded accounts: ${initialFundedAccounts.map(a => a.toString()).join(', ')}`);
|
|
72
71
|
log(`Initial validators: ${initialValidators.map(a => a.toString()).join(', ')}`);
|
|
73
|
-
log(`Genesis block hash: ${genesisBlockHash.toString()}`);
|
|
74
72
|
log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
|
|
75
73
|
}
|
|
76
74
|
}
|
|
@@ -27,7 +27,7 @@ export async function deployNewRollup(
|
|
|
27
27
|
const initialAccounts = testAccounts ? await getInitialTestAccounts() : [];
|
|
28
28
|
const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
|
|
29
29
|
const initialFundedAccounts = initialAccounts.map(a => a.address).concat(sponsoredFPCAddress);
|
|
30
|
-
const {
|
|
30
|
+
const { genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);
|
|
31
31
|
|
|
32
32
|
const { rollup, slashFactoryAddress } = await deployNewRollupContracts(
|
|
33
33
|
registryAddress,
|
|
@@ -39,7 +39,6 @@ export async function deployNewRollup(
|
|
|
39
39
|
salt,
|
|
40
40
|
initialValidators,
|
|
41
41
|
genesisArchiveRoot,
|
|
42
|
-
genesisBlockHash,
|
|
43
42
|
fundingNeeded,
|
|
44
43
|
config,
|
|
45
44
|
debugLogger,
|
|
@@ -52,7 +51,6 @@ export async function deployNewRollup(
|
|
|
52
51
|
rollupAddress: rollup.address,
|
|
53
52
|
initialFundedAccounts: initialFundedAccounts.map(a => a.toString()),
|
|
54
53
|
initialValidators: initialValidators.map(a => a.toString()),
|
|
55
|
-
genesisBlockHash: genesisBlockHash.toString(),
|
|
56
54
|
genesisArchiveRoot: genesisArchiveRoot.toString(),
|
|
57
55
|
slashFactoryAddress: slashFactoryAddress.toString(),
|
|
58
56
|
},
|
|
@@ -64,7 +62,6 @@ export async function deployNewRollup(
|
|
|
64
62
|
log(`Rollup Address: ${rollup.address}`);
|
|
65
63
|
log(`Initial funded accounts: ${initialFundedAccounts.map(a => a.toString()).join(', ')}`);
|
|
66
64
|
log(`Initial validators: ${initialValidators.map(a => a.toString()).join(', ')}`);
|
|
67
|
-
log(`Genesis block hash: ${genesisBlockHash.toString()}`);
|
|
68
65
|
log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
|
|
69
66
|
log(`Slash Factory Address: ${slashFactoryAddress.toString()}`);
|
|
70
67
|
}
|
package/src/utils/aztec.ts
CHANGED
|
@@ -53,7 +53,6 @@ export async function deployAztecContracts(
|
|
|
53
53
|
salt: number | undefined,
|
|
54
54
|
initialValidators: EthAddress[],
|
|
55
55
|
genesisArchiveRoot: Fr,
|
|
56
|
-
genesisBlockHash: Fr,
|
|
57
56
|
feeJuicePortalInitialBalance: bigint,
|
|
58
57
|
acceleratedTestDeployments: boolean,
|
|
59
58
|
config: L1ContractsConfig,
|
|
@@ -78,7 +77,6 @@ export async function deployAztecContracts(
|
|
|
78
77
|
vkTreeRoot: getVKTreeRoot(),
|
|
79
78
|
protocolContractTreeRoot,
|
|
80
79
|
genesisArchiveRoot,
|
|
81
|
-
genesisBlockHash,
|
|
82
80
|
salt,
|
|
83
81
|
initialValidators,
|
|
84
82
|
acceleratedTestDeployments,
|
|
@@ -99,7 +97,6 @@ export async function deployNewRollupContracts(
|
|
|
99
97
|
salt: number | undefined,
|
|
100
98
|
initialValidators: EthAddress[],
|
|
101
99
|
genesisArchiveRoot: Fr,
|
|
102
|
-
genesisBlockHash: Fr,
|
|
103
100
|
feeJuicePortalInitialBalance: bigint,
|
|
104
101
|
config: L1ContractsConfig,
|
|
105
102
|
logger: Logger,
|
|
@@ -128,7 +125,6 @@ export async function deployNewRollupContracts(
|
|
|
128
125
|
vkTreeRoot: getVKTreeRoot(),
|
|
129
126
|
protocolContractTreeRoot,
|
|
130
127
|
genesisArchiveRoot,
|
|
131
|
-
genesisBlockHash,
|
|
132
128
|
initialValidators,
|
|
133
129
|
feeJuicePortalInitialBalance,
|
|
134
130
|
...config,
|