@aztec/ethereum 0.74.0 → 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2

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.
Files changed (81) hide show
  1. package/dest/chain.js +17 -18
  2. package/dest/client.js +5 -9
  3. package/dest/config.js +13 -14
  4. package/dest/constants.js +0 -1
  5. package/dest/contracts/empire_base.js +3 -2
  6. package/dest/contracts/forwarder.js +46 -26
  7. package/dest/contracts/governance.js +11 -6
  8. package/dest/contracts/governance_proposer.js +78 -67
  9. package/dest/contracts/index.js +0 -1
  10. package/dest/contracts/rollup.js +270 -243
  11. package/dest/contracts/slashing_proposer.js +18 -8
  12. package/dest/deploy_l1_contracts.js +201 -126
  13. package/dest/eth_cheat_codes.js +144 -127
  14. package/dest/index.js +0 -1
  15. package/dest/l1_contract_addresses.js +17 -19
  16. package/dest/l1_reader.js +6 -7
  17. package/dest/l1_tx_utils.js +227 -186
  18. package/dest/l1_tx_utils_with_blobs.js +25 -22
  19. package/dest/queries.js +6 -9
  20. package/dest/test/delayed_tx_utils.js +3 -3
  21. package/dest/test/eth_cheat_codes_with_state.js +10 -12
  22. package/dest/test/index.js +0 -1
  23. package/dest/test/start_anvil.js +17 -9
  24. package/dest/test/tx_delayer.js +77 -74
  25. package/dest/types.js +1 -2
  26. package/dest/utils.js +35 -36
  27. package/package.json +5 -4
  28. package/src/contracts/rollup.ts +1 -1
  29. package/src/l1_tx_utils_with_blobs.ts +1 -1
  30. package/dest/chain.d.ts +0 -25
  31. package/dest/chain.d.ts.map +0 -1
  32. package/dest/client.d.ts +0 -16
  33. package/dest/client.d.ts.map +0 -1
  34. package/dest/config.d.ts +0 -38
  35. package/dest/config.d.ts.map +0 -1
  36. package/dest/constants.d.ts +0 -4
  37. package/dest/constants.d.ts.map +0 -1
  38. package/dest/contracts/empire_base.d.ts +0 -13
  39. package/dest/contracts/empire_base.d.ts.map +0 -1
  40. package/dest/contracts/forwarder.d.ts +0 -24
  41. package/dest/contracts/forwarder.d.ts.map +0 -1
  42. package/dest/contracts/governance.d.ts +0 -14
  43. package/dest/contracts/governance.d.ts.map +0 -1
  44. package/dest/contracts/governance_proposer.d.ts +0 -28
  45. package/dest/contracts/governance_proposer.d.ts.map +0 -1
  46. package/dest/contracts/index.d.ts +0 -7
  47. package/dest/contracts/index.d.ts.map +0 -1
  48. package/dest/contracts/rollup.d.ts +0 -115
  49. package/dest/contracts/rollup.d.ts.map +0 -1
  50. package/dest/contracts/slashing_proposer.d.ts +0 -21
  51. package/dest/contracts/slashing_proposer.d.ts.map +0 -1
  52. package/dest/deploy_l1_contracts.d.ts +0 -21118
  53. package/dest/deploy_l1_contracts.d.ts.map +0 -1
  54. package/dest/eth_cheat_codes.d.ts +0 -146
  55. package/dest/eth_cheat_codes.d.ts.map +0 -1
  56. package/dest/index.d.ts +0 -15
  57. package/dest/index.d.ts.map +0 -1
  58. package/dest/l1_contract_addresses.d.ts +0 -55
  59. package/dest/l1_contract_addresses.d.ts.map +0 -1
  60. package/dest/l1_reader.d.ts +0 -16
  61. package/dest/l1_reader.d.ts.map +0 -1
  62. package/dest/l1_tx_utils.d.ts +0 -194
  63. package/dest/l1_tx_utils.d.ts.map +0 -1
  64. package/dest/l1_tx_utils_with_blobs.d.ts +0 -12
  65. package/dest/l1_tx_utils_with_blobs.d.ts.map +0 -1
  66. package/dest/queries.d.ts +0 -15
  67. package/dest/queries.d.ts.map +0 -1
  68. package/dest/test/delayed_tx_utils.d.ts +0 -8
  69. package/dest/test/delayed_tx_utils.d.ts.map +0 -1
  70. package/dest/test/eth_cheat_codes_with_state.d.ts +0 -18
  71. package/dest/test/eth_cheat_codes_with_state.d.ts.map +0 -1
  72. package/dest/test/index.d.ts +0 -5
  73. package/dest/test/index.d.ts.map +0 -1
  74. package/dest/test/start_anvil.d.ts +0 -9
  75. package/dest/test/start_anvil.d.ts.map +0 -1
  76. package/dest/test/tx_delayer.d.ts +0 -24
  77. package/dest/test/tx_delayer.d.ts.map +0 -1
  78. package/dest/types.d.ts +0 -12
  79. package/dest/types.d.ts.map +0 -1
  80. package/dest/utils.d.ts +0 -24
  81. package/dest/utils.d.ts.map +0 -1
