@aztec/ethereum 0.0.0-test.1 → 0.0.1-commit.21caa21

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 (232) hide show
  1. package/dest/account.d.ts +2 -0
  2. package/dest/account.d.ts.map +1 -0
  3. package/dest/account.js +4 -0
  4. package/dest/chain.d.ts +1 -1
  5. package/dest/client.d.ts +6 -4
  6. package/dest/client.d.ts.map +1 -1
  7. package/dest/client.js +16 -2
  8. package/dest/config.d.ts +111 -17
  9. package/dest/config.d.ts.map +1 -1
  10. package/dest/config.js +462 -22
  11. package/dest/constants.d.ts +1 -1
  12. package/dest/contracts/empire_base.d.ts +24 -8
  13. package/dest/contracts/empire_base.d.ts.map +1 -1
  14. package/dest/contracts/empire_base.js +75 -2
  15. package/dest/contracts/empire_slashing_proposer.d.ts +66 -0
  16. package/dest/contracts/empire_slashing_proposer.d.ts.map +1 -0
  17. package/dest/contracts/empire_slashing_proposer.js +200 -0
  18. package/dest/contracts/errors.d.ts +7 -0
  19. package/dest/contracts/errors.d.ts.map +1 -0
  20. package/dest/contracts/errors.js +12 -0
  21. package/dest/contracts/fee_asset_handler.d.ts +19 -0
  22. package/dest/contracts/fee_asset_handler.d.ts.map +1 -0
  23. package/dest/contracts/fee_asset_handler.js +57 -0
  24. package/dest/contracts/fee_juice.d.ts +6 -7
  25. package/dest/contracts/fee_juice.d.ts.map +1 -1
  26. package/dest/contracts/fee_juice.js +27 -20
  27. package/dest/contracts/governance.d.ts +43 -32
  28. package/dest/contracts/governance.d.ts.map +1 -1
  29. package/dest/contracts/governance.js +87 -84
  30. package/dest/contracts/governance_proposer.d.ts +16 -13
  31. package/dest/contracts/governance_proposer.d.ts.map +1 -1
  32. package/dest/contracts/governance_proposer.js +37 -17
  33. package/dest/contracts/gse.d.ts +32 -0
  34. package/dest/contracts/gse.d.ts.map +1 -0
  35. package/dest/contracts/gse.js +72 -0
  36. package/dest/contracts/inbox.d.ts +26 -0
  37. package/dest/contracts/inbox.d.ts.map +1 -0
  38. package/dest/contracts/inbox.js +45 -0
  39. package/dest/contracts/index.d.ts +9 -3
  40. package/dest/contracts/index.d.ts.map +1 -1
  41. package/dest/contracts/index.js +8 -2
  42. package/dest/contracts/multicall.d.ts +21 -0
  43. package/dest/contracts/multicall.d.ts.map +1 -0
  44. package/dest/contracts/multicall.js +156 -0
  45. package/dest/contracts/registry.d.ts +10 -5
  46. package/dest/contracts/registry.d.ts.map +1 -1
  47. package/dest/contracts/registry.js +44 -16
  48. package/dest/contracts/rollup.d.ts +204 -40
  49. package/dest/contracts/rollup.d.ts.map +1 -1
  50. package/dest/contracts/rollup.js +529 -79
  51. package/dest/contracts/slasher_contract.d.ts +44 -0
  52. package/dest/contracts/slasher_contract.d.ts.map +1 -0
  53. package/dest/contracts/slasher_contract.js +75 -0
  54. package/dest/contracts/tally_slashing_proposer.d.ts +139 -0
  55. package/dest/contracts/tally_slashing_proposer.d.ts.map +1 -0
  56. package/dest/contracts/tally_slashing_proposer.js +313 -0
  57. package/dest/contracts/utils.d.ts +3 -0
  58. package/dest/contracts/utils.d.ts.map +1 -0
  59. package/dest/contracts/utils.js +11 -0
  60. package/dest/deploy_l1_contracts.d.ts +577 -21114
  61. package/dest/deploy_l1_contracts.d.ts.map +1 -1
  62. package/dest/deploy_l1_contracts.js +1225 -421
  63. package/dest/eth-signer/eth-signer.d.ts +21 -0
  64. package/dest/eth-signer/eth-signer.d.ts.map +1 -0
  65. package/dest/eth-signer/eth-signer.js +5 -0
  66. package/dest/eth-signer/index.d.ts +2 -0
  67. package/dest/eth-signer/index.d.ts.map +1 -0
  68. package/dest/eth-signer/index.js +1 -0
  69. package/dest/index.d.ts +7 -3
  70. package/dest/index.d.ts.map +1 -1
  71. package/dest/index.js +6 -2
  72. package/dest/l1_artifacts.d.ts +77344 -0
  73. package/dest/l1_artifacts.d.ts.map +1 -0
  74. package/dest/l1_artifacts.js +166 -0
  75. package/dest/l1_contract_addresses.d.ts +24 -4
  76. package/dest/l1_contract_addresses.d.ts.map +1 -1
  77. package/dest/l1_contract_addresses.js +22 -18
  78. package/dest/l1_reader.d.ts +2 -2
  79. package/dest/l1_reader.d.ts.map +1 -1
  80. package/dest/l1_reader.js +8 -8
  81. package/dest/l1_tx_utils/config.d.ts +59 -0
  82. package/dest/l1_tx_utils/config.d.ts.map +1 -0
  83. package/dest/l1_tx_utils/config.js +82 -0
  84. package/dest/l1_tx_utils/constants.d.ts +6 -0
  85. package/dest/l1_tx_utils/constants.d.ts.map +1 -0
  86. package/dest/l1_tx_utils/constants.js +14 -0
  87. package/dest/l1_tx_utils/factory.d.ts +24 -0
  88. package/dest/l1_tx_utils/factory.d.ts.map +1 -0
  89. package/dest/l1_tx_utils/factory.js +12 -0
  90. package/dest/l1_tx_utils/index.d.ts +10 -0
  91. package/dest/l1_tx_utils/index.d.ts.map +1 -0
  92. package/dest/l1_tx_utils/index.js +10 -0
  93. package/dest/l1_tx_utils/interfaces.d.ts +76 -0
  94. package/dest/l1_tx_utils/interfaces.d.ts.map +1 -0
  95. package/dest/l1_tx_utils/interfaces.js +4 -0
  96. package/dest/l1_tx_utils/l1_tx_utils.d.ts +94 -0
  97. package/dest/l1_tx_utils/l1_tx_utils.d.ts.map +1 -0
  98. package/dest/l1_tx_utils/l1_tx_utils.js +610 -0
  99. package/dest/l1_tx_utils/l1_tx_utils_with_blobs.d.ts +26 -0
  100. package/dest/l1_tx_utils/l1_tx_utils_with_blobs.d.ts.map +1 -0
  101. package/dest/l1_tx_utils/l1_tx_utils_with_blobs.js +26 -0
  102. package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts +94 -0
  103. package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts.map +1 -0
  104. package/dest/l1_tx_utils/readonly_l1_tx_utils.js +430 -0
  105. package/dest/l1_tx_utils/signer.d.ts +4 -0
  106. package/dest/l1_tx_utils/signer.d.ts.map +1 -0
  107. package/dest/l1_tx_utils/signer.js +16 -0
  108. package/dest/l1_tx_utils/types.d.ts +67 -0
  109. package/dest/l1_tx_utils/types.d.ts.map +1 -0
  110. package/dest/l1_tx_utils/types.js +26 -0
  111. package/dest/l1_tx_utils/utils.d.ts +4 -0
  112. package/dest/l1_tx_utils/utils.d.ts.map +1 -0
  113. package/dest/l1_tx_utils/utils.js +14 -0
  114. package/dest/l1_types.d.ts +6 -0
  115. package/dest/l1_types.d.ts.map +1 -0
  116. package/dest/l1_types.js +1 -0
  117. package/dest/publisher_manager.d.ts +15 -0
  118. package/dest/publisher_manager.d.ts.map +1 -0
  119. package/dest/publisher_manager.js +88 -0
  120. package/dest/queries.d.ts +4 -2
  121. package/dest/queries.d.ts.map +1 -1
  122. package/dest/queries.js +53 -12
  123. package/dest/test/chain_monitor.d.ts +73 -0
  124. package/dest/test/chain_monitor.d.ts.map +1 -0
  125. package/dest/test/chain_monitor.js +215 -0
  126. package/dest/test/delayed_tx_utils.d.ts +8 -3
  127. package/dest/test/delayed_tx_utils.d.ts.map +1 -1
  128. package/dest/test/delayed_tx_utils.js +13 -6
  129. package/dest/test/eth_cheat_codes.d.ts +217 -0
  130. package/dest/test/eth_cheat_codes.d.ts.map +1 -0
  131. package/dest/test/eth_cheat_codes.js +558 -0
  132. package/dest/test/eth_cheat_codes_with_state.d.ts +2 -2
  133. package/dest/test/eth_cheat_codes_with_state.d.ts.map +1 -1
  134. package/dest/test/eth_cheat_codes_with_state.js +1 -1
  135. package/dest/test/index.d.ts +4 -1
  136. package/dest/test/index.d.ts.map +1 -1
  137. package/dest/test/index.js +3 -0
  138. package/dest/test/rollup_cheat_codes.d.ts +87 -0
  139. package/dest/test/rollup_cheat_codes.d.ts.map +1 -0
  140. package/dest/test/rollup_cheat_codes.js +266 -0
  141. package/dest/test/start_anvil.d.ts +7 -1
  142. package/dest/test/start_anvil.d.ts.map +1 -1
  143. package/dest/test/start_anvil.js +16 -7
  144. package/dest/test/tx_delayer.d.ts +18 -7
  145. package/dest/test/tx_delayer.d.ts.map +1 -1
  146. package/dest/test/tx_delayer.js +95 -19
  147. package/dest/test/upgrade_utils.d.ts +6 -5
  148. package/dest/test/upgrade_utils.d.ts.map +1 -1
  149. package/dest/test/upgrade_utils.js +23 -16
  150. package/dest/types.d.ts +7 -8
  151. package/dest/types.d.ts.map +1 -1
  152. package/dest/types.js +3 -1
  153. package/dest/utils.d.ts +2 -1
  154. package/dest/utils.d.ts.map +1 -1
  155. package/dest/utils.js +43 -88
  156. package/dest/zkPassportVerifierAddress.d.ts +15 -0
  157. package/dest/zkPassportVerifierAddress.d.ts.map +1 -0
  158. package/dest/zkPassportVerifierAddress.js +11 -0
  159. package/package.json +28 -19
  160. package/src/account.ts +5 -0
  161. package/src/client.ts +42 -4
  162. package/src/config.ts +592 -31
  163. package/src/contracts/empire_base.ts +77 -7
  164. package/src/contracts/empire_slashing_proposer.ts +265 -0
  165. package/src/contracts/errors.ts +13 -0
  166. package/src/contracts/fee_asset_handler.ts +63 -0
  167. package/src/contracts/fee_juice.ts +29 -15
  168. package/src/contracts/governance.ts +80 -77
  169. package/src/contracts/governance_proposer.ts +66 -24
  170. package/src/contracts/gse.ts +88 -0
  171. package/src/contracts/inbox.ts +63 -0
  172. package/src/contracts/index.ts +8 -2
  173. package/src/contracts/multicall.ts +155 -0
  174. package/src/contracts/registry.ts +51 -26
  175. package/src/contracts/rollup.ts +596 -74
  176. package/src/contracts/slasher_contract.ts +89 -0
  177. package/src/contracts/tally_slashing_proposer.ts +316 -0
  178. package/src/contracts/utils.ts +14 -0
  179. package/src/deploy_l1_contracts.ts +1459 -538
  180. package/src/eth-signer/eth-signer.ts +25 -0
  181. package/src/eth-signer/index.ts +1 -0
  182. package/src/index.ts +6 -2
  183. package/src/l1_artifacts.ts +254 -0
  184. package/src/l1_contract_addresses.ts +32 -19
  185. package/src/l1_reader.ts +9 -9
  186. package/src/l1_tx_utils/README.md +177 -0
  187. package/src/l1_tx_utils/config.ts +143 -0
  188. package/src/l1_tx_utils/constants.ts +18 -0
  189. package/src/l1_tx_utils/factory.ts +64 -0
  190. package/src/l1_tx_utils/index.ts +12 -0
  191. package/src/l1_tx_utils/interfaces.ts +86 -0
  192. package/src/l1_tx_utils/l1_tx_utils.ts +718 -0
  193. package/src/l1_tx_utils/l1_tx_utils_with_blobs.ts +77 -0
  194. package/src/l1_tx_utils/readonly_l1_tx_utils.ts +558 -0
  195. package/src/l1_tx_utils/signer.ts +28 -0
  196. package/src/l1_tx_utils/types.ts +85 -0
  197. package/src/l1_tx_utils/utils.ts +16 -0
  198. package/src/l1_types.ts +6 -0
  199. package/src/publisher_manager.ts +106 -0
  200. package/src/queries.ts +73 -15
  201. package/src/test/chain_monitor.ts +243 -0
  202. package/src/test/delayed_tx_utils.ts +34 -6
  203. package/src/test/eth_cheat_codes.ts +588 -0
  204. package/src/test/eth_cheat_codes_with_state.ts +1 -1
  205. package/src/test/index.ts +3 -0
  206. package/src/test/rollup_cheat_codes.ts +307 -0
  207. package/src/test/start_anvil.ts +22 -5
  208. package/src/test/tx_delayer.ts +127 -26
  209. package/src/test/upgrade_utils.ts +30 -21
  210. package/src/types.ts +10 -8
  211. package/src/utils.ts +49 -90
  212. package/src/zkPassportVerifierAddress.ts +15 -0
  213. package/dest/contracts/forwarder.d.ts +0 -24
  214. package/dest/contracts/forwarder.d.ts.map +0 -1
  215. package/dest/contracts/forwarder.js +0 -101
  216. package/dest/contracts/slashing_proposer.d.ts +0 -21
  217. package/dest/contracts/slashing_proposer.d.ts.map +0 -1
  218. package/dest/contracts/slashing_proposer.js +0 -47
  219. package/dest/eth_cheat_codes.d.ts +0 -147
  220. package/dest/eth_cheat_codes.d.ts.map +0 -1
  221. package/dest/eth_cheat_codes.js +0 -303
  222. package/dest/l1_tx_utils.d.ts +0 -192
  223. package/dest/l1_tx_utils.d.ts.map +0 -1
  224. package/dest/l1_tx_utils.js +0 -641
  225. package/dest/l1_tx_utils_with_blobs.d.ts +0 -12
  226. package/dest/l1_tx_utils_with_blobs.d.ts.map +0 -1
  227. package/dest/l1_tx_utils_with_blobs.js +0 -64
  228. package/src/contracts/forwarder.ts +0 -132
  229. package/src/contracts/slashing_proposer.ts +0 -51
  230. package/src/eth_cheat_codes.ts +0 -314
  231. package/src/l1_tx_utils.ts +0 -847
  232. package/src/l1_tx_utils_with_blobs.ts +0 -86
