@aztec/cli 0.82.2 → 0.82.3-nightly.20250330
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/devnet/bootstrap_network.d.ts.map +1 -1
- package/dest/cmds/devnet/bootstrap_network.js +6 -2
- package/dest/cmds/l1/deploy_new_rollup.d.ts.map +1 -1
- package/dest/cmds/l1/deploy_new_rollup.js +4 -2
- package/dest/cmds/l1/governance_utils.js +1 -1
- package/dest/cmds/l1/index.js +1 -1
- package/dest/utils/aztec.d.ts +1 -0
- package/dest/utils/aztec.d.ts.map +1 -1
- package/dest/utils/aztec.js +3 -2
- package/package.json +21 -21
- package/src/cmds/devnet/bootstrap_network.ts +7 -2
- package/src/cmds/l1/deploy_new_rollup.ts +3 -1
- package/src/cmds/l1/governance_utils.ts +1 -1
- package/src/cmds/l1/index.ts +1 -1
- package/src/utils/aztec.ts +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrap_network.d.ts","sourceRoot":"","sources":["../../../src/cmds/devnet/bootstrap_network.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAqB3D,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EAAE,EAChB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,KAAK,MAAM,EAAE,GAAG,SAAS,EACvC,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,KAAK,EACV,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"bootstrap_network.d.ts","sourceRoot":"","sources":["../../../src/cmds/devnet/bootstrap_network.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAqB3D,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EAAE,EAChB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,KAAK,MAAM,EAAE,GAAG,SAAS,EACvC,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,KAAK,EACV,QAAQ,EAAE,MAAM,iBAiFjB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getInitialTestAccountsManagers } from '@aztec/accounts/testing';
|
|
2
2
|
import { BatchCall, Fr, L1FeeJuicePortalManager, createCompatibleClient, retryUntil, waitForProven } from '@aztec/aztec.js';
|
|
3
3
|
import { createEthereumChain, createL1Clients, deployL1Contract } from '@aztec/ethereum';
|
|
4
4
|
import { getContract } from 'viem';
|
|
@@ -13,7 +13,11 @@ const provenWaitOpts = {
|
|
|
13
13
|
};
|
|
14
14
|
export async function bootstrapNetwork(pxeUrl, l1Urls, l1ChainId, l1PrivateKey, l1Mnemonic, addressIndex, json, log, debugLog) {
|
|
15
15
|
const pxe = await createCompatibleClient(pxeUrl, debugLog);
|
|
16
|
-
|
|
16
|
+
// We assume here that the initial test accounts were prefunded with deploy-l1-contracts, and deployed with setup-l2-contracts
|
|
17
|
+
// so all we need to do is register them to our pxe.
|
|
18
|
+
const [accountManager] = await getInitialTestAccountsManagers(pxe);
|
|
19
|
+
await accountManager.register();
|
|
20
|
+
const wallet = await accountManager.getWallet();
|
|
17
21
|
const l1Clients = createL1Clients(l1Urls, l1PrivateKey ? privateKeyToAccount(l1PrivateKey) : // Note that this account needs to be funded on L1 !
|
|
18
22
|
mnemonicToAccount(l1Mnemonic, {
|
|
19
23
|
addressIndex
|
|
@@ -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;AAK3D,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,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;AAK3D,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,IAAI,EAAE,OAAO,EACb,iBAAiB,EAAE,UAAU,EAAE,EAC/B,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBAuCpB"}
|
|
@@ -6,14 +6,16 @@ export async function deployNewRollup(registryAddress, rpcUrls, chainId, private
|
|
|
6
6
|
const config = getL1ContractsConfigEnvVars();
|
|
7
7
|
const initialFundedAccounts = testAccounts ? await getInitialTestAccounts() : [];
|
|
8
8
|
const { genesisBlockHash, genesisArchiveRoot } = await getGenesisValues(initialFundedAccounts.map((a)=>a.address));
|
|
9
|
-
const { payloadAddress, rollup } = await deployNewRollupContracts(registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, genesisBlockHash, config, debugLogger);
|
|
9
|
+
const { payloadAddress, rollup, slashFactoryAddress } = await deployNewRollupContracts(registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, genesisBlockHash, config, debugLogger);
|
|
10
10
|
if (json) {
|
|
11
11
|
log(JSON.stringify({
|
|
12
12
|
payloadAddress: payloadAddress.toString(),
|
|
13
|
-
rollupAddress: rollup.address
|
|
13
|
+
rollupAddress: rollup.address,
|
|
14
|
+
slashFactoryAddress: slashFactoryAddress.toString()
|
|
14
15
|
}, null, 2));
|
|
15
16
|
} else {
|
|
16
17
|
log(`Payload Address: ${payloadAddress.toString()}`);
|
|
17
18
|
log(`Rollup Address: ${rollup.address}`);
|
|
19
|
+
log(`Slash Factory Address: ${slashFactoryAddress.toString()}`);
|
|
18
20
|
}
|
|
19
21
|
}
|
|
@@ -5,7 +5,7 @@ export async function depositGovernanceTokens({ registryAddress, rpcUrls, chainI
|
|
|
5
5
|
const { publicClient, walletClient } = createL1Clients(rpcUrls, privateKey ?? mnemonic, chain.chainInfo, mnemonicIndex);
|
|
6
6
|
const addresses = await RegistryContract.collectAddresses(publicClient, registryAddress, 'canonical');
|
|
7
7
|
const governanceAddress = addresses.governanceAddress.toString();
|
|
8
|
-
const tokenAddress = addresses.
|
|
8
|
+
const tokenAddress = addresses.stakingAssetAddress.toString();
|
|
9
9
|
const feeJuice = new FeeJuiceContract(tokenAddress, publicClient, walletClient);
|
|
10
10
|
const governance = new GovernanceContract(governanceAddress, publicClient, walletClient);
|
|
11
11
|
if (mint) {
|
package/dest/cmds/l1/index.js
CHANGED
|
@@ -9,7 +9,7 @@ export function injectCommands(program, log, debugLogger) {
|
|
|
9
9
|
program.command('deploy-l1-contracts').description('Deploys all necessary Ethereum contracts for Aztec.').addOption(l1RpcUrlsOption).option('-pk, --private-key <string>', 'The private key to use for deployment', PRIVATE_KEY).option('--validators <string>', 'Comma separated list of validators').option('-m, --mnemonic <string>', 'The mnemonic to use in deployment', 'test test test test test test test test test test test junk').option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use in deployment', (arg)=>parseInt(arg), 0).addOption(l1ChainIdOption).option('--salt <number>', 'The optional salt to use in deployment', (arg)=>parseInt(arg)).option('--json', 'Output the contract addresses in JSON format').option('--test-accounts', 'Populate genesis state with initial fee juice for test accounts').option('--sponsored-fpc', 'Populate genesis state with a testing sponsored FPC contract').option('--accelerated-test-deployments', 'Fire and forget deployment transactions, use in testing only', false).action(async (options)=>{
|
|
10
10
|
const { deployL1Contracts } = await import('./deploy_l1_contracts.js');
|
|
11
11
|
const initialValidators = options.validators?.split(',').map((validator)=>EthAddress.fromString(validator)) || [];
|
|
12
|
-
await deployL1Contracts(options.l1RpcUrls, options.l1ChainId, options.privateKey, options.mnemonic, options.mnemonicIndex, options.salt, options.testAccounts, options.
|
|
12
|
+
await deployL1Contracts(options.l1RpcUrls, options.l1ChainId, options.privateKey, options.mnemonic, options.mnemonicIndex, options.salt, options.testAccounts, options.sponsoredFpc, options.acceleratedTestDeployments, options.json, initialValidators, log, debugLogger);
|
|
13
13
|
});
|
|
14
14
|
program.command('deploy-new-rollup').description('Deploys a new rollup contract and a payload to upgrade the registry with it.').requiredOption('-r, --registry-address <string>', 'The address of the registry contract', parseEthereumAddress).addOption(l1RpcUrlsOption).option('-pk, --private-key <string>', 'The private key to use for deployment', PRIVATE_KEY).option('--validators <string>', 'Comma separated list of validators').option('-m, --mnemonic <string>', 'The mnemonic to use in deployment', 'test test test test test test test test test test test junk').option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use in deployment', (arg)=>parseInt(arg), 0).addOption(l1ChainIdOption).option('--salt <number>', 'The optional salt to use in deployment', (arg)=>parseInt(arg)).option('--json', 'Output the contract addresses in JSON format').option('--test-accounts', 'Populate genesis state with initial fee juice for test accounts').action(async (options)=>{
|
|
15
15
|
const { deployNewRollup } = await import('./deploy_new_rollup.js');
|
package/dest/utils/aztec.d.ts
CHANGED
|
@@ -22,6 +22,7 @@ export declare function deployAztecContracts(rpcUrls: string[], chainId: number,
|
|
|
22
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, genesisBlockHash: Fr, config: L1ContractsConfig, logger: Logger): Promise<{
|
|
23
23
|
payloadAddress: EthAddress;
|
|
24
24
|
rollup: RollupContract;
|
|
25
|
+
slashFactoryAddress: EthAddress;
|
|
25
26
|
}>;
|
|
26
27
|
/**
|
|
27
28
|
* Gets all contracts available in \@aztec/noir-contracts.js.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aztec.d.ts","sourceRoot":"","sources":["../../src/utils/aztec.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAIjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,2BAA2B,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtG,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,gBAAgB,EAAE,EAAE,EACpB,0BAA0B,EAAE,OAAO,EACnC,MAAM,EAAE,iBAAiB,EACzB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,2BAA2B,CAAC,CA6BtC;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,gBAAgB,EAAE,EAAE,EACpB,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,cAAc,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,cAAc,CAAA;CAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"aztec.d.ts","sourceRoot":"","sources":["../../src/utils/aztec.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAIjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,2BAA2B,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtG,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,gBAAgB,EAAE,EAAE,EACpB,0BAA0B,EAAE,OAAO,EACnC,MAAM,EAAE,iBAAiB,EACzB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,2BAA2B,CAAC,CA6BtC;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,gBAAgB,EAAE,EAAE,EACpB,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,cAAc,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,cAAc,CAAC;IAAC,mBAAmB,EAAE,UAAU,CAAA;CAAE,CAAC,CA6BlG;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
|
@@ -51,7 +51,7 @@ export async function deployNewRollupContracts(registryAddress, rpcUrls, chainId
|
|
|
51
51
|
}) : privateKeyToAccount(`${privateKey.startsWith('0x') ? '' : '0x'}${privateKey}`);
|
|
52
52
|
const chain = createEthereumChain(rpcUrls, chainId);
|
|
53
53
|
const clients = createL1Clients(rpcUrls, account, chain.chainInfo, mnemonicIndex);
|
|
54
|
-
const { payloadAddress, rollup } = await deployRollupForUpgrade(clients, {
|
|
54
|
+
const { payloadAddress, rollup, slashFactoryAddress } = await deployRollupForUpgrade(clients, {
|
|
55
55
|
salt,
|
|
56
56
|
vkTreeRoot: getVKTreeRoot(),
|
|
57
57
|
protocolContractTreeRoot,
|
|
@@ -63,7 +63,8 @@ export async function deployNewRollupContracts(registryAddress, rpcUrls, chainId
|
|
|
63
63
|
}, registryAddress, logger, config);
|
|
64
64
|
return {
|
|
65
65
|
payloadAddress,
|
|
66
|
-
rollup
|
|
66
|
+
rollup,
|
|
67
|
+
slashFactoryAddress
|
|
67
68
|
};
|
|
68
69
|
}
|
|
69
70
|
/**
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/cli",
|
|
3
|
-
"version": "0.82.
|
|
3
|
+
"version": "0.82.3-nightly.20250330",
|
|
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.
|
|
71
|
-
"@aztec/aztec.js": "0.82.
|
|
72
|
-
"@aztec/constants": "0.82.
|
|
73
|
-
"@aztec/entrypoints": "0.82.
|
|
74
|
-
"@aztec/foundation": "0.82.
|
|
75
|
-
"@aztec/l1-artifacts": "0.82.
|
|
76
|
-
"@aztec/p2p": "0.82.
|
|
77
|
-
"@aztec/stdlib": "0.82.
|
|
78
|
-
"@aztec/world-state": "0.82.
|
|
70
|
+
"@aztec/archiver": "0.82.3-nightly.20250330",
|
|
71
|
+
"@aztec/aztec.js": "0.82.3-nightly.20250330",
|
|
72
|
+
"@aztec/constants": "0.82.3-nightly.20250330",
|
|
73
|
+
"@aztec/entrypoints": "0.82.3-nightly.20250330",
|
|
74
|
+
"@aztec/foundation": "0.82.3-nightly.20250330",
|
|
75
|
+
"@aztec/l1-artifacts": "0.82.3-nightly.20250330",
|
|
76
|
+
"@aztec/p2p": "0.82.3-nightly.20250330",
|
|
77
|
+
"@aztec/stdlib": "0.82.3-nightly.20250330",
|
|
78
|
+
"@aztec/world-state": "0.82.3-nightly.20250330",
|
|
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.
|
|
91
|
-
"@aztec/ethereum": "0.82.
|
|
92
|
-
"@aztec/protocol-contracts": "0.82.
|
|
90
|
+
"@aztec/accounts": "0.82.3-nightly.20250330",
|
|
91
|
+
"@aztec/ethereum": "0.82.3-nightly.20250330",
|
|
92
|
+
"@aztec/protocol-contracts": "0.82.3-nightly.20250330",
|
|
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.
|
|
109
|
-
"@aztec/bb-prover": "0.82.
|
|
110
|
-
"@aztec/ethereum": "0.82.
|
|
111
|
-
"@aztec/l1-artifacts": "0.82.
|
|
112
|
-
"@aztec/noir-contracts.js": "0.82.
|
|
113
|
-
"@aztec/noir-protocol-circuits-types": "0.82.
|
|
114
|
-
"@aztec/protocol-contracts": "0.82.
|
|
115
|
-
"@aztec/stdlib": "0.82.
|
|
108
|
+
"@aztec/accounts": "0.82.3-nightly.20250330",
|
|
109
|
+
"@aztec/bb-prover": "0.82.3-nightly.20250330",
|
|
110
|
+
"@aztec/ethereum": "0.82.3-nightly.20250330",
|
|
111
|
+
"@aztec/l1-artifacts": "0.82.3-nightly.20250330",
|
|
112
|
+
"@aztec/noir-contracts.js": "0.82.3-nightly.20250330",
|
|
113
|
+
"@aztec/noir-protocol-circuits-types": "0.82.3-nightly.20250330",
|
|
114
|
+
"@aztec/protocol-contracts": "0.82.3-nightly.20250330",
|
|
115
|
+
"@aztec/stdlib": "0.82.3-nightly.20250330"
|
|
116
116
|
},
|
|
117
117
|
"files": [
|
|
118
118
|
"dest",
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getInitialTestAccountsManagers } from '@aztec/accounts/testing';
|
|
2
2
|
import {
|
|
3
3
|
AztecAddress,
|
|
4
4
|
BatchCall,
|
|
@@ -54,7 +54,12 @@ export async function bootstrapNetwork(
|
|
|
54
54
|
) {
|
|
55
55
|
const pxe = await createCompatibleClient(pxeUrl, debugLog);
|
|
56
56
|
|
|
57
|
-
|
|
57
|
+
// We assume here that the initial test accounts were prefunded with deploy-l1-contracts, and deployed with setup-l2-contracts
|
|
58
|
+
// so all we need to do is register them to our pxe.
|
|
59
|
+
const [accountManager] = await getInitialTestAccountsManagers(pxe);
|
|
60
|
+
await accountManager.register();
|
|
61
|
+
|
|
62
|
+
const wallet = await accountManager.getWallet();
|
|
58
63
|
|
|
59
64
|
const l1Clients = createL1Clients(
|
|
60
65
|
l1Urls,
|
|
@@ -25,7 +25,7 @@ export async function deployNewRollup(
|
|
|
25
25
|
const initialFundedAccounts = testAccounts ? await getInitialTestAccounts() : [];
|
|
26
26
|
const { genesisBlockHash, genesisArchiveRoot } = await getGenesisValues(initialFundedAccounts.map(a => a.address));
|
|
27
27
|
|
|
28
|
-
const { payloadAddress, rollup } = await deployNewRollupContracts(
|
|
28
|
+
const { payloadAddress, rollup, slashFactoryAddress } = await deployNewRollupContracts(
|
|
29
29
|
registryAddress,
|
|
30
30
|
rpcUrls,
|
|
31
31
|
chainId,
|
|
@@ -46,6 +46,7 @@ export async function deployNewRollup(
|
|
|
46
46
|
{
|
|
47
47
|
payloadAddress: payloadAddress.toString(),
|
|
48
48
|
rollupAddress: rollup.address,
|
|
49
|
+
slashFactoryAddress: slashFactoryAddress.toString(),
|
|
49
50
|
},
|
|
50
51
|
null,
|
|
51
52
|
2,
|
|
@@ -54,5 +55,6 @@ export async function deployNewRollup(
|
|
|
54
55
|
} else {
|
|
55
56
|
log(`Payload Address: ${payloadAddress.toString()}`);
|
|
56
57
|
log(`Rollup Address: ${rollup.address}`);
|
|
58
|
+
log(`Slash Factory Address: ${slashFactoryAddress.toString()}`);
|
|
57
59
|
}
|
|
58
60
|
}
|
|
@@ -42,7 +42,7 @@ export async function depositGovernanceTokens({
|
|
|
42
42
|
|
|
43
43
|
const addresses = await RegistryContract.collectAddresses(publicClient, registryAddress, 'canonical');
|
|
44
44
|
const governanceAddress = addresses.governanceAddress.toString();
|
|
45
|
-
const tokenAddress = addresses.
|
|
45
|
+
const tokenAddress = addresses.stakingAssetAddress.toString();
|
|
46
46
|
|
|
47
47
|
const feeJuice = new FeeJuiceContract(tokenAddress, publicClient, walletClient);
|
|
48
48
|
const governance = new GovernanceContract(governanceAddress, publicClient, walletClient);
|
package/src/cmds/l1/index.ts
CHANGED
|
@@ -57,7 +57,7 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
|
|
|
57
57
|
options.mnemonicIndex,
|
|
58
58
|
options.salt,
|
|
59
59
|
options.testAccounts,
|
|
60
|
-
options.
|
|
60
|
+
options.sponsoredFpc,
|
|
61
61
|
options.acceleratedTestDeployments,
|
|
62
62
|
options.json,
|
|
63
63
|
initialValidators,
|
package/src/utils/aztec.ts
CHANGED
|
@@ -96,7 +96,7 @@ export async function deployNewRollupContracts(
|
|
|
96
96
|
genesisBlockHash: Fr,
|
|
97
97
|
config: L1ContractsConfig,
|
|
98
98
|
logger: Logger,
|
|
99
|
-
): Promise<{ payloadAddress: EthAddress; rollup: RollupContract }> {
|
|
99
|
+
): Promise<{ payloadAddress: EthAddress; rollup: RollupContract; slashFactoryAddress: EthAddress }> {
|
|
100
100
|
const { createEthereumChain, deployRollupForUpgrade, createL1Clients } = await import('@aztec/ethereum');
|
|
101
101
|
const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
|
|
102
102
|
const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
|
|
@@ -107,7 +107,7 @@ export async function deployNewRollupContracts(
|
|
|
107
107
|
const chain = createEthereumChain(rpcUrls, chainId);
|
|
108
108
|
const clients = createL1Clients(rpcUrls, account, chain.chainInfo, mnemonicIndex);
|
|
109
109
|
|
|
110
|
-
const { payloadAddress, rollup } = await deployRollupForUpgrade(
|
|
110
|
+
const { payloadAddress, rollup, slashFactoryAddress } = await deployRollupForUpgrade(
|
|
111
111
|
clients,
|
|
112
112
|
{
|
|
113
113
|
salt,
|
|
@@ -124,7 +124,7 @@ export async function deployNewRollupContracts(
|
|
|
124
124
|
config,
|
|
125
125
|
);
|
|
126
126
|
|
|
127
|
-
return { payloadAddress, rollup };
|
|
127
|
+
return { payloadAddress, rollup, slashFactoryAddress };
|
|
128
128
|
}
|
|
129
129
|
|
|
130
130
|
/**
|