@@ -1,6 +1,6 @@
1
1
  import { EthAddress } from '@aztec/foundation/eth-address';
2
- import { CoinIssuerAbi, CoinIssuerBytecode, ExtRollupLibAbi, ExtRollupLibBytecode, FeeJuicePortalAbi, FeeJuicePortalBytecode, ForwarderAbi, ForwarderBytecode, GovernanceAbi, GovernanceBytecode, GovernanceProposerAbi, GovernanceProposerBytecode, InboxAbi, InboxBytecode, OutboxAbi, OutboxBytecode, RegistryAbi, RegistryBytecode, RewardDistributorAbi, RewardDistributorBytecode, RollupAbi, RollupBytecode, RollupLinkReferences, SlashFactoryAbi, SlashFactoryBytecode, StakingLibAbi, StakingLibBytecode, TestERC20Abi, TestERC20Bytecode, ValidatorSelectionLibAbi, ValidatorSelectionLibBytecode, } from '@aztec/l1-artifacts';
3
- import { concatHex, createPublicClient, createWalletClient, encodeDeployData, getAddress, getContract, getContractAddress, http, numberToHex, padHex, publicActions, } from 'viem';
2
+ import { CoinIssuerAbi, CoinIssuerBytecode, ExtRollupLibAbi, ExtRollupLibBytecode, FeeJuicePortalAbi, FeeJuicePortalBytecode, ForwarderAbi, ForwarderBytecode, GovernanceAbi, GovernanceBytecode, GovernanceProposerAbi, GovernanceProposerBytecode, InboxAbi, InboxBytecode, OutboxAbi, OutboxBytecode, RegistryAbi, RegistryBytecode, RewardDistributorAbi, RewardDistributorBytecode, RollupAbi, RollupBytecode, RollupLinkReferences, SlashFactoryAbi, SlashFactoryBytecode, StakingLibAbi, StakingLibBytecode, TestERC20Abi, TestERC20Bytecode, ValidatorSelectionLibAbi, ValidatorSelectionLibBytecode } from '@aztec/l1-artifacts';
3
+ import { concatHex, createPublicClient, createWalletClient, encodeDeployData, getAddress, getContract, getContractAddress, http, numberToHex, padHex, publicActions } from 'viem';
4
4
  import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
5
5
  import { foundry } from 'viem/chains';
6
6
  import { isAnvilTestChain } from './chain.js';
@@ -9,15 +9,15 @@ export const DEPLOYER_ADDRESS = '0x4e59b44847b379578588920cA78FbF26c0B4956C';
9
9
  export const l1Artifacts = {
10
10
  registry: {
11
11
  contractAbi: RegistryAbi,
12
- contractBytecode: RegistryBytecode,
12
+ contractBytecode: RegistryBytecode
13
13
  },
14
14
  inbox: {
15
15
  contractAbi: InboxAbi,
16
- contractBytecode: InboxBytecode,
16
+ contractBytecode: InboxBytecode
17
17
  },
18
18
  outbox: {
19
19
  contractAbi: OutboxAbi,
20
- contractBytecode: OutboxBytecode,
20
+ contractBytecode: OutboxBytecode
21
21
  },
22
22
  rollup: {
23
23
  contractAbi: RollupAbi,
@@ -27,51 +27,51 @@ export const l1Artifacts = {
27
27
  libraryCode: {
28
28
  ValidatorSelectionLib: {
29
29
  contractAbi: ValidatorSelectionLibAbi,
30
- contractBytecode: ValidatorSelectionLibBytecode,
30
+ contractBytecode: ValidatorSelectionLibBytecode
31
31
  },
32
32
  ExtRollupLib: {
33
33
  contractAbi: ExtRollupLibAbi,
34
- contractBytecode: ExtRollupLibBytecode,
34
+ contractBytecode: ExtRollupLibBytecode
35
35
  },
36
36
  StakingLib: {
37
37
  contractAbi: StakingLibAbi,
38
- contractBytecode: StakingLibBytecode,
39
- },
40
- },
41
- },
38
+ contractBytecode: StakingLibBytecode
39
+ }
40
+ }
41
+ }
42
42
  },
43
43
  stakingAsset: {
44
44
  contractAbi: TestERC20Abi,
45
- contractBytecode: TestERC20Bytecode,
45
+ contractBytecode: TestERC20Bytecode
46
46
  },
47
47
  feeAsset: {
48
48
  contractAbi: TestERC20Abi,
49
- contractBytecode: TestERC20Bytecode,
49
+ contractBytecode: TestERC20Bytecode
50
50
  },
51
51
  feeJuicePortal: {
52
52
  contractAbi: FeeJuicePortalAbi,
53
- contractBytecode: FeeJuicePortalBytecode,
53
+ contractBytecode: FeeJuicePortalBytecode
54
54
  },
55
55
  rewardDistributor: {
56
56
  contractAbi: RewardDistributorAbi,
57
- contractBytecode: RewardDistributorBytecode,
57
+ contractBytecode: RewardDistributorBytecode
58
58
  },
59
59
  coinIssuer: {
60
60
  contractAbi: CoinIssuerAbi,
61
- contractBytecode: CoinIssuerBytecode,
61
+ contractBytecode: CoinIssuerBytecode
62
62
  },