@@ -0,0 +1,155 @@
1
+ import { toHex as toPaddedHex } from '@aztec/foundation/bigint-buffer';
2
+ import { TimeoutError } from '@aztec/foundation/error';
3
+ import type { Logger } from '@aztec/foundation/log';
4
+
5
+ import { type EncodeFunctionDataParameters, type Hex, encodeFunctionData, multicall3Abi } from 'viem';
6
+
7
+ import type { L1BlobInputs, L1TxConfig, L1TxRequest, L1TxUtils } from '../l1_tx_utils/index.js';
8
+ import type { ExtendedViemWalletClient } from '../types.js';
9
+ import { FormattedViemError, formatViemError } from '../utils.js';
10
+ import { RollupContract } from './rollup.js';
11
+
12
+ export const MULTI_CALL_3_ADDRESS = '0xcA11bde05977b3631167028862bE2a173976CA11' as const;
13
+
14
+ export class Multicall3 {
15
+ static async forward(
16
+ requests: L1TxRequest[],
17
+ l1TxUtils: L1TxUtils,
18
+ gasConfig: L1TxConfig | undefined,
19
+ blobConfig: L1BlobInputs | undefined,
20
+ rollupAddress: Hex,
21
+ logger: Logger,
22
+ opts: { revertOnFailure?: boolean } = {},
23
+ ) {
24
+ requests = requests.filter(request => request.to !== null);
25
+ const args = requests.map(r => ({
26
+ target: r.to!,
27
+ callData: r.data!,
28
+ allowFailure: !opts.revertOnFailure,
29
+ }));
30
+ const forwarderFunctionData: Required<EncodeFunctionDataParameters<typeof multicall3Abi, 'aggregate3'>> = {
31
+ abi: multicall3Abi,
32
+ functionName: 'aggregate3',
33
+ args: [args],
34
+ };
35
+
36
+ const encodedForwarderData = encodeFunctionData(forwarderFunctionData);
37
+
38
+ try {
39
+ const { receipt, state } = await l1TxUtils.sendAndMonitorTransaction(
40
+ { to: MULTI_CALL_3_ADDRESS, data: encodedForwarderData },
41
+ gasConfig,
42
+ blobConfig,
43
+ );
44
+
45
+ if (receipt.status === 'success') {
46
+ const stats = await l1TxUtils.getTransactionStats(receipt.transactionHash);
47
+ return { receipt, stats };
48
+ } else {
49
+ logger.error('Forwarder transaction failed', undefined, { receipt });
50
+
51
+ const args = {
52
+ ...forwarderFunctionData,
53
+ address: MULTI_CALL_3_ADDRESS,
54
+ };
55
+
56
+ let errorMsg: string | undefined;
57
+
58
+ if (blobConfig) {
59
+ const maxFeePerBlobGas = blobConfig.maxFeePerBlobGas ?? state.gasPrice.maxFeePerBlobGas;
60
+ if (maxFeePerBlobGas === undefined) {
61
+ errorMsg = 'maxFeePerBlobGas is required to get the error message';
62
+ } else {
63
+ logger.debug('Trying to get error from reverted tx with blob config');
64
+ errorMsg = await l1TxUtils.tryGetErrorFromRevertedTx(
65
+ encodedForwarderData,
66
+ args,
67
+ {
68
+ blobs: blobConfig.blobs,
69
+ kzg: blobConfig.kzg,
70
+ maxFeePerBlobGas,
71
+ },
72
+ [
73
+ {
74
+ address: rollupAddress,
75
+ stateDiff: [
76
+ {
77
+ slot: toPaddedHex(RollupContract.checkBlobStorageSlot, true),
78
+ value: toPaddedHex(0n, true),
79
+ },
80
+ ],
81
+ },
82
+ ],
83
+ );
84
+ }
85
+ } else {
86
+ logger.debug('Trying to get error from reverted tx without blob config');
87
+ errorMsg = await l1TxUtils.tryGetErrorFromRevertedTx(encodedForwarderData, args, undefined, []);
88
+ }
89
+
90
+ return { receipt, errorMsg };
91
+ }
92
+ } catch (err) {
93
+ if (err instanceof TimeoutError) {
94
+ throw err;
95
+ }
96
+
97
+ for (const request of requests) {
98
+ logger.debug('Simulating request', { request });
99
+ const result = await l1TxUtils
100
+ .simulate(request, undefined, [
101
+ {
102
+ address: rollupAddress,
103
+ stateDiff: [
104
+ { slot: toPaddedHex(RollupContract.checkBlobStorageSlot, true), value: toPaddedHex(0n, true) },
105
+ ],
106
+ },
107
+ ])
108
+ .catch(err => formatViemError(err, request.abi));
109
+ if (result instanceof FormattedViemError) {
110
+ logger.error('Found error in simulation', result, {
111
+ to: request.to ?? 'null',
112
+ data: request.data,
113
+ });
114
+
115
+ return result;
116
+ }
117
+ }
118
+ logger.warn('Failed to get error from reverted tx', { err });
119
+ throw err;
120
+ }
121
+ }
122
+ }
123
+
124
+ export async function deployMulticall3(l1Client: ExtendedViemWalletClient, logger: Logger) {
125
+ const existing = await l1Client.getCode({ address: MULTI_CALL_3_ADDRESS });
126
+ if (existing && existing !== '0x') {
127
+ logger.verbose('Multicall3 already deployed', { address: MULTI_CALL_3_ADDRESS });
128
+ return;
129
+ }
130
+
131
+ const deployer = '0x05f32b3cc3888453ff71b01135b34ff8e41263f2';
132
+ const sendEth = await l1Client.sendTransaction({ to: deployer, value: 10n ** 17n });
133
+ logger.info('Sent 0.1 ETH to deployer', { deployer, value: 10n ** 17n });
134
+ const sendEthReceipt = await l1Client.waitForTransactionReceipt({ hash: sendEth });
135
+ if (sendEthReceipt.status !== 'success') {
136
+ logger.error('Failed to send ETH to deployer', undefined, { sendEthReceipt });
137
+ throw new Error('Failed to send ETH to deployer');
138
+ } else {
139
+ logger.info('Sent 0.1 ETH to deployer', { deployer, value: 10n ** 17n });
140
+ }
141
+
142
+ const tx =
143
+ '0xf90f538085174876e800830f42408080b90f00608060405234801561001057600080fd5b50610ee0806100206000396000f3fe6080604052600436106100f35760003560e01c80634d2301cc1161008a578063a8b0574e11610059578063a8b0574e1461025a578063bce38bd714610275578063c3077fa914610288578063ee82ac5e1461029b57600080fd5b80634d2301cc146101ec57806372425d9d1461022157806382ad56cb1461023457806386d516e81461024757600080fd5b80633408e470116100c65780633408e47014610191578063399542e9146101a45780633e64a696146101c657806342cbb15c146101d957600080fd5b80630f28c97d146100f8578063174dea711461011a578063252dba421461013a57806327e86d6e1461015b575b600080fd5b34801561010457600080fd5b50425b6040519081526020015b60405180910390f35b61012d610128366004610a85565b6102ba565b6040516101119190610bbe565b61014d610148366004610a85565b6104ef565b604051610111929190610bd8565b34801561016757600080fd5b50437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0140610107565b34801561019d57600080fd5b5046610107565b6101b76101b2366004610c60565b610690565b60405161011193929190610cba565b3480156101d257600080fd5b5048610107565b3480156101e557600080fd5b5043610107565b3480156101f857600080fd5b50610107610207366004610ce2565b73ffffffffffffffffffffffffffffffffffffffff163190565b34801561022d57600080fd5b5044610107565b61012d610242366004610a85565b6106ab565b34801561025357600080fd5b5045610107565b34801561026657600080fd5b50604051418152602001610111565b61012d610283366004610c60565b61085a565b6101b7610296366004610a85565b610a1a565b3480156102a757600080fd5b506101076102b6366004610d18565b4090565b60606000828067ffffffffffffffff8111156102d8576102d8610d31565b60405190808252806020026020018201604052801561031e57816020015b6040805180820190915260008152606060208201528152602001906001900390816102f65790505b5092503660005b8281101561047757600085828151811061034157610341610d60565b6020026020010151905087878381811061035d5761035d610d60565b905060200281019061036f9190610d8f565b6040810135958601959093506103886020850185610ce2565b73ffffffffffffffffffffffffffffffffffffffff16816103ac6060870187610dcd565b6040516103ba929190610e32565b60006040518083038185875af1925050503d80600081146103f7576040519150601f19603f3d011682016040523d82523d6000602084013e6103fc565b606091505b50602080850191909152901515808452908501351761046d577f08c379a000000000000000000000000000000000000000000000000000000000600052602060045260176024527f4d756c746963616c6c333a2063616c6c206661696c656400000000000000000060445260846000fd5b5050600101610325565b508234146104e6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f4d756c746963616c6c333a2076616c7565206d69736d6174636800000000000060448201526064015b60405180910390fd5b50505092915050565b436060828067ffffffffffffffff81111561050c5761050c610d31565b60405190808252806020026020018201604052801561053f57816020015b606081526020019060019003908161052a5790505b5091503660005b8281101561068657600087878381811061056257610562610d60565b90506020028101906105749190610e42565b92506105836020840184610ce2565b73ffffffffffffffffffffffffffffffffffffffff166105a66020850185610dcd565b6040516105b4929190610e32565b6000604051808303816000865af19150503d80600081146105f1576040519150601f19603f3d011682016040523d82523d6000602084013e6105f6565b606091505b5086848151811061060957610609610d60565b602090810291909101015290508061067d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f4d756c746963616c6c333a2063616c6c206661696c656400000000000000000060448201526064016104dd565b50600101610546565b5050509250929050565b43804060606106a086868661085a565b905093509350939050565b6060818067ffffffffffffffff8111156106c7576106c7610d31565b60405190808252806020026020018201604052801561070d57816020015b6040805180820190915260008152606060208201528152602001906001900390816106e55790505b5091503660005b828110156104e657600084828151811061073057610730610d60565b6020026020010151905086868381811061074c5761074c610d60565b905060200281019061075e9190610e76565b925061076d6020840184610ce2565b73ffffffffffffffffffffffffffffffffffffffff166107906040850185610dcd565b60405161079e929190610e32565b6000604051808303816000865af19150503d80600081146107db576040519150601f19603f3d011682016040523d82523d6000602084013e6107e0565b606091505b506020808401919091529015158083529084013517610851577f08c379a000000000000000000000000000000000000000000000000000000000600052602060045260176024527f4d756c746963616c6c333a2063616c6c206661696c656400000000000000000060445260646000fd5b50600101610714565b6060818067ffffffffffffffff81111561087657610876610d31565b6040519080825280602002602001820160405280156108bc57816020015b6040805180820190915260008152606060208201528152602001906001900390816108945790505b5091503660005b82811015610a105760008482815181106108df576108df610d60565b602002602001015190508686838181106108fb576108fb610d60565b905060200281019061090d9190610e42565b925061091c6020840184610ce2565b73ffffffffffffffffffffffffffffffffffffffff1661093f6020850185610dcd565b60405161094d929190610e32565b6000604051808303816000865af19150503d806000811461098a576040519150601f19603f3d011682016040523d82523d6000602084013e61098f565b606091505b506020830152151581528715610a07578051610a07576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f4d756c746963616c6c333a2063616c6c206661696c656400000000000000000060448201526064016104dd565b506001016108c3565b5050509392505050565b6000806060610a2b60018686610690565b919790965090945092505050565b60008083601f840112610a4b57600080fd5b50813567ffffffffffffffff811115610a6357600080fd5b6020830191508360208260051b8501011115610a7e57600080fd5b9250929050565b60008060208385031215610a9857600080fd5b823567ffffffffffffffff811115610aaf57600080fd5b610abb85828601610a39565b90969095509350505050565b6000815180845260005b81811015610aed57602081850181015186830182015201610ad1565b81811115610aff576000602083870101525b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b600082825180855260208086019550808260051b84010181860160005b84811015610bb1578583037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe001895281518051151584528401516040858501819052610b9d81860183610ac7565b9a86019a9450505090830190600101610b4f565b5090979650505050505050565b602081526000610bd16020830184610b32565b9392505050565b600060408201848352602060408185015281855180845260608601915060608160051b870101935082870160005b82811015610c52577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0888703018452610c40868351610ac7565b95509284019290840190600101610c06565b509398975050505050505050565b600080600060408486031215610c7557600080fd5b83358015158114610c8557600080fd5b9250602084013567ffffffffffffffff811115610ca157600080fd5b610cad86828701610a39565b9497909650939450505050565b838152826020820152606060408201526000610cd96060830184610b32565b95945050505050565b600060208284031215610cf457600080fd5b813573ffffffffffffffffffffffffffffffffffffffff81168114610bd157600080fd5b600060208284031215610d2a57600080fd5b5035919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b600082357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81833603018112610dc357600080fd5b9190910192915050565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1843603018112610e0257600080fd5b83018035915067ffffffffffffffff821115610e1d57600080fd5b602001915036819003821315610a7e57600080fd5b8183823760009101908152919050565b600082357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc1833603018112610dc357600080fd5b600082357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa1833603018112610dc357600080fdfea2646970667358221220bb2b5c71a328032f97c676ae39a1ec2148d3e5d6f73d95e9b17910152d61f16264736f6c634300080c00331ca0edce47092c0f398cebf3ffc267f05c8e7076e3b89445e0fe50f6332273d4569ba01b0b9d000e19b24c5869b0fc3b22b0d6fa47cd63316875cbbd577d76e6fde086';
144
+
145
+ const deployTx = await l1Client.sendRawTransaction({
146
+ serializedTransaction: tx,
147
+ });
148
+ const deployTxReceipt = await l1Client.waitForTransactionReceipt({ hash: deployTx });
149
+ if (deployTxReceipt.status !== 'success') {
150
+ logger.error('Failed to deploy Multicall3', undefined, { deployTxReceipt });
151
+ throw new Error('Failed to deploy Multicall3');
152
+ } else {
153
+ logger.info('Deployed Multicall3');
154
+ }
155
+ }
@@ -1,26 +1,25 @@
1
1
  import { EthAddress } from '@aztec/foundation/eth-address';
