@aztec/cli 0.82.2-alpha-testnet.4 → 0.82.2-alpha-testnet.5
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 +7 -7
- package/dest/cmds/l1/deploy_new_rollup.d.ts.map +1 -1
- package/dest/cmds/l1/deploy_new_rollup.js +12 -8
- package/package.json +21 -21
- package/src/cmds/l1/deploy_l1_contracts.ts +7 -10
- package/src/cmds/l1/deploy_new_rollup.ts +11 -10
|
@@ -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"}
|
|
@@ -5,14 +5,10 @@ import { deployAztecContracts } from '../../utils/aztec.js';
|
|
|
5
5
|
import { getSponsoredFPCAddress } from '../../utils/setup_contracts.js';
|
|
6
6
|
export async function deployL1Contracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, testAccounts, sponsoredFPC, acceleratedTestDeployments, json, initialValidators, log, debugLogger) {
|
|
7
7
|
const config = getL1ContractsConfigEnvVars();
|
|
8
|
-
const
|
|
8
|
+
const initialAccounts = testAccounts ? await getInitialTestAccounts() : [];
|
|
9
9
|
const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
|
|
10
|
-
const
|
|
11
|
-
|
|
12
|
-
log(`Initial funded accounts: ${initialFundedAccounts.map((a)=>a.address.toString()).join(', ')}`);
|
|
13
|
-
log(`Initial validators: ${initialValidators.map((a)=>a.toString()).join(', ')}`);
|
|
14
|
-
log(`Genesis block hash: ${genesisBlockHash.toString()}`);
|
|
15
|
-
log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
|
|
10
|
+
const initialFundedAccounts = initialAccounts.map((a)=>a.address).concat(sponsoredFPCAddress);
|
|
11
|
+
const { genesisBlockHash, genesisArchiveRoot } = await getGenesisValues(initialFundedAccounts);
|
|
16
12
|
const { l1ContractAddresses } = await deployAztecContracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, genesisBlockHash, acceleratedTestDeployments, config, debugLogger);
|
|
17
13
|
if (json) {
|
|
18
14
|
log(JSON.stringify(Object.fromEntries(Object.entries(l1ContractAddresses).map(([k, v])=>[
|
|
@@ -33,5 +29,9 @@ export async function deployL1Contracts(rpcUrls, chainId, privateKey, mnemonic,
|
|
|
33
29
|
log(`Governance Address: ${l1ContractAddresses.governanceAddress.toString()}`);
|
|
34
30
|
log(`SlashFactory Address: ${l1ContractAddresses.slashFactoryAddress?.toString()}`);
|
|
35
31
|
log(`FeeAssetHandler Address: ${l1ContractAddresses.feeAssetHandlerAddress?.toString()}`);
|
|
32
|
+
log(`Initial funded accounts: ${initialFundedAccounts.map((a)=>a.toString()).join(', ')}`);
|
|
33
|
+
log(`Initial validators: ${initialValidators.map((a)=>a.toString()).join(', ')}`);
|
|
34
|
+
log(`Genesis block hash: ${genesisBlockHash.toString()}`);
|
|
35
|
+
log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
|
|
36
36
|
}
|
|
37
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,iBA+CpB"}
|
|
@@ -5,22 +5,26 @@ import { deployNewRollupContracts } from '../../utils/aztec.js';
|
|
|
5
5
|
import { getSponsoredFPCAddress } from '../../utils/setup_contracts.js';
|
|
6
6
|
export async function deployNewRollup(registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, testAccounts, sponsoredFPC, json, initialValidators, log, debugLogger) {
|
|
7
7
|
const config = getL1ContractsConfigEnvVars();
|
|
8
|
-
const
|
|
8
|
+
const initialAccounts = testAccounts ? await getInitialTestAccounts() : [];
|
|
9
9
|
const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
|
|
10
|
-
const
|
|
11
|
-
|
|
12
|
-
log(`Initial funded accounts: ${initialFundedAccounts.map((a)=>a.address.toString()).join(', ')}`);
|
|
13
|
-
log(`Initial validators: ${initialValidators.map((a)=>a.toString()).join(', ')}`);
|
|
14
|
-
log(`Genesis block hash: ${genesisBlockHash.toString()}`);
|
|
15
|
-
log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
|
|
10
|
+
const initialFundedAccounts = initialAccounts.map((a)=>a.address).concat(sponsoredFPCAddress);
|
|
11
|
+
const { genesisBlockHash, genesisArchiveRoot } = await getGenesisValues(initialFundedAccounts);
|
|
16
12
|
const { payloadAddress, rollup } = await deployNewRollupContracts(registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, genesisBlockHash, config, debugLogger);
|
|
17
13
|
if (json) {
|
|
18
14
|
log(JSON.stringify({
|
|
19
15
|
payloadAddress: payloadAddress.toString(),
|
|
20
|
-
rollupAddress: rollup.address
|
|
16
|
+
rollupAddress: rollup.address,
|
|
17
|
+
initialFundedAccounts: initialFundedAccounts.map((a)=>a.toString()),
|
|
18
|
+
initialValidators: initialValidators.map((a)=>a.toString()),
|
|
19
|
+
genesisBlockHash: genesisBlockHash.toString(),
|
|
20
|
+
genesisArchiveRoot: genesisArchiveRoot.toString()
|
|
21
21
|
}, null, 2));
|
|
22
22
|
} else {
|
|
23
23
|
log(`Payload Address: ${payloadAddress.toString()}`);
|
|
24
24
|
log(`Rollup Address: ${rollup.address}`);
|
|
25
|
+
log(`Initial funded accounts: ${initialFundedAccounts.map((a)=>a.toString()).join(', ')}`);
|
|
26
|
+
log(`Initial validators: ${initialValidators.map((a)=>a.toString()).join(', ')}`);
|
|
27
|
+
log(`Genesis block hash: ${genesisBlockHash.toString()}`);
|
|
28
|
+
log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
|
|
25
29
|
}
|
|
26
30
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/cli",
|
|
3
|
-
"version": "0.82.2-alpha-testnet.
|
|
3
|
+
"version": "0.82.2-alpha-testnet.5",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
"./contracts": "./dest/cmds/contracts/index.js",
|
|
@@ -67,15 +67,15 @@
|
|
|
67
67
|
]
|
|
68
68
|
},
|
|
69
69
|
"dependencies": {
|
|
70
|
-
"@aztec/archiver": "0.82.2-alpha-testnet.
|
|
71
|
-
"@aztec/aztec.js": "0.82.2-alpha-testnet.
|
|
72
|
-
"@aztec/constants": "0.82.2-alpha-testnet.
|
|
73
|
-
"@aztec/entrypoints": "0.82.2-alpha-testnet.
|
|
74
|
-
"@aztec/foundation": "0.82.2-alpha-testnet.
|
|
75
|
-
"@aztec/l1-artifacts": "0.82.2-alpha-testnet.
|
|
76
|
-
"@aztec/p2p": "0.82.2-alpha-testnet.
|
|
77
|
-
"@aztec/stdlib": "0.82.2-alpha-testnet.
|
|
78
|
-
"@aztec/world-state": "0.82.2-alpha-testnet.
|
|
70
|
+
"@aztec/archiver": "0.82.2-alpha-testnet.5",
|
|
71
|
+
"@aztec/aztec.js": "0.82.2-alpha-testnet.5",
|
|
72
|
+
"@aztec/constants": "0.82.2-alpha-testnet.5",
|
|
73
|
+
"@aztec/entrypoints": "0.82.2-alpha-testnet.5",
|
|
74
|
+
"@aztec/foundation": "0.82.2-alpha-testnet.5",
|
|
75
|
+
"@aztec/l1-artifacts": "0.82.2-alpha-testnet.5",
|
|
76
|
+
"@aztec/p2p": "0.82.2-alpha-testnet.5",
|
|
77
|
+
"@aztec/stdlib": "0.82.2-alpha-testnet.5",
|
|
78
|
+
"@aztec/world-state": "0.82.2-alpha-testnet.5",
|
|
79
79
|
"@iarna/toml": "^2.2.5",
|
|
80
80
|
"@libp2p/peer-id-factory": "^3.0.4",
|
|
81
81
|
"commander": "^12.1.0",
|
|
@@ -87,9 +87,9 @@
|
|
|
87
87
|
"viem": "2.23.7"
|
|
88
88
|
},
|
|
89
89
|
"devDependencies": {
|
|
90
|
-
"@aztec/accounts": "0.82.2-alpha-testnet.
|
|
91
|
-
"@aztec/ethereum": "0.82.2-alpha-testnet.
|
|
92
|
-
"@aztec/protocol-contracts": "0.82.2-alpha-testnet.
|
|
90
|
+
"@aztec/accounts": "0.82.2-alpha-testnet.5",
|
|
91
|
+
"@aztec/ethereum": "0.82.2-alpha-testnet.5",
|
|
92
|
+
"@aztec/protocol-contracts": "0.82.2-alpha-testnet.5",
|
|
93
93
|
"@jest/globals": "^29.5.0",
|
|
94
94
|
"@types/jest": "^29.5.0",
|
|
95
95
|
"@types/lodash.chunk": "^4.2.9",
|
|
@@ -105,14 +105,14 @@
|
|
|
105
105
|
"typescript": "^5.0.4"
|
|
106
106
|
},
|
|
107
107
|
"peerDependencies": {
|
|
108
|
-
"@aztec/accounts": "0.82.2-alpha-testnet.
|
|
109
|
-
"@aztec/bb-prover": "0.82.2-alpha-testnet.
|
|
110
|
-
"@aztec/ethereum": "0.82.2-alpha-testnet.
|
|
111
|
-
"@aztec/l1-artifacts": "0.82.2-alpha-testnet.
|
|
112
|
-
"@aztec/noir-contracts.js": "0.82.2-alpha-testnet.
|
|
113
|
-
"@aztec/noir-protocol-circuits-types": "0.82.2-alpha-testnet.
|
|
114
|
-
"@aztec/protocol-contracts": "0.82.2-alpha-testnet.
|
|
115
|
-
"@aztec/stdlib": "0.82.2-alpha-testnet.
|
|
108
|
+
"@aztec/accounts": "0.82.2-alpha-testnet.5",
|
|
109
|
+
"@aztec/bb-prover": "0.82.2-alpha-testnet.5",
|
|
110
|
+
"@aztec/ethereum": "0.82.2-alpha-testnet.5",
|
|
111
|
+
"@aztec/l1-artifacts": "0.82.2-alpha-testnet.5",
|
|
112
|
+
"@aztec/noir-contracts.js": "0.82.2-alpha-testnet.5",
|
|
113
|
+
"@aztec/noir-protocol-circuits-types": "0.82.2-alpha-testnet.5",
|
|
114
|
+
"@aztec/protocol-contracts": "0.82.2-alpha-testnet.5",
|
|
115
|
+
"@aztec/stdlib": "0.82.2-alpha-testnet.5"
|
|
116
116
|
},
|
|
117
117
|
"files": [
|
|
118
118
|
"dest",
|
|
@@ -24,17 +24,10 @@ export async function deployL1Contracts(
|
|
|
24
24
|
) {
|
|
25
25
|
const config = getL1ContractsConfigEnvVars();
|
|
26
26
|
|
|
27
|
-
const
|
|
27
|
+
const initialAccounts = testAccounts ? await getInitialTestAccounts() : [];
|
|
28
28
|
const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
|
|
29
|
-
const
|
|
30
|
-
|
|
31
|
-
);
|
|
32
|
-
|
|
33
|
-
log(`Deploying Aztec contracts to chain ${chainId}...`);
|
|
34
|
-
log(`Initial funded accounts: ${initialFundedAccounts.map(a => a.address.toString()).join(', ')}`);
|
|
35
|
-
log(`Initial validators: ${initialValidators.map(a => a.toString()).join(', ')}`);
|
|
36
|
-
log(`Genesis block hash: ${genesisBlockHash.toString()}`);
|
|
37
|
-
log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
|
|
29
|
+
const initialFundedAccounts = initialAccounts.map(a => a.address).concat(sponsoredFPCAddress);
|
|
30
|
+
const { genesisBlockHash, genesisArchiveRoot } = await getGenesisValues(initialFundedAccounts);
|
|
38
31
|
|
|
39
32
|
const { l1ContractAddresses } = await deployAztecContracts(
|
|
40
33
|
rpcUrls,
|
|
@@ -73,5 +66,9 @@ export async function deployL1Contracts(
|
|
|
73
66
|
log(`Governance Address: ${l1ContractAddresses.governanceAddress.toString()}`);
|
|
74
67
|
log(`SlashFactory Address: ${l1ContractAddresses.slashFactoryAddress?.toString()}`);
|
|
75
68
|
log(`FeeAssetHandler Address: ${l1ContractAddresses.feeAssetHandlerAddress?.toString()}`);
|
|
69
|
+
log(`Initial funded accounts: ${initialFundedAccounts.map(a => a.toString()).join(', ')}`);
|
|
70
|
+
log(`Initial validators: ${initialValidators.map(a => a.toString()).join(', ')}`);
|
|
71
|
+
log(`Genesis block hash: ${genesisBlockHash.toString()}`);
|
|
72
|
+
log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
|
|
76
73
|
}
|
|
77
74
|
}
|
|
@@ -24,17 +24,10 @@ export async function deployNewRollup(
|
|
|
24
24
|
) {
|
|
25
25
|
const config = getL1ContractsConfigEnvVars();
|
|
26
26
|
|
|
27
|
-
const
|
|
27
|
+
const initialAccounts = testAccounts ? await getInitialTestAccounts() : [];
|
|
28
28
|
const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
|
|
29
|
-
const
|
|
30
|
-
|
|
31
|
-
);
|
|
32
|
-
|
|
33
|
-
log(`Deploying new rollup contracts to chain ${chainId}...`);
|
|
34
|
-
log(`Initial funded accounts: ${initialFundedAccounts.map(a => a.address.toString()).join(', ')}`);
|
|
35
|
-
log(`Initial validators: ${initialValidators.map(a => a.toString()).join(', ')}`);
|
|
36
|
-
log(`Genesis block hash: ${genesisBlockHash.toString()}`);
|
|
37
|
-
log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
|
|
29
|
+
const initialFundedAccounts = initialAccounts.map(a => a.address).concat(sponsoredFPCAddress);
|
|
30
|
+
const { genesisBlockHash, genesisArchiveRoot } = await getGenesisValues(initialFundedAccounts);
|
|
38
31
|
|
|
39
32
|
const { payloadAddress, rollup } = await deployNewRollupContracts(
|
|
40
33
|
registryAddress,
|
|
@@ -57,6 +50,10 @@ export async function deployNewRollup(
|
|
|
57
50
|
{
|
|
58
51
|
payloadAddress: payloadAddress.toString(),
|
|
59
52
|
rollupAddress: rollup.address,
|
|
53
|
+
initialFundedAccounts: initialFundedAccounts.map(a => a.toString()),
|
|
54
|
+
initialValidators: initialValidators.map(a => a.toString()),
|
|
55
|
+
genesisBlockHash: genesisBlockHash.toString(),
|
|
56
|
+
genesisArchiveRoot: genesisArchiveRoot.toString(),
|
|
60
57
|
},
|
|
61
58
|
null,
|
|
62
59
|
2,
|
|
@@ -65,5 +62,9 @@ export async function deployNewRollup(
|
|
|
65
62
|
} else {
|
|
66
63
|
log(`Payload Address: ${payloadAddress.toString()}`);
|
|
67
64
|
log(`Rollup Address: ${rollup.address}`);
|
|
65
|
+
log(`Initial funded accounts: ${initialFundedAccounts.map(a => a.toString()).join(', ')}`);
|
|
66
|
+
log(`Initial validators: ${initialValidators.map(a => a.toString()).join(', ')}`);
|
|
67
|
+
log(`Genesis block hash: ${genesisBlockHash.toString()}`);
|
|
68
|
+
log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
|
|
68
69
|
}
|
|
69
70
|
}
|