63
63
  governanceProposer: {
64
64
  contractAbi: GovernanceProposerAbi,
65
- contractBytecode: GovernanceProposerBytecode,
65
+ contractBytecode: GovernanceProposerBytecode
66
66
  },
67
67
  governance: {
68
68
  contractAbi: GovernanceAbi,
69
- contractBytecode: GovernanceBytecode,
69
+ contractBytecode: GovernanceBytecode
70
70
  },
71
71
  slashFactory: {
72
72
  contractAbi: SlashFactoryAbi,
73
- contractBytecode: SlashFactoryBytecode,
74
- },
73
+ contractBytecode: SlashFactoryBytecode
74
+ }
75
75
  };
76
76
  /**
77
77
  * Creates a wallet and a public viem client for interacting with L1.
@@ -79,30 +79,28 @@ export const l1Artifacts = {
79
79
  * @param mnemonicOrPrivateKeyOrHdAccount - Mnemonic or account for the wallet client.
80
80
  * @param chain - Optional chain spec (defaults to local foundry).
81
81
  * @returns - A wallet and a public client.
82
- */
83
- export function createL1Clients(rpcUrl, mnemonicOrPrivateKeyOrHdAccount, chain = foundry) {
84
- const hdAccount = typeof mnemonicOrPrivateKeyOrHdAccount === 'string'
85
- ? mnemonicOrPrivateKeyOrHdAccount.startsWith('0x')
86
- ? privateKeyToAccount(mnemonicOrPrivateKeyOrHdAccount)
87
- : mnemonicToAccount(mnemonicOrPrivateKeyOrHdAccount)
88
- : mnemonicOrPrivateKeyOrHdAccount;
82
+ */ export function createL1Clients(rpcUrl, mnemonicOrPrivateKeyOrHdAccount, chain = foundry) {
83
+ const hdAccount = typeof mnemonicOrPrivateKeyOrHdAccount === 'string' ? mnemonicOrPrivateKeyOrHdAccount.startsWith('0x') ? privateKeyToAccount(mnemonicOrPrivateKeyOrHdAccount) : mnemonicToAccount(mnemonicOrPrivateKeyOrHdAccount) : mnemonicOrPrivateKeyOrHdAccount;
89
84
  // From what I can see, this is the difference between the HDAccount and the PrivateKeyAccount
90
85
  // and we don't need it for anything. This lets us use the same type for both.
91
86
  // eslint-disable-next-line camelcase
92
- hdAccount.experimental_signAuthorization ?? (hdAccount.experimental_signAuthorization = () => {
87
+ hdAccount.experimental_signAuthorization ??= ()=>{
93
88
  throw new Error('experimental_signAuthorization not implemented for HDAccount');
94
- });
89
+ };
95
90
  const walletClient = createWalletClient({
96
91
  account: hdAccount,
97
92
  chain,
98
- transport: http(rpcUrl),
93
+ transport: http(rpcUrl)
99
94
  }).extend(publicActions);
100
95
  const publicClient = createPublicClient({
101
96
  chain,
102
97
  transport: http(rpcUrl),
103
- pollingInterval: 100,
98
+ pollingInterval: 100
104
99
  });
105
- return { walletClient, publicClient };
100
+ return {
101
+ walletClient,
102
+ publicClient
103
+ };
106
104
  }
107
105
  /**
108
106
  * Deploys the aztec L1 contracts; Rollup & (optionally) Decoder Helper.
@@ -112,69 +110,81 @@ export function createL1Clients(rpcUrl, mnemonicOrPrivateKeyOrHdAccount, chain =
112
110
  * @param logger - A logger object.
113
111
  * @param args - Arguments for initialization of L1 contracts
114
112
  * @returns A list of ETH addresses of the deployed contracts.
115
- */
116
- export const deployL1Contracts = async (rpcUrl, account, chain, logger, args) => {
113
+ */ export const deployL1Contracts = async (rpcUrl, account, chain, logger, args)=>{
117
114
  // We are assuming that you are running this on a local anvil node which have 1s block times
118
115
  // To align better with actual deployment, we update the block interval to 12s
119
116
  // The code is same as `setBlockInterval` in `cheat_codes.ts`
120
- const rpcCall = async (method, params) => {
117
+ const rpcCall = async (method, params)=>{
121
118
  const paramsString = JSON.stringify(params);
122
119
  const content = {
123
120
  body: `{"jsonrpc":"2.0", "method": "${method}", "params": ${paramsString}, "id": 1}`,
124
121
  method: 'POST',
125
- headers: { 'Content-Type': 'application/json' },
122
+ headers: {
123
+ 'Content-Type': 'application/json'
124
+ }
126
125
  };
127
126
  return await (await fetch(rpcUrl, content)).json();
128
127
  };
129
128
  if (isAnvilTestChain(chain.id)) {
130
- const res = await rpcCall('anvil_setBlockTimestampInterval', [args.ethereumSlotDuration]);
129
+ const res = await rpcCall('anvil_setBlockTimestampInterval', [
130
+ args.ethereumSlotDuration
131
+ ]);
131
132
  if (res.error) {
132
133
  throw new Error(`Error setting block interval: ${res.error.message}`);
133
134
  }
134
135
  logger.warn(`Set block interval to ${args.ethereumSlotDuration}`);
135
136
  }
136
137
  logger.verbose(`Deploying contracts from ${account.address.toString()}`);
137
- const walletClient = createWalletClient({ account, chain, transport: http(rpcUrl) });
138
- const publicClient = createPublicClient({ chain, transport: http(rpcUrl) });
138
+ const walletClient = createWalletClient({
139
+ account,
140
+ chain,
141
+ transport: http(rpcUrl)
142
+ });
143
+ const publicClient = createPublicClient({
144
+ chain,
145
+ transport: http(rpcUrl)
146
+ });
139
147
  // Governance stuff
140
148
  const govDeployer = new L1Deployer(walletClient, publicClient, args.salt, logger);
141
- const registryAddress = await govDeployer.deploy(l1Artifacts.registry, [account.address.toString()]);
149
+ const registryAddress = await govDeployer.deploy(l1Artifacts.registry, [
150
+ account.address.toString()
151
+ ]);
142
152
  logger.verbose(`Deployed Registry at ${registryAddress}`);
143
153
  const feeAssetAddress = await govDeployer.deploy(l1Artifacts.feeAsset, [
144
154
  'FeeJuice',
145
155
  'FEE',
146
- account.address.toString(),
156
+ account.address.toString()
147
157
  ]);
148
158
  logger.verbose(`Deployed Fee Juice at ${feeAssetAddress}`);
149
159
  const stakingAssetAddress = await govDeployer.deploy(l1Artifacts.stakingAsset, [
150
160
  'Staking',
151
161
  'STK',
152
- account.address.toString(),
162
+ account.address.toString()
153
163
  ]);
154
164
  logger.verbose(`Deployed Staking Asset at ${stakingAssetAddress}`);
155
165
  const governanceProposerAddress = await govDeployer.deploy(l1Artifacts.governanceProposer, [
156
166
  registryAddress.toString(),
157
167
  args.governanceProposerQuorum,
158
- args.governanceProposerRoundSize,
168
+ args.governanceProposerRoundSize
159
169
  ]);
160
170
  logger.verbose(`Deployed GovernanceProposer at ${governanceProposerAddress}`);
161
171
  // @note @LHerskind the assets are expected to be the same at some point, but for better
162
172
  // configurability they are different for now.
163
173
  const governanceAddress = await govDeployer.deploy(l1Artifacts.governance, [
164
174
  feeAssetAddress.toString(),
165
- governanceProposerAddress.toString(),
175
+ governanceProposerAddress.toString()
166
176
  ]);
167
177
  logger.verbose(`Deployed Governance at ${governanceAddress}`);
168
178
  const coinIssuerAddress = await govDeployer.deploy(l1Artifacts.coinIssuer, [
169
179
  feeAssetAddress.toString(),
170
- 1n * 10n ** 18n, // @todo #8084
171
- governanceAddress.toString(),
180
+ 1n * 10n ** 18n,
181
+ governanceAddress.toString()
172
182
  ]);
173
183
  logger.verbose(`Deployed CoinIssuer at ${coinIssuerAddress}`);
174
184
  const rewardDistributorAddress = await govDeployer.deploy(l1Artifacts.rewardDistributor, [
175
185
  feeAssetAddress.toString(),
176
186
  registryAddress.toString(),
177
- governanceAddress.toString(),
187
+ governanceAddress.toString()
178
188
  ]);
179
189
  logger.verbose(`Deployed RewardDistributor at ${rewardDistributorAddress}`);
180
190
  logger.verbose(`Waiting for governance contracts to be deployed`);
@@ -184,7 +194,7 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, args) =>
184
194
  const feeJuicePortalAddress = await deployer.deploy(l1Artifacts.feeJuicePortal, [
185
195
  registryAddress.toString(),
186
196
  feeAssetAddress.toString(),
187
- args.l2FeeJuiceAddress.toString(),
197
+ args.l2FeeJuiceAddress.toString()
188
198
  ]);
189
199
  logger.verbose(`Deployed Fee Juice Portal at ${feeJuicePortalAddress}`);
190
200
  const rollupConfigArgs = {
@@ -194,7 +204,7 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, args) =>
194
204
  aztecEpochProofClaimWindowInL2Slots: args.aztecEpochProofClaimWindowInL2Slots,
195
205
  minimumStake: args.minimumStake,
196
206
  slashingQuorum: args.slashingQuorum,
197
- slashingRoundSize: args.slashingRoundSize,
207
+ slashingRoundSize: args.slashingRoundSize
198
208
  };
199
209
  const rollupArgs = [
200
210
  feeJuicePortalAddress.toString(),
@@ -203,68 +213,89 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, args) =>
203
213
  args.vkTreeRoot.toString(),
204
214
  args.protocolContractTreeRoot.toString(),
205
215
  account.address.toString(),
206
- rollupConfigArgs,
216
+ rollupConfigArgs
207
217
  ];
208
218
  await deployer.waitForDeployments();
209
219
  const rollupAddress = await deployer.deploy(l1Artifacts.rollup, rollupArgs);
210
220
  logger.verbose(`Deployed Rollup at ${rollupAddress}`, rollupConfigArgs);
211
- const slashFactoryAddress = await deployer.deploy(l1Artifacts.slashFactory, [rollupAddress.toString()]);
221
+ const slashFactoryAddress = await deployer.deploy(l1Artifacts.slashFactory, [
222
+ rollupAddress.toString()
223
+ ]);
212
224
  logger.verbose(`Deployed SlashFactory at ${slashFactoryAddress}`);
213
225
  await deployer.waitForDeployments();
214
226
  logger.verbose(`All core contracts have been deployed`);
215
227
  const feeJuicePortal = getContract({
216
228
  address: feeJuicePortalAddress.toString(),
217
229
  abi: l1Artifacts.feeJuicePortal.contractAbi,
218
- client: walletClient,
230
+ client: walletClient
219
231
  });
220
232
  const feeAsset = getContract({
221
233
  address: feeAssetAddress.toString(),
222
234
  abi: l1Artifacts.feeAsset.contractAbi,
223
- client: walletClient,
235
+ client: walletClient
224
236
  });
225
237
  const stakingAsset = getContract({
226
238
  address: stakingAssetAddress.toString(),
227
239
  abi: l1Artifacts.stakingAsset.contractAbi,
228
- client: walletClient,
240
+ client: walletClient
229
241
  });
230
242
  const rollup = getContract({
231
243
  address: getAddress(rollupAddress.toString()),
232
244
  abi: l1Artifacts.rollup.contractAbi,
233
- client: walletClient,
245
+ client: walletClient
234
246
  });
235
247
  // Transaction hashes to await
236
248
  const txHashes = [];
237
249
  {
238
- const txHash = await feeAsset.write.setFreeForAll([true], {});
250
+ const txHash = await feeAsset.write.setFreeForAll([
251
+ true
252
+ ], {});
239
253
  logger.verbose(`Fee asset set to free for all in ${txHash}`);
240
254
  txHashes.push(txHash);
241
255
  }
242
256
  if (args.initialValidators && args.initialValidators.length > 0) {
243
257
  // Check if some of the initial validators are already registered, so we support idempotent deployments
244
- const validatorsInfo = await Promise.all(args.initialValidators.map(async (address) => ({ address, ...(await rollup.read.getInfo([address.toString()])) })));
245
- const existingValidators = validatorsInfo.filter(v => v.status !== 0);
258
+ const validatorsInfo = await Promise.all(args.initialValidators.map(async (address)=>({
259
+ address,
260
+ ...await rollup.read.getInfo([
261
+ address.toString()
262
+ ])
263
+ })));
264
+ const existingValidators = validatorsInfo.filter((v)=>v.status !== 0);
246
265
  if (existingValidators.length > 0) {
247
- logger.warn(`Validators ${existingValidators.map(v => v.address).join(', ')} already exist. Skipping from initialization.`);
266
+ logger.warn(`Validators ${existingValidators.map((v)=>v.address).join(', ')} already exist. Skipping from initialization.`);
248
267
  }
249
- const newValidatorsAddresses = validatorsInfo.filter(v => v.status === 0).map(v => v.address.toString());
268
+ const newValidatorsAddresses = validatorsInfo.filter((v)=>v.status === 0).map((v)=>v.address.toString());
250
269
  if (newValidatorsAddresses.length > 0) {
251
270
  // Mint tokens, approve them, use cheat code to initialise validator set without setting up the epoch.
252
271
  const stakeNeeded = args.minimumStake * BigInt(newValidatorsAddresses.length);
253
272
  await Promise.all([
254
- await stakingAsset.write.mint([walletClient.account.address, stakeNeeded], {}),
255
- await stakingAsset.write.approve([rollupAddress.toString(), stakeNeeded], {}),
256
- ].map(txHash => publicClient.waitForTransactionReceipt({ hash: txHash })));
257
- const validators = newValidatorsAddresses.map(v => ({
258
- attester: v,
259
- proposer: getExpectedAddress(ForwarderAbi, ForwarderBytecode, [v], v).address,
260
- withdrawer: v,
261
- amount: args.minimumStake,
262
- }));
263
- const initiateValidatorSetTxHash = await rollup.write.cheat__InitialiseValidatorSet([validators]);
273
+ await stakingAsset.write.mint([
274
+ walletClient.account.address,
275
+ stakeNeeded
276
+ ], {}),
277
+ await stakingAsset.write.approve([
278
+ rollupAddress.toString(),
279
+ stakeNeeded
280
+ ], {})
281
+ ].map((txHash)=>publicClient.waitForTransactionReceipt({
282
+ hash: txHash
283
+ })));
284
+ const validators = newValidatorsAddresses.map((v)=>({
285
+ attester: v,
286
+ proposer: getExpectedAddress(ForwarderAbi, ForwarderBytecode, [
287
+ v
288
+ ], v).address,
289
+ withdrawer: v,
290
+ amount: args.minimumStake
291
+ }));
292
+ const initiateValidatorSetTxHash = await rollup.write.cheat__InitialiseValidatorSet([
293
+ validators
294
+ ]);
264
295
  txHashes.push(initiateValidatorSetTxHash);
265
296
  logger.info(`Initialized validator set`, {
266
297
  validators,
267
- txHash: initiateValidatorSetTxHash,
298
+ txHash: initiateValidatorSetTxHash
268
299
  });
269
300
  }