2
+ import { createLogger } from '@aztec/foundation/log';
2
3
  import { RegistryAbi } from '@aztec/l1-artifacts/RegistryAbi';
3
4
  import { TestERC20Abi } from '@aztec/l1-artifacts/TestERC20Abi';
4
5
 
5
- import {
6
- type Chain,
7
- type GetContractReturnType,
8
- type Hex,
9
- type HttpTransport,
10
- type PublicClient,
11
- getContract,
12
- } from 'viem';
6
+ import { type GetContractReturnType, type Hex, getContract } from 'viem';
13
7
 
14
8
  import type { L1ContractAddresses } from '../l1_contract_addresses.js';
15
- import type { L1Clients, ViemPublicClient } from '../types.js';
16
- import { GovernanceContract } from './governance.js';
9
+ import type { ViemClient } from '../types.js';
10
+ import { ReadOnlyGovernanceContract } from './governance.js';
17
11
  import { RollupContract } from './rollup.js';
18
12
 
19
13
  export class RegistryContract {
20
14
  public address: EthAddress;
21
- private readonly registry: GetContractReturnType<typeof RegistryAbi, PublicClient<HttpTransport, Chain>>;
22
15
 
23
- constructor(public readonly client: L1Clients['publicClient'], address: Hex | EthAddress) {
16
+ private readonly log = createLogger('ethereum:contracts:registry');
17
+ private readonly registry: GetContractReturnType<typeof RegistryAbi, ViemClient>;
18
+
19
+ constructor(
20
+ public readonly client: ViemClient,
21
+ address: Hex | EthAddress,
22
+ ) {
24
23
  if (address instanceof EthAddress) {
25
24
  address = address.toString();
26
25
  }
@@ -28,6 +27,10 @@ export class RegistryContract {
28
27
  this.registry = getContract({ address, abi: RegistryAbi, client });
29
28
  }
30
29
 
30
+ public async getOwner(): Promise<EthAddress> {
31
+ return EthAddress.fromString(await this.registry.read.owner());
32
+ }
33
+
31
34
  /**
32
35
  * Returns the address of the rollup for a given version.
33
36
  * @param version - The version of the rollup. 'canonical' can be used to get the canonical address (i.e. the latest version).
@@ -42,12 +45,19 @@ export class RegistryContract {
42
45
  version = BigInt(version);
43
46
  }
44
47
 
45
- const snapshot = await this.registry.read.getSnapshot([version]);
46
- const address = EthAddress.fromString(snapshot.rollup);
47
- if (address.equals(EthAddress.ZERO)) {
48
+ try {
49
+ return EthAddress.fromString(await this.registry.read.getRollup([version]));
50
+ } catch {
51
+ this.log.warn(`Failed fetching rollup address for version ${version}. Retrying as index.`);
52
+ }
53
+
54
+ try {
55
+ const actualVersion = await this.registry.read.getVersion([version]);
56
+ const rollupAddress = await this.registry.read.getRollup([actualVersion]);
57
+ return EthAddress.fromString(rollupAddress);
58
+ } catch {
48
59
  throw new Error('Rollup address is undefined');
49
60
  }
50
- return address;
51
61
  }
52
62
 
53
63
  /**
@@ -55,28 +65,23 @@ export class RegistryContract {
55
65
  * @returns The canonical address of the rollup. If the rollup is not set, throws an error.
56
66
  */
57
67
  public async getCanonicalAddress(): Promise<EthAddress> {
58
- const snapshot = await this.registry.read.getCurrentSnapshot();
59
- const address = EthAddress.fromString(snapshot.rollup);
60
- if (address.equals(EthAddress.ZERO)) {
61
- throw new Error('Rollup address is undefined');
62
- }
63
- return address;
68
+ return EthAddress.fromString(await this.registry.read.getCanonicalRollup());
64
69
  }
65
70
 
66
71
  public async getGovernanceAddresses(): Promise<
67
72
  Pick<L1ContractAddresses, 'governanceProposerAddress' | 'governanceAddress'>
68
73
  > {
69
74
  const governanceAddress = await this.registry.read.getGovernance();
70
- const governance = new GovernanceContract(governanceAddress, this.client, undefined);
71
- const governanceProposer = await governance.getProposer();
75
+ const governance = new ReadOnlyGovernanceContract(governanceAddress, this.client);
76
+ const governanceProposerAddress = await governance.getGovernanceProposerAddress();
72
77
  return {
73
78
  governanceAddress: governance.address,
74
- governanceProposerAddress: governanceProposer.address,
79
+ governanceProposerAddress: governanceProposerAddress,
75
80
  };
76
81
  }
77
82
 
78
83
  public static async collectAddresses(
79
- client: ViemPublicClient,
84
+ client: ViemClient,
80
85
  registryAddress: Hex | EthAddress,
81
86
  rollupVersion: number | bigint | 'canonical',
82
87
  ): Promise<L1ContractAddresses> {
@@ -103,4 +108,24 @@ export class RegistryContract {
103
108
  coinIssuerAddress: EthAddress.fromString(coinIssuer),
104
109
  };
105
110
  }
111
+
112
+ public async getNumberOfVersions(): Promise<number> {
113
+ const version = await this.registry.read.numberOfVersions();
114
+ return Number(version);
115
+ }
116
+
117
+ public async getRollupVersions(): Promise<bigint[]> {
118
+ const count = await this.getNumberOfVersions();
119
+
120
+ const versions: bigint[] = [];
121
+ for (let i = 0; i < count; i++) {
122
+ versions.push(await this.registry.read.getVersion([BigInt(i)]));
123
+ }
124
+
125
+ return versions;
126
+ }
127
+
128
+ public async getRewardDistributor(): Promise<EthAddress> {
129
+ return EthAddress.fromString(await this.registry.read.getRewardDistributor());
130
+ }
106
131
  }