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