270
301
  }
@@ -273,17 +304,21 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, args) =>
273
304
  // @todo #8084
274
305
  // fund the portal contract with Fee Juice
275
306
  const FEE_JUICE_INITIAL_MINT = 200000000000000000000000n;
276
- const mintTxHash = await feeAsset.write.mint([feeJuicePortalAddress.toString(), FEE_JUICE_INITIAL_MINT], {});
307
+ const mintTxHash = await feeAsset.write.mint([
308
+ feeJuicePortalAddress.toString(),
309
+ FEE_JUICE_INITIAL_MINT
310
+ ], {});
277
311
  // @note This is used to ensure we fully wait for the transaction when running against a real chain
278
312
  // otherwise we execute subsequent transactions too soon
279
- await publicClient.waitForTransactionReceipt({ hash: mintTxHash });
313
+ await publicClient.waitForTransactionReceipt({
314
+ hash: mintTxHash
315
+ });
280
316
  logger.verbose(`Funding fee juice portal contract with fee juice in ${mintTxHash}`);
281
- if (!(await feeJuicePortal.read.initialized())) {
317
+ if (!await feeJuicePortal.read.initialized()) {
282
318
  const initPortalTxHash = await feeJuicePortal.write.initialize();
283
319
  txHashes.push(initPortalTxHash);
284
320
  logger.verbose(`Fee juice portal initializing in tx ${initPortalTxHash}`);
285
- }
286
- else {
321
+ } else {
287
322
  logger.verbose(`Fee juice portal is already initialized`);
288
323
  }
289
324
  logger.verbose(`Initialized Fee Juice Portal at ${feeJuicePortalAddress} to bridge between L1 ${feeAssetAddress} to L2 ${args.l2FeeJuiceAddress}`);
@@ -292,56 +327,74 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, args) =>
292
327
  // The edge case being that the genesis block is already occupying slot 0, so we cannot have another block.
