@aztec/cli 0.87.2 → 0.87.3-nightly.20250529
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/infrastructure/sequencers.js +1 -1
- package/dest/cmds/l1/deploy_l1_contracts.d.ts +2 -2
- package/dest/cmds/l1/deploy_l1_contracts.d.ts.map +1 -1
- package/dest/cmds/l1/deploy_l1_contracts.js +2 -1
- package/dest/cmds/l1/deploy_new_rollup.d.ts +2 -1
- package/dest/cmds/l1/deploy_new_rollup.d.ts.map +1 -1
- package/dest/cmds/l1/deploy_new_rollup.js +2 -2
- package/dest/utils/aztec.d.ts +3 -3
- package/dest/utils/aztec.d.ts.map +1 -1
- package/dest/utils/aztec.js +6 -1
- package/package.json +22 -22
- package/src/cmds/infrastructure/sequencers.ts +1 -1
- package/src/cmds/l1/deploy_l1_contracts.ts +4 -4
- package/src/cmds/l1/deploy_new_rollup.ts +4 -4
- package/src/utils/aztec.ts +10 -4
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type Operator } from '@aztec/ethereum';
|
|
2
2
|
import type { LogFn, Logger } from '@aztec/foundation/log';
|
|
3
|
-
export declare function deployL1Contracts(rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, testAccounts: boolean, sponsoredFPC: boolean, acceleratedTestDeployments: boolean, json: boolean, initialValidators:
|
|
3
|
+
export declare function deployL1Contracts(rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, testAccounts: boolean, sponsoredFPC: boolean, acceleratedTestDeployments: boolean, json: boolean, initialValidators: Operator[], log: LogFn, debugLogger: Logger): Promise<void>;
|
|
4
4
|
//# sourceMappingURL=deploy_l1_contracts.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_l1_contracts.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_l1_contracts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,QAAQ,EAA+B,MAAM,iBAAiB,CAAC;AAC7E,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,QAAQ,EAAE,EAC7B,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBAoDpB"}
|
|
@@ -18,6 +18,7 @@ export async function deployL1Contracts(rpcUrls, chainId, privateKey, mnemonic,
|
|
|
18
18
|
} else {
|
|
19
19
|
log(`Rollup Address: ${l1ContractAddresses.rollupAddress.toString()}`);
|
|
20
20
|
log(`Registry Address: ${l1ContractAddresses.registryAddress.toString()}`);
|
|
21
|
+
log(`GSE Address: ${l1ContractAddresses.gseAddress?.toString()}`);
|
|
21
22
|
log(`L1 -> L2 Inbox Address: ${l1ContractAddresses.inboxAddress.toString()}`);
|
|
22
23
|
log(`L2 -> L1 Outbox Address: ${l1ContractAddresses.outboxAddress.toString()}`);
|
|
23
24
|
log(`Fee Juice Address: ${l1ContractAddresses.feeJuiceAddress.toString()}`);
|
|
@@ -31,7 +32,7 @@ export async function deployL1Contracts(rpcUrls, chainId, privateKey, mnemonic,
|
|
|
31
32
|
log(`FeeAssetHandler Address: ${l1ContractAddresses.feeAssetHandlerAddress?.toString()}`);
|
|
32
33
|
log(`StakingAssetHandler Address: ${l1ContractAddresses.stakingAssetHandlerAddress?.toString()}`);
|
|
33
34
|
log(`Initial funded accounts: ${initialFundedAccounts.map((a)=>a.toString()).join(', ')}`);
|
|
34
|
-
log(`Initial validators: ${initialValidators.map((a)=>a.toString()).join(', ')}`);
|
|
35
|
+
log(`Initial validators: ${initialValidators.map((a)=>a.attester.toString()).join(', ')}`);
|
|
35
36
|
log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
|
|
36
37
|
}
|
|
37
38
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
+
import { type Operator } from '@aztec/ethereum';
|
|
1
2
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
2
3
|
import type { LogFn, Logger } from '@aztec/foundation/log';
|
|
3
|
-
export declare function deployNewRollup(registryAddress: EthAddress, rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, testAccounts: boolean, sponsoredFPC: boolean, json: boolean, initialValidators:
|
|
4
|
+
export declare function deployNewRollup(registryAddress: EthAddress, rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, testAccounts: boolean, sponsoredFPC: boolean, json: boolean, initialValidators: Operator[], log: LogFn, debugLogger: Logger): Promise<void>;
|
|
4
5
|
//# sourceMappingURL=deploy_new_rollup.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy_new_rollup.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_new_rollup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"deploy_new_rollup.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_new_rollup.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,QAAQ,EAA+B,MAAM,iBAAiB,CAAC;AAC7E,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,QAAQ,EAAE,EAC7B,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBA6CpB"}
|
|
@@ -14,14 +14,14 @@ export async function deployNewRollup(registryAddress, rpcUrls, chainId, private
|
|
|
14
14
|
log(JSON.stringify({
|
|
15
15
|
rollupAddress: rollup.address,
|
|
16
16
|
initialFundedAccounts: initialFundedAccounts.map((a)=>a.toString()),
|
|
17
|
-
initialValidators: initialValidators.map((a)=>a.toString()),
|
|
17
|
+
initialValidators: initialValidators.map((a)=>a.attester.toString()),
|
|
18
18
|
genesisArchiveRoot: genesisArchiveRoot.toString(),
|
|
19
19
|
slashFactoryAddress: slashFactoryAddress.toString()
|
|
20
20
|
}, null, 2));
|
|
21
21
|
} else {
|
|
22
22
|
log(`Rollup Address: ${rollup.address}`);
|
|
23
23
|
log(`Initial funded accounts: ${initialFundedAccounts.map((a)=>a.toString()).join(', ')}`);
|
|
24
|
-
log(`Initial validators: ${initialValidators.map((a)=>a.toString()).join(', ')}`);
|
|
24
|
+
log(`Initial validators: ${initialValidators.map((a)=>a.attester.toString()).join(', ')}`);
|
|
25
25
|
log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
|
|
26
26
|
log(`Slash Factory Address: ${slashFactoryAddress.toString()}`);
|
|
27
27
|
}
|
package/dest/utils/aztec.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { EthAddress, type PXE } from '@aztec/aztec.js';
|
|
2
2
|
import { type ContractArtifact, type FunctionAbi } from '@aztec/aztec.js/abi';
|
|
3
|
-
import { type DeployL1ContractsReturnType, type L1ContractsConfig, RollupContract } from '@aztec/ethereum';
|
|
3
|
+
import { type DeployL1ContractsReturnType, type L1ContractsConfig, type Operator, RollupContract } from '@aztec/ethereum';
|
|
4
4
|
import type { Fr } from '@aztec/foundation/fields';
|
|
5
5
|
import type { LogFn, Logger } from '@aztec/foundation/log';
|
|
6
6
|
import type { NoirPackageConfig } from '@aztec/foundation/noir';
|
|
@@ -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:
|
|
22
|
-
export declare function deployNewRollupContracts(registryAddress: EthAddress, rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, initialValidators:
|
|
21
|
+
export declare function deployAztecContracts(rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, initialValidators: Operator[], 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: Operator[], 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,
|
|
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,EACtB,KAAK,QAAQ,EACb,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,QAAQ,EAAE,EAC7B,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,QAAQ,EAAE,EAC7B,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,GAAI,KAAK,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
|
@@ -53,8 +53,13 @@ export async function deployNewRollupContracts(registryAddress, rpcUrls, chainId
|
|
|
53
53
|
const client = createExtendedL1Client(rpcUrls, account, chain.chainInfo, undefined, mnemonicIndex);
|
|
54
54
|
if (!initialValidators || initialValidators.length === 0) {
|
|
55
55
|
// initialize the new rollup with Amin's validator address.
|
|
56
|
+
const amin = EthAddress.fromString('0x3b218d0F26d15B36C715cB06c949210a0d630637');
|
|
56
57
|
initialValidators = [
|
|
57
|
-
|
|
58
|
+
{
|
|
59
|
+
attester: amin,
|
|
60
|
+
proposerEOA: amin,
|
|
61
|
+
withdrawer: amin
|
|
62
|
+
}
|
|
58
63
|
];
|
|
59
64
|
logger.info('Initializing new rollup with old attesters', {
|
|
60
65
|
initialValidators
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/cli",
|
|
3
|
-
"version": "0.87.
|
|
3
|
+
"version": "0.87.3-nightly.20250529",
|
|
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.87.
|
|
69
|
-
"@aztec/aztec.js": "0.87.
|
|
70
|
-
"@aztec/constants": "0.87.
|
|
71
|
-
"@aztec/entrypoints": "0.87.
|
|
72
|
-
"@aztec/foundation": "0.87.
|
|
73
|
-
"@aztec/l1-artifacts": "0.87.
|
|
74
|
-
"@aztec/p2p": "0.87.
|
|
75
|
-
"@aztec/stdlib": "0.87.
|
|
76
|
-
"@aztec/world-state": "0.87.
|
|
68
|
+
"@aztec/archiver": "0.87.3-nightly.20250529",
|
|
69
|
+
"@aztec/aztec.js": "0.87.3-nightly.20250529",
|
|
70
|
+
"@aztec/constants": "0.87.3-nightly.20250529",
|
|
71
|
+
"@aztec/entrypoints": "0.87.3-nightly.20250529",
|
|
72
|
+
"@aztec/foundation": "0.87.3-nightly.20250529",
|
|
73
|
+
"@aztec/l1-artifacts": "0.87.3-nightly.20250529",
|
|
74
|
+
"@aztec/p2p": "0.87.3-nightly.20250529",
|
|
75
|
+
"@aztec/stdlib": "0.87.3-nightly.20250529",
|
|
76
|
+
"@aztec/world-state": "0.87.3-nightly.20250529",
|
|
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.87.
|
|
89
|
-
"@aztec/ethereum": "0.87.
|
|
90
|
-
"@aztec/protocol-contracts": "0.87.
|
|
88
|
+
"@aztec/accounts": "0.87.3-nightly.20250529",
|
|
89
|
+
"@aztec/ethereum": "0.87.3-nightly.20250529",
|
|
90
|
+
"@aztec/protocol-contracts": "0.87.3-nightly.20250529",
|
|
91
91
|
"@jest/globals": "^29.5.0",
|
|
92
92
|
"@types/jest": "^29.5.0",
|
|
93
93
|
"@types/lodash.chunk": "^4.2.9",
|
|
@@ -103,15 +103,15 @@
|
|
|
103
103
|
"typescript": "^5.3.3"
|
|
104
104
|
},
|
|
105
105
|
"peerDependencies": {
|
|
106
|
-
"@aztec/accounts": "0.87.
|
|
107
|
-
"@aztec/bb-prover": "0.87.
|
|
108
|
-
"@aztec/ethereum": "0.87.
|
|
109
|
-
"@aztec/l1-artifacts": "0.87.
|
|
110
|
-
"@aztec/noir-contracts.js": "0.87.
|
|
111
|
-
"@aztec/noir-protocol-circuits-types": "0.87.
|
|
112
|
-
"@aztec/noir-test-contracts.js": "0.87.
|
|
113
|
-
"@aztec/protocol-contracts": "0.87.
|
|
114
|
-
"@aztec/stdlib": "0.87.
|
|
106
|
+
"@aztec/accounts": "0.87.3-nightly.20250529",
|
|
107
|
+
"@aztec/bb-prover": "0.87.3-nightly.20250529",
|
|
108
|
+
"@aztec/ethereum": "0.87.3-nightly.20250529",
|
|
109
|
+
"@aztec/l1-artifacts": "0.87.3-nightly.20250529",
|
|
110
|
+
"@aztec/noir-contracts.js": "0.87.3-nightly.20250529",
|
|
111
|
+
"@aztec/noir-protocol-circuits-types": "0.87.3-nightly.20250529",
|
|
112
|
+
"@aztec/noir-test-contracts.js": "0.87.3-nightly.20250529",
|
|
113
|
+
"@aztec/protocol-contracts": "0.87.3-nightly.20250529",
|
|
114
|
+
"@aztec/stdlib": "0.87.3-nightly.20250529"
|
|
115
115
|
},
|
|
116
116
|
"files": [
|
|
117
117
|
"dest",
|
|
@@ -79,7 +79,7 @@ export async function sequencers(opts: {
|
|
|
79
79
|
].map(txHash => publicClient.waitForTransactionReceipt({ hash: txHash })),
|
|
80
80
|
);
|
|
81
81
|
|
|
82
|
-
const hash = await writeableRollup.write.deposit([who, who, who,
|
|
82
|
+
const hash = await writeableRollup.write.deposit([who, who, who, true]);
|
|
83
83
|
await publicClient.waitForTransactionReceipt({ hash });
|
|
84
84
|
log(`Added in tx ${hash}`);
|
|
85
85
|
} else if (command === 'remove') {
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { getInitialTestAccounts } from '@aztec/accounts/testing';
|
|
2
|
-
import { getL1ContractsConfigEnvVars } from '@aztec/ethereum';
|
|
3
|
-
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
2
|
+
import { type Operator, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
|
|
4
3
|
import type { LogFn, Logger } from '@aztec/foundation/log';
|
|
5
4
|
import { getGenesisValues } from '@aztec/world-state/testing';
|
|
6
5
|
|
|
@@ -18,7 +17,7 @@ export async function deployL1Contracts(
|
|
|
18
17
|
sponsoredFPC: boolean,
|
|
19
18
|
acceleratedTestDeployments: boolean,
|
|
20
19
|
json: boolean,
|
|
21
|
-
initialValidators:
|
|
20
|
+
initialValidators: Operator[],
|
|
22
21
|
log: LogFn,
|
|
23
22
|
debugLogger: Logger,
|
|
24
23
|
) {
|
|
@@ -55,6 +54,7 @@ export async function deployL1Contracts(
|
|
|
55
54
|
} else {
|
|
56
55
|
log(`Rollup Address: ${l1ContractAddresses.rollupAddress.toString()}`);
|
|
57
56
|
log(`Registry Address: ${l1ContractAddresses.registryAddress.toString()}`);
|
|
57
|
+
log(`GSE Address: ${l1ContractAddresses.gseAddress?.toString()}`);
|
|
58
58
|
log(`L1 -> L2 Inbox Address: ${l1ContractAddresses.inboxAddress.toString()}`);
|
|
59
59
|
log(`L2 -> L1 Outbox Address: ${l1ContractAddresses.outboxAddress.toString()}`);
|
|
60
60
|
log(`Fee Juice Address: ${l1ContractAddresses.feeJuiceAddress.toString()}`);
|
|
@@ -68,7 +68,7 @@ export async function deployL1Contracts(
|
|
|
68
68
|
log(`FeeAssetHandler Address: ${l1ContractAddresses.feeAssetHandlerAddress?.toString()}`);
|
|
69
69
|
log(`StakingAssetHandler Address: ${l1ContractAddresses.stakingAssetHandlerAddress?.toString()}`);
|
|
70
70
|
log(`Initial funded accounts: ${initialFundedAccounts.map(a => a.toString()).join(', ')}`);
|
|
71
|
-
log(`Initial validators: ${initialValidators.map(a => a.toString()).join(', ')}`);
|
|
71
|
+
log(`Initial validators: ${initialValidators.map(a => a.attester.toString()).join(', ')}`);
|
|
72
72
|
log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
|
|
73
73
|
}
|
|
74
74
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { getInitialTestAccounts } from '@aztec/accounts/testing';
|
|
2
|
-
import { getL1ContractsConfigEnvVars } from '@aztec/ethereum';
|
|
2
|
+
import { type Operator, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
|
|
3
3
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
4
|
import type { LogFn, Logger } from '@aztec/foundation/log';
|
|
5
5
|
import { getGenesisValues } from '@aztec/world-state/testing';
|
|
@@ -18,7 +18,7 @@ export async function deployNewRollup(
|
|
|
18
18
|
testAccounts: boolean,
|
|
19
19
|
sponsoredFPC: boolean,
|
|
20
20
|
json: boolean,
|
|
21
|
-
initialValidators:
|
|
21
|
+
initialValidators: Operator[],
|
|
22
22
|
log: LogFn,
|
|
23
23
|
debugLogger: Logger,
|
|
24
24
|
) {
|
|
@@ -50,7 +50,7 @@ export async function deployNewRollup(
|
|
|
50
50
|
{
|
|
51
51
|
rollupAddress: rollup.address,
|
|
52
52
|
initialFundedAccounts: initialFundedAccounts.map(a => a.toString()),
|
|
53
|
-
initialValidators: initialValidators.map(a => a.toString()),
|
|
53
|
+
initialValidators: initialValidators.map(a => a.attester.toString()),
|
|
54
54
|
genesisArchiveRoot: genesisArchiveRoot.toString(),
|
|
55
55
|
slashFactoryAddress: slashFactoryAddress.toString(),
|
|
56
56
|
},
|
|
@@ -61,7 +61,7 @@ export async function deployNewRollup(
|
|
|
61
61
|
} else {
|
|
62
62
|
log(`Rollup Address: ${rollup.address}`);
|
|
63
63
|
log(`Initial funded accounts: ${initialFundedAccounts.map(a => a.toString()).join(', ')}`);
|
|
64
|
-
log(`Initial validators: ${initialValidators.map(a => a.toString()).join(', ')}`);
|
|
64
|
+
log(`Initial validators: ${initialValidators.map(a => a.attester.toString()).join(', ')}`);
|
|
65
65
|
log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
|
|
66
66
|
log(`Slash Factory Address: ${slashFactoryAddress.toString()}`);
|
|
67
67
|
}
|
package/src/utils/aztec.ts
CHANGED
|
@@ -6,7 +6,12 @@ import {
|
|
|
6
6
|
getAllFunctionAbis,
|
|
7
7
|
loadContractArtifact,
|
|
8
8
|
} from '@aztec/aztec.js/abi';
|
|
9
|
-
import {
|
|
9
|
+
import {
|
|
10
|
+
type DeployL1ContractsReturnType,
|
|
11
|
+
type L1ContractsConfig,
|
|
12
|
+
type Operator,
|
|
13
|
+
RollupContract,
|
|
14
|
+
} from '@aztec/ethereum';
|
|
10
15
|
import type { Fr } from '@aztec/foundation/fields';
|
|
11
16
|
import type { LogFn, Logger } from '@aztec/foundation/log';
|
|
12
17
|
import type { NoirPackageConfig } from '@aztec/foundation/noir';
|
|
@@ -46,7 +51,7 @@ export async function deployAztecContracts(
|
|
|
46
51
|
mnemonic: string,
|
|
47
52
|
mnemonicIndex: number,
|
|
48
53
|
salt: number | undefined,
|
|
49
|
-
initialValidators:
|
|
54
|
+
initialValidators: Operator[],
|
|
50
55
|
genesisArchiveRoot: Fr,
|
|
51
56
|
feeJuicePortalInitialBalance: bigint,
|
|
52
57
|
acceleratedTestDeployments: boolean,
|
|
@@ -90,7 +95,7 @@ export async function deployNewRollupContracts(
|
|
|
90
95
|
mnemonic: string,
|
|
91
96
|
mnemonicIndex: number,
|
|
92
97
|
salt: number | undefined,
|
|
93
|
-
initialValidators:
|
|
98
|
+
initialValidators: Operator[],
|
|
94
99
|
genesisArchiveRoot: Fr,
|
|
95
100
|
feeJuicePortalInitialBalance: bigint,
|
|
96
101
|
config: L1ContractsConfig,
|
|
@@ -108,7 +113,8 @@ export async function deployNewRollupContracts(
|
|
|
108
113
|
|
|
109
114
|
if (!initialValidators || initialValidators.length === 0) {
|
|
110
115
|
// initialize the new rollup with Amin's validator address.
|
|
111
|
-
|
|
116
|
+
const amin = EthAddress.fromString('0x3b218d0F26d15B36C715cB06c949210a0d630637');
|
|
117
|
+
initialValidators = [{ attester: amin, proposerEOA: amin, withdrawer: amin }];
|
|
112
118
|
logger.info('Initializing new rollup with old attesters', { initialValidators });
|
|
113
119
|
}
|
|
114
120
|
|