@aztec-labs/cli 7.0.0-nightly.20261108 → 7.0.0-nightly.20261109
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_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 +2 -1
- package/dest/cmds/validator_keys/shared.d.ts +1 -1
- package/dest/cmds/validator_keys/shared.d.ts.map +1 -1
- package/dest/cmds/validator_keys/shared.js +3 -6
- package/package.json +21 -21
- package/src/cmds/l1/deploy_l1_contracts_cmd.ts +2 -1
- package/src/cmds/validator_keys/shared.ts +3 -2
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { EthAddress } from '@aztec-labs/aztec.js/addresses';
|
|
2
2
|
import type { LogFn, Logger } from '@aztec-labs/foundation/log';
|
|
3
3
|
export declare function deployL1ContractsCmd(rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, testAccounts: boolean, sponsoredFPC: boolean, json: boolean, initialValidators: EthAddress[], realVerifier: boolean, existingToken: EthAddress | undefined, log: LogFn, debugLogger: Logger): Promise<void>;
|
|
4
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
4
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X2wxX2NvbnRyYWN0c19jbWQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbWRzL2wxL2RlcGxveV9sMV9jb250cmFjdHNfY21kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBS2pFLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQVVoRSx3QkFBc0Isb0JBQW9CLENBQ3hDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFDakIsT0FBTyxFQUFFLE1BQU0sRUFDZixVQUFVLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDOUIsUUFBUSxFQUFFLE1BQU0sRUFDaEIsYUFBYSxFQUFFLE1BQU0sRUFDckIsWUFBWSxFQUFFLE9BQU8sRUFDckIsWUFBWSxFQUFFLE9BQU8sRUFDckIsSUFBSSxFQUFFLE9BQU8sRUFDYixpQkFBaUIsRUFBRSxVQUFVLEVBQUUsRUFDL0IsWUFBWSxFQUFFLE9BQU8sRUFDckIsYUFBYSxFQUFFLFVBQVUsR0FBRyxTQUFTLEVBQ3JDLEdBQUcsRUFBRSxLQUFLLEVBQ1YsV0FBVyxFQUFFLE1BQU0saUJBNkVwQiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy_l1_contracts_cmd.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_l1_contracts_cmd.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAKjE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy_l1_contracts_cmd.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_l1_contracts_cmd.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAKjE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAUhE,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,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,EACb,iBAAiB,EAAE,UAAU,EAAE,EAC/B,YAAY,EAAE,OAAO,EACrB,aAAa,EAAE,UAAU,GAAG,SAAS,EACrC,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBA6EpB"}
|
|
@@ -3,6 +3,7 @@ import { randomStakeableBn254SecretKey } from '@aztec-labs/ethereum/bn254';
|
|
|
3
3
|
import { getL1ContractsConfigEnvVars } from '@aztec-labs/ethereum/config';
|
|
4
4
|
import { deployAztecL1Contracts } from '@aztec-labs/ethereum/deploy-aztec-l1-contracts';
|
|
5
5
|
import { SecretValue } from '@aztec-labs/foundation/config';
|
|
6
|
+
import { bufferToHex } from '@aztec-labs/foundation/string';
|
|
6
7
|
import { protocolContractsHash } from '@aztec-labs/protocol-contracts';
|
|
7
8
|
import { getGenesisValues } from '@aztec-labs/world-state/testing';
|
|
8
9
|
import { Buffer } from 'buffer';
|
|
@@ -27,7 +28,7 @@ export async function deployL1ContractsCmd(rpcUrls, chainId, privateKey, mnemoni
|
|
|
27
28
|
const account = mnemonicToAccount(mnemonic, {
|
|
28
29
|
addressIndex: mnemonicIndex
|
|
29
30
|
});
|
|
30
|
-
deployerPrivateKey =
|
|
31
|
+
deployerPrivateKey = bufferToHex(Buffer.from(account.getHdKey().privateKey));
|
|
31
32
|
}
|
|
32
33
|
// Prepare validator operators with bn254 keys
|
|
33
34
|
const initialValidatorOperators = initialValidators.map((a)=>({
|
|
@@ -103,4 +103,4 @@ export declare function writeEthJsonV3ToFile(validators: ValidatorKeyStore[], op
|
|
|
103
103
|
outDir: string;
|
|
104
104
|
password: string;
|
|
105
105
|
}): Promise<void>;
|
|
106
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
106
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY21kcy92YWxpZGF0b3Jfa2V5cy9zaGFyZWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBTUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQ3hELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxhQUFhLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNwRyxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQVVyRSxPQUFPLEVBQ0wsS0FBSyxzQkFBc0IsRUFDM0IsS0FBSyxpQkFBaUIsRUFHdkIsTUFBTSx5QkFBeUIsQ0FBQztBQW1EakMsTUFBTSxNQUFNLGdCQUFnQixHQUFHO0lBQzdCLFdBQVcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNyQixXQUFXLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDckIscUdBQXFHO0lBQ3JHLE9BQU8sQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNqQixnR0FBZ0c7SUFDaEcsWUFBWSxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ3RCLDBHQUEwRztJQUMxRyxTQUFTLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDbkIsWUFBWSxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUM7Q0FDekIsQ0FBQztBQUVGLE1BQU0sTUFBTSxvQkFBb0IsR0FBRztJQUNqQyxjQUFjLEVBQUUsTUFBTSxDQUFDO0lBQ3ZCLGNBQWMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN4QixVQUFVLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUN0QixZQUFZLEVBQUUsTUFBTSxDQUFDO0lBQ3JCLGdCQUFnQixFQUFFLE1BQU0sQ0FBQztJQUN6QixRQUFRLEVBQUUsTUFBTSxDQUFDO0lBQ2pCLEdBQUcsQ0FBQyxFQUFFLE1B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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../src/cmds/validator_keys/shared.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../src/cmds/validator_keys/shared.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { prettyPrintJSON } from '@aztec-labs/cli/utils';
|
|
2
2
|
import { asyncPool } from '@aztec-labs/foundation/async-pool';
|
|
3
|
+
import { times } from '@aztec-labs/foundation/collection';
|
|
3
4
|
import { getEnv } from '@aztec-labs/foundation/config/env';
|
|
4
5
|
import { createBn254Keystore } from '@aztec-labs/foundation/crypto/bls/bn254_keystore';
|
|
5
6
|
import { computeBn254G1PublicKeyCompressed } from '@aztec-labs/foundation/crypto/bn254';
|
|
@@ -117,9 +118,7 @@ export function deriveEthAttester(mnemonic, baseAccountIndex, addressIndex, remo
|
|
|
117
118
|
export async function buildValidatorEntries(input) {
|
|
118
119
|
const { validatorCount, publisherCount = 0, publishers, accountIndex, baseAddressIndex, mnemonic, ikm, blsPath, feeRecipient, coinbase, remoteSigner, blsKeyDerivation = resolveBlsKeyDerivationPolicy({}), generatedMnemonic } = input;
|
|
119
120
|
const summaries = [];
|
|
120
|
-
const validators = await Promise.all(
|
|
121
|
-
length: validatorCount
|
|
122
|
-
}, async (_unused, i)=>{
|
|
121
|
+
const validators = await Promise.all(times(validatorCount, async (i)=>{
|
|
123
122
|
const addressIndex = baseAddressIndex + i;
|
|
124
123
|
const basePath = blsPath ?? defaultBlsPath;
|
|
125
124
|
const perValidatorPath = withValidatorIndex(basePath, accountIndex, addressIndex);
|
|
@@ -143,9 +142,7 @@ export async function buildValidatorEntries(input) {
|
|
|
143
142
|
publisherField = publishers.length === 1 ? publishers[0] : publishers;
|
|
144
143
|
} else if (publisherCount > 0) {
|
|
145
144
|
const publishersBaseIndex = baseAddressIndex + validatorCount + i * publisherCount;
|
|
146
|
-
const publisherAccounts =
|
|
147
|
-
length: publisherCount
|
|
148
|
-
}, (_unused2, j)=>{
|
|
145
|
+
const publisherAccounts = times(publisherCount, (j)=>{
|
|
149
146
|
const publisherAddressIndex = publishersBaseIndex + j;
|
|
150
147
|
const pubAcct = mnemonicToAccount(mnemonic, {
|
|
151
148
|
accountIndex,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec-labs/cli",
|
|
3
|
-
"version": "7.0.0-nightly.
|
|
3
|
+
"version": "7.0.0-nightly.20261109",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
"./devnet": "./dest/cmds/devnet/index.js",
|
|
@@ -77,18 +77,18 @@
|
|
|
77
77
|
},
|
|
78
78
|
"dependencies": {
|
|
79
79
|
"@aztec-foundation/l1-artifacts": "6.0.0-rc.7",
|
|
80
|
-
"@aztec-labs/accounts": "7.0.0-nightly.
|
|
81
|
-
"@aztec-labs/archiver": "7.0.0-nightly.
|
|
82
|
-
"@aztec-labs/aztec.js": "7.0.0-nightly.
|
|
83
|
-
"@aztec-labs/constants": "7.0.0-nightly.
|
|
84
|
-
"@aztec-labs/ethereum": "7.0.0-nightly.
|
|
85
|
-
"@aztec-labs/foundation": "7.0.0-nightly.
|
|
86
|
-
"@aztec-labs/node-keystore": "7.0.0-nightly.
|
|
87
|
-
"@aztec-labs/p2p": "7.0.0-nightly.
|
|
88
|
-
"@aztec-labs/protocol-contracts": "7.0.0-nightly.
|
|
89
|
-
"@aztec-labs/stdlib": "7.0.0-nightly.
|
|
90
|
-
"@aztec-labs/wallets": "7.0.0-nightly.
|
|
91
|
-
"@aztec-labs/world-state": "7.0.0-nightly.
|
|
80
|
+
"@aztec-labs/accounts": "7.0.0-nightly.20261109",
|
|
81
|
+
"@aztec-labs/archiver": "7.0.0-nightly.20261109",
|
|
82
|
+
"@aztec-labs/aztec.js": "7.0.0-nightly.20261109",
|
|
83
|
+
"@aztec-labs/constants": "7.0.0-nightly.20261109",
|
|
84
|
+
"@aztec-labs/ethereum": "7.0.0-nightly.20261109",
|
|
85
|
+
"@aztec-labs/foundation": "7.0.0-nightly.20261109",
|
|
86
|
+
"@aztec-labs/node-keystore": "7.0.0-nightly.20261109",
|
|
87
|
+
"@aztec-labs/p2p": "7.0.0-nightly.20261109",
|
|
88
|
+
"@aztec-labs/protocol-contracts": "7.0.0-nightly.20261109",
|
|
89
|
+
"@aztec-labs/stdlib": "7.0.0-nightly.20261109",
|
|
90
|
+
"@aztec-labs/wallets": "7.0.0-nightly.20261109",
|
|
91
|
+
"@aztec-labs/world-state": "7.0.0-nightly.20261109",
|
|
92
92
|
"@ethersproject/wallet": "^5.8.0",
|
|
93
93
|
"@iarna/toml": "^2.2.5",
|
|
94
94
|
"@libp2p/peer-id-factory": "^3.0.4",
|
|
@@ -119,14 +119,14 @@
|
|
|
119
119
|
},
|
|
120
120
|
"peerDependencies": {
|
|
121
121
|
"@aztec-foundation/l1-artifacts": "6.0.0-rc.7",
|
|
122
|
-
"@aztec-labs/accounts": "7.0.0-nightly.
|
|
123
|
-
"@aztec-labs/bb-prover": "7.0.0-nightly.
|
|
124
|
-
"@aztec-labs/ethereum": "7.0.0-nightly.
|
|
125
|
-
"@aztec-labs/noir-contracts.js": "7.0.0-nightly.
|
|
126
|
-
"@aztec-labs/noir-protocol-circuits-types": "7.0.0-nightly.
|
|
127
|
-
"@aztec-labs/noir-test-contracts.js": "7.0.0-nightly.
|
|
128
|
-
"@aztec-labs/protocol-contracts": "7.0.0-nightly.
|
|
129
|
-
"@aztec-labs/stdlib": "7.0.0-nightly.
|
|
122
|
+
"@aztec-labs/accounts": "7.0.0-nightly.20261109",
|
|
123
|
+
"@aztec-labs/bb-prover": "7.0.0-nightly.20261109",
|
|
124
|
+
"@aztec-labs/ethereum": "7.0.0-nightly.20261109",
|
|
125
|
+
"@aztec-labs/noir-contracts.js": "7.0.0-nightly.20261109",
|
|
126
|
+
"@aztec-labs/noir-protocol-circuits-types": "7.0.0-nightly.20261109",
|
|
127
|
+
"@aztec-labs/noir-test-contracts.js": "7.0.0-nightly.20261109",
|
|
128
|
+
"@aztec-labs/protocol-contracts": "7.0.0-nightly.20261109",
|
|
129
|
+
"@aztec-labs/stdlib": "7.0.0-nightly.20261109"
|
|
130
130
|
},
|
|
131
131
|
"files": [
|
|
132
132
|
"dest",
|
|
@@ -5,6 +5,7 @@ import { getL1ContractsConfigEnvVars } from '@aztec-labs/ethereum/config';
|
|
|
5
5
|
import { type Operator, deployAztecL1Contracts } from '@aztec-labs/ethereum/deploy-aztec-l1-contracts';
|
|
6
6
|
import { SecretValue } from '@aztec-labs/foundation/config';
|
|
7
7
|
import type { LogFn, Logger } from '@aztec-labs/foundation/log';
|
|
8
|
+
import { bufferToHex } from '@aztec-labs/foundation/string';
|
|
8
9
|
import { protocolContractsHash } from '@aztec-labs/protocol-contracts';
|
|
9
10
|
import { getGenesisValues } from '@aztec-labs/world-state/testing';
|
|
10
11
|
import { Buffer } from 'buffer';
|
|
@@ -46,7 +47,7 @@ export async function deployL1ContractsCmd(
|
|
|
46
47
|
deployerPrivateKey = addLeadingHex(privateKey);
|
|
47
48
|
} else {
|
|
48
49
|
const account = mnemonicToAccount(mnemonic!, { addressIndex: mnemonicIndex });
|
|
49
|
-
deployerPrivateKey =
|
|
50
|
+
deployerPrivateKey = bufferToHex(Buffer.from(account.getHdKey().privateKey!));
|
|
50
51
|
}
|
|
51
52
|
|
|
52
53
|
// Prepare validator operators with bn254 keys
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { prettyPrintJSON } from '@aztec-labs/cli/utils';
|
|
2
2
|
import { asyncPool } from '@aztec-labs/foundation/async-pool';
|
|
3
|
+
import { times } from '@aztec-labs/foundation/collection';
|
|
3
4
|
import { getEnv } from '@aztec-labs/foundation/config/env';
|
|
4
5
|
import { createBn254Keystore } from '@aztec-labs/foundation/crypto/bls/bn254_keystore';
|
|
5
6
|
import { computeBn254G1PublicKeyCompressed } from '@aztec-labs/foundation/crypto/bn254';
|
|
@@ -181,7 +182,7 @@ export async function buildValidatorEntries(input: BuildValidatorsInput) {
|
|
|
181
182
|
const summaries: ValidatorSummary[] = [];
|
|
182
183
|
|
|
183
184
|
const validators = await Promise.all(
|
|
184
|
-
|
|
185
|
+
times(validatorCount, async i => {
|
|
185
186
|
const addressIndex = baseAddressIndex + i;
|
|
186
187
|
const basePath = blsPath ?? defaultBlsPath;
|
|
187
188
|
const perValidatorPath = withValidatorIndex(basePath, accountIndex, addressIndex);
|
|
@@ -203,7 +204,7 @@ export async function buildValidatorEntries(input: BuildValidatorsInput) {
|
|
|
203
204
|
publisherField = publishers.length === 1 ? (publishers[0] as EthPrivateKey) : (publishers as EthPrivateKey[]);
|
|
204
205
|
} else if (publisherCount > 0) {
|
|
205
206
|
const publishersBaseIndex = baseAddressIndex + validatorCount + i * publisherCount;
|
|
206
|
-
const publisherAccounts =
|
|
207
|
+
const publisherAccounts = times(publisherCount, j => {
|
|
207
208
|
const publisherAddressIndex = publishersBaseIndex + j;
|
|
208
209
|
const pubAcct = mnemonicToAccount(mnemonic, {
|
|
209
210
|
accountIndex,
|