293
328
  try {
294
329
  // Need to get the time
295
- const currentSlot = (await rollup.read.getCurrentSlot());
330
+ const currentSlot = await rollup.read.getCurrentSlot();
296
331
  if (BigInt(currentSlot) === 0n) {
297
- const ts = Number(await rollup.read.getTimestampForSlot([1n]));
298
- await rpcCall('evm_setNextBlockTimestamp', [ts]);
299
- await rpcCall('hardhat_mine', [1]);
300
- const currentSlot = (await rollup.read.getCurrentSlot());
332
+ const ts = Number(await rollup.read.getTimestampForSlot([
333
+ 1n
334
+ ]));
335
+ await rpcCall('evm_setNextBlockTimestamp', [
336
+ ts
337
+ ]);
338
+ await rpcCall('hardhat_mine', [
339
+ 1
340
+ ]);
341
+ const currentSlot = await rollup.read.getCurrentSlot();
301
342
  if (BigInt(currentSlot) !== 1n) {
302
343
  throw new Error(`Error jumping time: current slot is ${currentSlot}`);
303
344
  }
304
345
  logger.info(`Jumped to slot 1`);
305
346
  }
306
- }
307
- catch (e) {
347
+ } catch (e) {
308
348
  throw new Error(`Error jumping time: ${e}`);
309
349
  }
310
350
  }
311
351
  // Set initial blocks as proven if requested
312
352
  if (args.assumeProvenThrough && args.assumeProvenThrough > 0) {
313
- await rollup.write.setAssumeProvenThroughBlockNumber([BigInt(args.assumeProvenThrough)], { account });
353
+ await rollup.write.setAssumeProvenThroughBlockNumber([
354
+ BigInt(args.assumeProvenThrough)
355
+ ], {
356
+ account
357
+ });
314
358
  logger.warn(`Rollup set to assumedProvenUntil to ${args.assumeProvenThrough}`);
315
359
  }
316
360
  // Inbox and Outbox are immutable and are deployed from Rollup's constructor so we just fetch them from the contract.
317
- const inboxAddress = EthAddress.fromString((await rollup.read.INBOX()));
361
+ const inboxAddress = EthAddress.fromString(await rollup.read.INBOX());
318
362
  logger.verbose(`Inbox available at ${inboxAddress}`);
319
- const outboxAddress = EthAddress.fromString((await rollup.read.OUTBOX()));
363
+ const outboxAddress = EthAddress.fromString(await rollup.read.OUTBOX());
320
364
  logger.verbose(`Outbox available at ${outboxAddress}`);
321
365
  // We need to call a function on the registry to set the various contract addresses.
322
366
  const registryContract = getContract({
323
367
  address: getAddress(registryAddress.toString()),
324
368
  abi: l1Artifacts.registry.contractAbi,
325
- client: walletClient,
369
+ client: walletClient
326
370
  });
327
- if (!(await registryContract.read.isRollupRegistered([getAddress(rollupAddress.toString())]))) {
328
- const upgradeTxHash = await registryContract.write.upgrade([getAddress(rollupAddress.toString())], { account });
371
+ if (!await registryContract.read.isRollupRegistered([
372
+ getAddress(rollupAddress.toString())
373
+ ])) {
374
+ const upgradeTxHash = await registryContract.write.upgrade([
375
+ getAddress(rollupAddress.toString())
376
+ ], {
377
+ account
378
+ });
329
379
  logger.verbose(`Upgrading registry contract at ${registryAddress} to rollup ${rollupAddress} in tx ${upgradeTxHash}`);
330
380
  txHashes.push(upgradeTxHash);
331
- }
332
- else {
381
+ } else {
333
382
  logger.verbose(`Registry ${registryAddress} has already registered rollup ${rollupAddress}`);
334
383
  }
335
384
  // If the owner is not the Governance contract, transfer ownership to the Governance contract
336
- if ((await registryContract.read.owner()) !== getAddress(governanceAddress.toString())) {
337
- const transferOwnershipTxHash = await registryContract.write.transferOwnership([getAddress(governanceAddress.toString())], {
338
- account,
385
+ if (await registryContract.read.owner() !== getAddress(governanceAddress.toString())) {
386
+ const transferOwnershipTxHash = await registryContract.write.transferOwnership([
387
+ getAddress(governanceAddress.toString())
388
+ ], {
389
+ account
339
390
  });
340
391
  logger.verbose(`Transferring the ownership of the registry contract at ${registryAddress} to the Governance ${governanceAddress} in tx ${transferOwnershipTxHash}`);
341
392
  txHashes.push(transferOwnershipTxHash);
342
393
  }
343
394
  // Wait for all actions to be mined
344
- await Promise.all(txHashes.map(txHash => publicClient.waitForTransactionReceipt({ hash: txHash })));
395
+ await Promise.all(txHashes.map((txHash)=>publicClient.waitForTransactionReceipt({
396
+ hash: txHash
397
+ })));
345
398
  logger.verbose(`All transactions for L1 deployment have been mined`);
346
399
  const l1Contracts = {
347
400
  rollupAddress,
@@ -355,22 +408,29 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, args) =>
355
408
  rewardDistributorAddress,
356
409
  governanceProposerAddress,
357
410
  governanceAddress,
358
- slashFactoryAddress,
411
+ slashFactoryAddress
359
412
  };
360
413
  logger.info(`Aztec L1 contracts initialized`, l1Contracts);
361
414
  return {
362
415
  walletClient,
363
416
  publicClient,
364
- l1ContractAddresses: l1Contracts,
417
+ l1ContractAddresses: l1Contracts
365
418
  };
366
419
  };
367
420
  class L1Deployer {
368
- constructor(walletClient, publicClient, maybeSalt, logger) {
421
+ walletClient;
422
+ publicClient;
423
+ logger;
424
+ salt;
425
+ txHashes;
426
+ constructor(walletClient, publicClient, maybeSalt, logger){
369
427
  this.walletClient = walletClient;
370
428
  this.publicClient = publicClient;
371
429
  this.logger = logger;
372
430
  this.txHashes = [];
373
- this.salt = maybeSalt ? padHex(numberToHex(maybeSalt), { size: 32 }) : undefined;
431
+ this.salt = maybeSalt ? padHex(numberToHex(maybeSalt), {
432
+ size: 32
433
+ }) : undefined;
374
434
  }
375
435
  async deploy(params, args = []) {
376
436
  const { txHash, address } = await deployL1Contract(this.walletClient, this.publicClient, params.contractAbi, params.contractBytecode, args, this.salt, params.libraries, this.logger);
@@ -380,7 +440,9 @@ class L1Deployer {
380
440
  return address;
381
441
  }
382
442
  async waitForDeployments() {
383
- await Promise.all(this.txHashes.map(txHash => this.publicClient.waitForTransactionReceipt({ hash: txHash })));
443
+ await Promise.all(this.txHashes.map((txHash)=>this.publicClient.waitForTransactionReceipt({
444
+ hash: txHash
445
+ })));
384
446
  }
385
447
  }
386
448
  // docs:start:deployL1Contract
@@ -393,27 +455,26 @@ class L1Deployer {
393
455
  * @param args - Constructor arguments for the contract.
394
456
  * @param maybeSalt - Optional salt for CREATE2 deployment (does not wait for deployment tx to be mined if set, does not send tx if contract already exists).
395
457
  * @returns The ETH address the contract was deployed to.
396
- */
397
- export async function deployL1Contract(walletClient, publicClient, abi, bytecode, args = [], maybeSalt, libraries, logger) {
458
+ */ export async function deployL1Contract(walletClient, publicClient, abi, bytecode, args = [], maybeSalt, libraries, logger) {
398
459
  let txHash = undefined;
399
460
  let resultingAddress = undefined;
400
461
  const l1TxUtils = new L1TxUtils(publicClient, walletClient, logger);
401
462
  if (libraries) {
402
463
  // Note that this does NOT work well for linked libraries having linked libraries.
403
464
  // Verify that all link references have corresponding code
404
- for (const linkRef in libraries.linkReferences) {
405
- for (const contractName in libraries.linkReferences[linkRef]) {
465
+ for(const linkRef in libraries.linkReferences){
466
+ for(const contractName in libraries.linkReferences[linkRef]){
406
467
  if (!libraries.libraryCode[contractName]) {
407
468
  throw new Error(`Missing library code for ${contractName}`);
408
469
  }
409
470
  }
410
471
  }
411
472
  const replacements = {};
412
- for (const libraryName in libraries?.libraryCode) {
473
+ for(const libraryName in libraries?.libraryCode){
413
474
  const lib = libraries.libraryCode[libraryName];
414
475
  const { address } = await deployL1Contract(walletClient, publicClient, lib.contractAbi, lib.contractBytecode, [], maybeSalt, undefined, logger);
415
- for (const linkRef in libraries.linkReferences) {
416
- for (const contractName in libraries.linkReferences[linkRef]) {
476
+ for(const linkRef in libraries.linkReferences){
477
+ for(const contractName in libraries.linkReferences[linkRef]){
417
478
  // If the library name matches the one we just deployed, we replace it.
418
479
  if (contractName !== libraryName) {
419
480
  continue;
@@ -426,10 +487,10 @@ export async function deployL1Contract(walletClient, publicClient, abi, bytecode
426
487
  }
427
488
  }
428
489
  }
429
- const escapeRegExp = (s) => {
490
+ const escapeRegExp = (s)=>{
430
491
  return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // Escape special characters
431
492
  };
432
- for (const toReplace in replacements) {
493
+ for(const toReplace in replacements){
433
494
  const replacement = replacements[toReplace].toString().slice(2);
434
495
  bytecode = bytecode.replace(new RegExp(escapeRegExp(toReplace), 'g'), replacement);
435
496
  }
@@ -437,48 +498,62 @@ export async function deployL1Contract(walletClient, publicClient, abi, bytecode
437
498
  if (maybeSalt) {
438
499
  const { address, paddedSalt: salt, calldata } = getExpectedAddress(abi, bytecode, args, maybeSalt);
439
500
  resultingAddress = address;
440
- const existing = await publicClient.getBytecode({ address: resultingAddress });
501
+ const existing = await publicClient.getBytecode({
502
+ address: resultingAddress
503
+ });
441
504
  if (existing === undefined || existing === '0x') {
442
505
  const res = await l1TxUtils.sendTransaction({
443
506
  to: DEPLOYER_ADDRESS,
444
- data: concatHex([salt, calldata]),
507
+ data: concatHex([
508
+ salt,
509
+ calldata
510
+ ])
445
511
  });
446
512
  txHash = res.txHash;
447
513
  logger?.verbose(`Deployed contract with salt ${salt} to address ${resultingAddress} in tx ${txHash}.`);
448
- }
449
- else {
514
+ } else {
450
515
  logger?.verbose(`Skipping existing deployment of contract with salt ${salt} to address ${resultingAddress}`);
451
516
  }
452
- }
453
- else {
517
+ } else {
454
518
  // Regular deployment path
455
- const deployData = encodeDeployData({ abi, bytecode, args });
519
+ const deployData = encodeDeployData({
520
+ abi,
521
+ bytecode,
522
+ args
523
+ });
456
524
  const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
457
525
  to: null,
458
- data: deployData,
526
+ data: deployData
459
527
  });
460
528
  txHash = receipt.transactionHash;
461
529
  resultingAddress = receipt.contractAddress;
462
530
  if (!resultingAddress) {
463
- throw new Error(`No contract address found in receipt: ${JSON.stringify(receipt, (_, val) => typeof val === 'bigint' ? String(val) : val)}`);
531
+ throw new Error(`No contract address found in receipt: ${JSON.stringify(receipt, (_, val)=>typeof val === 'bigint' ? String(val) : val)}`);
464
532
  }
465
533
  }
466
- return { address: EthAddress.fromString(resultingAddress), txHash };
534
+ return {
535
+ address: EthAddress.fromString(resultingAddress),
536
+ txHash
537
+ };
467
538
  }
468
539
  export function getExpectedAddress(abi, bytecode, args, salt) {
469
- const paddedSalt = padHex(salt, { size: 32 });
470
- const calldata = encodeDeployData({ abi, bytecode, args });
540
+ const paddedSalt = padHex(salt, {
541
+ size: 32
542
+ });
543
+ const calldata = encodeDeployData({
544
+ abi,
545
+ bytecode,
546
+ args
547
+ });
471
548
  const address = getContractAddress({
472
549
  from: DEPLOYER_ADDRESS,
473
550
  salt: paddedSalt,
474
551
  bytecode: calldata,
475
- opcode: 'CREATE2',
552
+ opcode: 'CREATE2'
476
553
  });
477
554
  return {
478
555
  address,
479
556
  paddedSalt,
480
- calldata,
557
+ calldata
481
558
  };
482
- }
483
- // docs:end:deployL1Contract
484
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"deploy_l1_contracts.js","sourceRoot":"","sources":["../src/deploy_l1_contracts.ts"],"names":[],"mappings":"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"}
559
+ } // docs:end:deployL1Contract