@aztec/ethereum 0.58.0 → 0.60.0

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.
@@ -64,7 +64,24 @@ export interface L1ContractArtifactsForDeployment {
64
64
  * Fee juice portal contract artifacts. Optional for now as gas is not strictly enforced
65
65
  */
66
66
  feeJuicePortal: ContractArtifacts;
67
+ /**
68
+ * Nomismatokopio contract artifacts.
69
+ */
70
+ nomismatokopio: ContractArtifacts;
71
+ /**
72
+ * Sysstia contract artifacts.
73
+ */
74
+ sysstia: ContractArtifacts;
75
+ /**
76
+ * Gerousia contract artifacts.
77
+ */
78
+ gerousia: ContractArtifacts;
79
+ /**
80
+ * Apella contract artifacts.
81
+ */
82
+ apella: ContractArtifacts;
67
83
  }
84
+ export declare const l1Artifacts: L1ContractArtifactsForDeployment;
68
85
  export interface DeployL1ContractsArgs {
69
86
  /**
70
87
  * The address of the L2 Fee Juice contract.
@@ -109,11 +126,10 @@ export declare function createL1Clients(rpcUrl: string, mnemonicOrPrivateKeyOrHd
109
126
  * @param account - Private Key or HD Account that will deploy the contracts.
110
127
  * @param chain - The chain instance to deploy to.
111
128
  * @param logger - A logger object.
112
- * @param contractsToDeploy - The set of L1 artifacts to be deployed
113
129
  * @param args - Arguments for initialization of L1 contracts
114
130
  * @returns A list of ETH addresses of the deployed contracts.
115
131
  */
116
- export declare const deployL1Contracts: (rpcUrl: string, account: HDAccount | PrivateKeyAccount, chain: Chain, logger: DebugLogger, contractsToDeploy: L1ContractArtifactsForDeployment, args: DeployL1ContractsArgs) => Promise<DeployL1Contracts>;
132
+ export declare const deployL1Contracts: (rpcUrl: string, account: HDAccount | PrivateKeyAccount, chain: Chain, logger: DebugLogger, args: DeployL1ContractsArgs) => Promise<DeployL1Contracts>;
117
133
  /**
118
134
  * Compiles a contract source code using the provided solc compiler.
119
135
  * @param fileName - Contract file name (eg UltraHonkVerifier.sol)
@@ -1 +1 @@
1
- {"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../src/deploy_l1_contracts.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../src/deploy_l1_contracts.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,51 @@
1
1
  import { EthAddress } from '@aztec/foundation/eth-address';
2
+ import { ApellaAbi, ApellaBytecode, FeeJuicePortalAbi, FeeJuicePortalBytecode, GerousiaAbi, GerousiaBytecode, InboxAbi, InboxBytecode, NomismatokopioAbi, NomismatokopioBytecode, OutboxAbi, OutboxBytecode, RegistryAbi, RegistryBytecode, RollupAbi, RollupBytecode, SysstiaAbi, SysstiaBytecode, TestERC20Abi, TestERC20Bytecode, } from '@aztec/l1-artifacts';
2
3
  import { concatHex, createPublicClient, createWalletClient, encodeDeployData, getAddress, getContract, getContractAddress, http, numberToHex, padHex, zeroAddress, } from 'viem';
3
4
  import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
4
5
  import { foundry } from 'viem/chains';
5
6
  import { isAnvilTestChain } from './ethereum_chain.js';
7
+ export const l1Artifacts = {
8
+ registry: {
9
+ contractAbi: RegistryAbi,
10
+ contractBytecode: RegistryBytecode,
11
+ },
12
+ inbox: {
13
+ contractAbi: InboxAbi,
14
+ contractBytecode: InboxBytecode,
15
+ },
16
+ outbox: {
17
+ contractAbi: OutboxAbi,
18
+ contractBytecode: OutboxBytecode,
19
+ },
20
+ rollup: {
21
+ contractAbi: RollupAbi,
22
+ contractBytecode: RollupBytecode,
23
+ },
24
+ feeJuice: {
25
+ contractAbi: TestERC20Abi,
26
+ contractBytecode: TestERC20Bytecode,
27
+ },
28
+ feeJuicePortal: {
29
+ contractAbi: FeeJuicePortalAbi,
30
+ contractBytecode: FeeJuicePortalBytecode,
31
+ },
32
+ sysstia: {
33
+ contractAbi: SysstiaAbi,
34
+ contractBytecode: SysstiaBytecode,
35
+ },
36
+ nomismatokopio: {
37
+ contractAbi: NomismatokopioAbi,
38
+ contractBytecode: NomismatokopioBytecode,
39
+ },
40
+ gerousia: {
41
+ contractAbi: GerousiaAbi,
42
+ contractBytecode: GerousiaBytecode,
43
+ },
44
+ apella: {
45
+ contractAbi: ApellaAbi,
46
+ contractBytecode: ApellaBytecode,
47
+ },
48
+ };
6
49
  /**
7
50
  * Creates a wallet and a public viem client for interacting with L1.
8
51
  * @param rpcUrl - RPC URL to connect to L1.
@@ -33,11 +76,10 @@ export function createL1Clients(rpcUrl, mnemonicOrPrivateKeyOrHdAccount, chain =
33
76
  * @param account - Private Key or HD Account that will deploy the contracts.
34
77
  * @param chain - The chain instance to deploy to.
35
78
  * @param logger - A logger object.
36
- * @param contractsToDeploy - The set of L1 artifacts to be deployed
37
79
  * @param args - Arguments for initialization of L1 contracts
38
80
  * @returns A list of ETH addresses of the deployed contracts.
39
81
  */
40
- export const deployL1Contracts = async (rpcUrl, account, chain, logger, contractsToDeploy, args) => {
82
+ export const deployL1Contracts = async (rpcUrl, account, chain, logger, args) => {
41
83
  // We are assuming that you are running this on a local anvil node which have 1s block times
42
84
  // To align better with actual deployment, we update the block interval to 12s
43
85
  // The code is same as `setBlockInterval` in `cheat_codes.ts`
@@ -51,7 +93,7 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, contract
51
93
  return await (await fetch(rpcUrl, content)).json();
52
94
  };
53
95
  if (isAnvilTestChain(chain.id)) {
54
- const interval = 12;
96
+ const interval = 12; // @todo #8084
55
97
  const res = await rpcCall('anvil_setBlockTimestampInterval', [interval]);
56
98
  if (res.error) {
57
99
  throw new Error(`Error setting block interval: ${res.error.message}`);
@@ -61,19 +103,49 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, contract
61
103
  logger.info(`Deploying contracts from ${account.address.toString()}...`);
62
104
  const walletClient = createWalletClient({ account, chain, transport: http(rpcUrl) });
63
105
  const publicClient = createPublicClient({ chain, transport: http(rpcUrl) });
64
- const deployer = new L1Deployer(walletClient, publicClient, args.salt, logger);
65
- const registryAddress = await deployer.deploy(contractsToDeploy.registry, [account.address.toString()]);
106
+ // Governance stuff
107
+ const govDeployer = new L1Deployer(walletClient, publicClient, args.salt, logger);
108
+ const registryAddress = await govDeployer.deploy(l1Artifacts.registry, [account.address.toString()]);
66
109
  logger.info(`Deployed Registry at ${registryAddress}`);
67
- const feeJuiceAddress = await deployer.deploy(contractsToDeploy.feeJuice);
110
+ const feeJuiceAddress = await govDeployer.deploy(l1Artifacts.feeJuice);
68
111
  logger.info(`Deployed Fee Juice at ${feeJuiceAddress}`);
69
- const feeJuicePortalAddress = await deployer.deploy(contractsToDeploy.feeJuicePortal, [
112
+ const nomismatokopioAddress = await govDeployer.deploy(l1Artifacts.nomismatokopio, [
113
+ feeJuiceAddress.toString(),
114
+ 1n * 10n ** 18n, // @todo #8084
115
+ account.address.toString(),
116
+ ]);
117
+ logger.info(`Deployed Nomismatokopio at ${nomismatokopioAddress}`);
118
+ const sysstiaAddress = await govDeployer.deploy(l1Artifacts.sysstia, [
119
+ feeJuiceAddress.toString(),
120
+ registryAddress.toString(),
121
+ ]);
122
+ logger.info(`Deployed Sysstia at ${sysstiaAddress}`);
123
+ // @todo #8084
124
+ // @note These numbers are just chosen to make testing simple.
125
+ const quorumSize = 6n;
126
+ const roundSize = 10n;
127
+ const gerousiaAddress = await govDeployer.deploy(l1Artifacts.gerousia, [
128
+ registryAddress.toString(),
129
+ quorumSize,
130
+ roundSize,
131
+ ]);
132
+ logger.info(`Deployed Gerousia at ${gerousiaAddress}`);
133
+ const apellaAddress = await govDeployer.deploy(l1Artifacts.apella, [
134
+ feeJuiceAddress.toString(),
135
+ gerousiaAddress.toString(),
136
+ ]);
137
+ logger.info(`Deployed Apella at ${apellaAddress}`);
138
+ await govDeployer.waitForDeployments();
139
+ logger.info(`All governance contracts deployed`);
140
+ const deployer = new L1Deployer(walletClient, publicClient, args.salt, logger);
141
+ const feeJuicePortalAddress = await deployer.deploy(l1Artifacts.feeJuicePortal, [
70
142
  account.address.toString(),
71
143
  registryAddress.toString(),
72
144
  feeJuiceAddress.toString(),
73
145
  args.l2FeeJuiceAddress.toString(),
74
146
  ]);
75
147
  logger.info(`Deployed Fee Juice Portal at ${feeJuicePortalAddress}`);
76
- const rollupAddress = await deployer.deploy(contractsToDeploy.rollup, [
148
+ const rollupAddress = await deployer.deploy(l1Artifacts.rollup, [
77
149
  feeJuicePortalAddress.toString(),
78
150
  args.vkTreeRoot.toString(),
79
151
  args.protocolContractTreeRoot.toString(),
@@ -82,20 +154,20 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, contract
82
154
  ]);
83
155
  logger.info(`Deployed Rollup at ${rollupAddress}`);
84
156
  await deployer.waitForDeployments();
85
- logger.info(`All contracts deployed`);
157
+ logger.info(`All core contracts deployed`);
86
158
  const feeJuicePortal = getContract({
87
159
  address: feeJuicePortalAddress.toString(),
88
- abi: contractsToDeploy.feeJuicePortal.contractAbi,
160
+ abi: l1Artifacts.feeJuicePortal.contractAbi,
89
161
  client: walletClient,
90
162
  });
91
163
  const feeJuice = getContract({
92
164
  address: feeJuiceAddress.toString(),
93
- abi: contractsToDeploy.feeJuice.contractAbi,
165
+ abi: l1Artifacts.feeJuice.contractAbi,
94
166
  client: walletClient,
95
167
  });
96
168
  const rollup = getContract({
97
169
  address: getAddress(rollupAddress.toString()),
98
- abi: contractsToDeploy.rollup.contractAbi,
170
+ abi: l1Artifacts.rollup.contractAbi,
99
171
  client: walletClient,
100
172
  });
101
173
  // Transaction hashes to await
@@ -153,7 +225,7 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, contract
153
225
  // We need to call a function on the registry to set the various contract addresses.
154
226
  const registryContract = getContract({
155
227
  address: getAddress(registryAddress.toString()),
156
- abi: contractsToDeploy.registry.contractAbi,
228
+ abi: l1Artifacts.registry.contractAbi,
157
229
  client: walletClient,
158
230
  });
159
231
  if (!(await registryContract.read.isRollupRegistered([getAddress(rollupAddress.toString())]))) {
@@ -164,6 +236,14 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, contract
164
236
  else {
165
237
  logger.verbose(`Registry ${registryAddress} has already registered rollup ${rollupAddress}`);
166
238
  }
239
+ // If the owner is not the Apella contract, transfer ownership to the Apella contract
240
+ if ((await registryContract.read.owner([])) !== getAddress(apellaAddress.toString())) {
241
+ const transferOwnershipTxHash = await registryContract.write.transferOwnership([getAddress(apellaAddress.toString())], {
242
+ account,
243
+ });
244
+ logger.verbose(`Transferring the ownership of the registry contract at ${registryAddress} to the Apella ${apellaAddress} in tx ${transferOwnershipTxHash}`);
245
+ txHashes.push(transferOwnershipTxHash);
246
+ }
167
247
  // Wait for all actions to be mined
168
248
  await Promise.all(txHashes.map(txHash => publicClient.waitForTransactionReceipt({ hash: txHash })));
169
249
  logger.verbose(`All transactions for L1 deployment have been mined`);
@@ -174,6 +254,10 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, contract
174
254
  outboxAddress,
175
255
  feeJuiceAddress,
176
256
  feeJuicePortalAddress,
257
+ nomismatokopioAddress,
258
+ sysstiaAddress,
259
+ gerousiaAddress,
260
+ apellaAddress,
177
261
  };
178
262
  return {
179
263
  walletClient,
@@ -275,4 +359,4 @@ export async function deployL1Contract(walletClient, publicClient, abi, bytecode
275
359
  return { address: EthAddress.fromString(address), txHash };
276
360
  }
277
361
  // docs:end:deployL1Contract
278
- //# 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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"}
362
+ //# 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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"}
@@ -1,12 +1,11 @@
1
1
  import { type ConfigMappingsType } from '@aztec/foundation/config';
2
2
  import { EthAddress } from '@aztec/foundation/eth-address';
3
- import type { DebugLogger } from '@aztec/foundation/log';
4
3
  /**
5
4
  * The names of the current L1 contract addresses.
6
5
  * NOTE: When changing this list, make sure to update CLI & CI scripts accordingly.
7
6
  * For reference: https://github.com/AztecProtocol/aztec-packages/pull/5553
8
7
  */
9
- export declare const l1ContractsNames: readonly ["rollupAddress", "registryAddress", "inboxAddress", "outboxAddress", "feeJuiceAddress", "feeJuicePortalAddress"];
8
+ export declare const l1ContractsNames: readonly ["rollupAddress", "registryAddress", "inboxAddress", "outboxAddress", "feeJuiceAddress", "feeJuicePortalAddress", "nomismatokopioAddress", "sysstiaAddress", "gerousiaAddress", "apellaAddress"];
10
9
  /**
11
10
  * Provides the directory of current L1 contract addresses
12
11
  */
@@ -14,6 +13,4 @@ export type L1ContractAddresses = {
14
13
  [K in (typeof l1ContractsNames)[number]]: EthAddress;
15
14
  };
16
15
  export declare const l1ContractAddressesMapping: ConfigMappingsType<L1ContractAddresses>;
17
- export declare function getL1ContractAddressesFromEnv(): L1ContractAddresses;
18
- export declare function getL1ContractAddressesFromUrl(url: string, log: DebugLogger): Promise<L1ContractAddresses>;
19
16
  //# sourceMappingURL=l1_contract_addresses.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"l1_contract_addresses.d.ts","sourceRoot":"","sources":["../src/l1_contract_addresses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAyB,MAAM,0BAA0B,CAAC;AAC1F,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,4HAOnB,CAAC;AAEX;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG;KAC/B,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,GAAG,UAAU;CACrD,CAAC;AAIF,eAAO,MAAM,0BAA0B,EAAE,kBAAkB,CAAC,mBAAmB,CA+B9E,CAAC;AAEF,wBAAgB,6BAA6B,wBAE5C;AAiBD,wBAAsB,6BAA6B,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAY/G"}
1
+ {"version":3,"file":"l1_contract_addresses.d.ts","sourceRoot":"","sources":["../src/l1_contract_addresses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,2MAWnB,CAAC;AAEX;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG;KAC/B,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,GAAG,UAAU;CACrD,CAAC;AAIF,eAAO,MAAM,0BAA0B,EAAE,kBAAkB,CAAC,mBAAmB,CAmD9E,CAAC"}
@@ -1,4 +1,3 @@
1
- import { getConfigFromMappings } from '@aztec/foundation/config';
2
1
  import { EthAddress } from '@aztec/foundation/eth-address';
3
2
  /**
4
3
  * The names of the current L1 contract addresses.
@@ -12,6 +11,10 @@ export const l1ContractsNames = [
12
11
  'outboxAddress',
13
12
  'feeJuiceAddress',
14
13
  'feeJuicePortalAddress',
14
+ 'nomismatokopioAddress',
15
+ 'sysstiaAddress',
16
+ 'gerousiaAddress',
17
+ 'apellaAddress',
15
18
  ];
16
19
  const parseEnv = (val) => EthAddress.fromString(val);
17
20
  export const l1ContractAddressesMapping = {
@@ -45,33 +48,25 @@ export const l1ContractAddressesMapping = {
45
48
  description: 'The deployed L1 Fee Juice portal contract address.',
46
49
  parseEnv,
47
50
  },
51
+ nomismatokopioAddress: {
52
+ env: 'NOMISMATOKOPIO_CONTRACT_ADDRESS',
53
+ description: 'The deployed L1 nomismatokopio contract address',
54
+ parseEnv,
55
+ },
56
+ sysstiaAddress: {
57
+ env: 'SYSSTIA_CONTRACT_ADDRESS',
58
+ description: 'The deployed L1 sysstia contract address',
59
+ parseEnv,
60
+ },
61
+ gerousiaAddress: {
62
+ env: 'GEROUSIA_CONTRACT_ADDRESS',
63
+ description: 'The deployed L1 gerousia contract address',
64
+ parseEnv,
65
+ },
66
+ apellaAddress: {
67
+ env: 'APELLA_CONTRACT_ADDRESS',
68
+ description: 'The deployed L1 apella contract address',
69
+ parseEnv,
70
+ },
48
71
  };
49
- export function getL1ContractAddressesFromEnv() {
50
- return getConfigFromMappings(l1ContractAddressesMapping);
51
- }
52
- function convertToL1ContractAddresses(obj) {
53
- if (typeof obj !== 'object' || obj === null) {
54
- throw new Error('Object is not valid');
55
- }
56
- const result = {};
57
- for (const key of l1ContractsNames) {
58
- const value = obj[key];
59
- result[key] = EthAddress.fromString(value);
60
- }
61
- return result;
62
- }
63
- export async function getL1ContractAddressesFromUrl(url, log) {
64
- try {
65
- const response = await fetch(url);
66
- if (!response.ok) {
67
- throw new Error(`HTTP error when fetching L1 contracts from ${url}. Status: ${response.status}`);
68
- }
69
- const data = await response.json();
70
- return convertToL1ContractAddresses(data);
71
- }
72
- catch (error) {
73
- log.error(`Error fetching JSON from ${url}:`, error);
74
- throw error;
75
- }
76
- }
77
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfY29udHJhY3RfYWRkcmVzc2VzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2wxX2NvbnRyYWN0X2FkZHJlc3Nlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQTJCLHFCQUFxQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDMUYsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRzNEOzs7O0dBSUc7QUFDSCxNQUFNLENBQUMsTUFBTSxnQkFBZ0IsR0FBRztJQUM5QixlQUFlO0lBQ2YsaUJBQWlCO0lBQ2pCLGNBQWM7SUFDZCxlQUFlO0lBQ2YsaUJBQWlCO0lBQ2pCLHVCQUF1QjtDQUNmLENBQUM7QUFTWCxNQUFNLFFBQVEsR0FBRyxDQUFDLEdBQVcsRUFBRSxFQUFFLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUU3RCxNQUFNLENBQUMsTUFBTSwwQkFBMEIsR0FBNEM7SUFDakYsYUFBYSxFQUFFO1FBQ2IsR0FBRyxFQUFFLHlCQUF5QjtRQUM5QixXQUFXLEVBQUUsMENBQTBDO1FBQ3ZELFFBQVE7S0FDVDtJQUNELGVBQWUsRUFBRTtRQUNmLEdBQUcsRUFBRSwyQkFBMkI7UUFDaEMsV0FBVyxFQUFFLDRDQUE0QztRQUN6RCxRQUFRO0tBQ1Q7SUFDRCxZQUFZLEVBQUU7UUFDWixHQUFHLEVBQUUsd0JBQXdCO1FBQzdCLFdBQVcsRUFBRSx5Q0FBeUM7UUFDdEQsUUFBUTtLQUNUO0lBQ0QsYUFBYSxFQUFFO1FBQ2IsR0FBRyxFQUFFLHlCQUF5QjtRQUM5QixXQUFXLEVBQUUsMENBQTBDO1FBQ3ZELFFBQVE7S0FDVDtJQUNELGVBQWUsRUFBRTtRQUNmLEdBQUcsRUFBRSw0QkFBNEI7UUFDakMsV0FBVyxFQUFFLDZDQUE2QztRQUMxRCxRQUFRO0tBQ1Q7SUFDRCxxQkFBcUIsRUFBRTtRQUNyQixHQUFHLEVBQUUsbUNBQW1DO1FBQ3hDLFdBQVcsRUFBRSxvREFBb0Q7UUFDakUsUUFBUTtLQUNUO0NBQ0YsQ0FBQztBQUVGLE1BQU0sVUFBVSw2QkFBNkI7SUFDM0MsT0FBTyxxQkFBcUIsQ0FBc0IsMEJBQTBCLENBQUMsQ0FBQztBQUNoRixDQUFDO0FBRUQsU0FBUyw0QkFBNEIsQ0FBQyxHQUFRO0lBQzVDLElBQUksT0FBTyxHQUFHLEtBQUssUUFBUSxJQUFJLEdBQUcsS0FBSyxJQUFJLEVBQUUsQ0FBQztRQUM1QyxNQUFNLElBQUksS0FBSyxDQUFDLHFCQUFxQixDQUFDLENBQUM7SUFDekMsQ0FBQztJQUVELE1BQU0sTUFBTSxHQUFpQyxFQUFFLENBQUM7SUFFaEQsS0FBSyxNQUFNLEdBQUcsSUFBSSxnQkFBZ0IsRUFBRSxDQUFDO1FBQ25DLE1BQU0sS0FBSyxHQUFHLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUN2QixNQUFNLENBQUMsR0FBRyxDQUFDLEdBQUcsVUFBVSxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUM3QyxDQUFDO0lBRUQsT0FBTyxNQUE2QixDQUFDO0FBQ3ZDLENBQUM7QUFFRCxNQUFNLENBQUMsS0FBSyxVQUFVLDZCQUE2QixDQUFDLEdBQVcsRUFBRSxHQUFnQjtJQUMvRSxJQUFJLENBQUM7UUFDSCxNQUFNLFFBQVEsR0FBRyxNQUFNLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNsQyxJQUFJLENBQUMsUUFBUSxDQUFDLEVBQUUsRUFBRSxDQUFDO1lBQ2pCLE1BQU0sSUFBSSxLQUFLLENBQUMsOENBQThDLEdBQUcsYUFBYSxRQUFRLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztRQUNuRyxDQUFDO1FBQ0QsTUFBTSxJQUFJLEdBQUcsTUFBTSxRQUFRLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDbkMsT0FBTyw0QkFBNEIsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUM1QyxDQUFDO0lBQUMsT0FBTyxLQUFLLEVBQUUsQ0FBQztRQUNmLEdBQUcsQ0FBQyxLQUFLLENBQUMsNEJBQTRCLEdBQUcsR0FBRyxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQ3JELE1BQU0sS0FBSyxDQUFDO0lBQ2QsQ0FBQztBQUNILENBQUMifQ==
72
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfY29udHJhY3RfYWRkcmVzc2VzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2wxX2NvbnRyYWN0X2FkZHJlc3Nlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFM0Q7Ozs7R0FJRztBQUNILE1BQU0sQ0FBQyxNQUFNLGdCQUFnQixHQUFHO0lBQzlCLGVBQWU7SUFDZixpQkFBaUI7SUFDakIsY0FBYztJQUNkLGVBQWU7SUFDZixpQkFBaUI7SUFDakIsdUJBQXVCO0lBQ3ZCLHVCQUF1QjtJQUN2QixnQkFBZ0I7SUFDaEIsaUJBQWlCO0lBQ2pCLGVBQWU7Q0FDUCxDQUFDO0FBU1gsTUFBTSxRQUFRLEdBQUcsQ0FBQyxHQUFXLEVBQUUsRUFBRSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUM7QUFFN0QsTUFBTSxDQUFDLE1BQU0sMEJBQTBCLEdBQTRDO0lBQ2pGLGFBQWEsRUFBRTtRQUNiLEdBQUcsRUFBRSx5QkFBeUI7UUFDOUIsV0FBVyxFQUFFLDBDQUEwQztRQUN2RCxRQUFRO0tBQ1Q7SUFDRCxlQUFlLEVBQUU7UUFDZixHQUFHLEVBQUUsMkJBQTJCO1FBQ2hDLFdBQVcsRUFBRSw0Q0FBNEM7UUFDekQsUUFBUTtLQUNUO0lBQ0QsWUFBWSxFQUFFO1FBQ1osR0FBRyxFQUFFLHdCQUF3QjtRQUM3QixXQUFXLEVBQUUseUNBQXlDO1FBQ3RELFFBQVE7S0FDVDtJQUNELGFBQWEsRUFBRTtRQUNiLEdBQUcsRUFBRSx5QkFBeUI7UUFDOUIsV0FBVyxFQUFFLDBDQUEwQztRQUN2RCxRQUFRO0tBQ1Q7SUFDRCxlQUFlLEVBQUU7UUFDZixHQUFHLEVBQUUsNEJBQTRCO1FBQ2pDLFdBQVcsRUFBRSw2Q0FBNkM7UUFDMUQsUUFBUTtLQUNUO0lBQ0QscUJBQXFCLEVBQUU7UUFDckIsR0FBRyxFQUFFLG1DQUFtQztRQUN4QyxXQUFXLEVBQUUsb0RBQW9EO1FBQ2pFLFFBQVE7S0FDVDtJQUNELHFCQUFxQixFQUFFO1FBQ3JCLEdBQUcsRUFBRSxpQ0FBaUM7UUFDdEMsV0FBVyxFQUFFLGlEQUFpRDtRQUM5RCxRQUFRO0tBQ1Q7SUFDRCxjQUFjLEVBQUU7UUFDZCxHQUFHLEVBQUUsMEJBQTBCO1FBQy9CLFdBQVcsRUFBRSwwQ0FBMEM7UUFDdkQsUUFBUTtLQUNUO0lBQ0QsZUFBZSxFQUFFO1FBQ2YsR0FBRyxFQUFFLDJCQUEyQjtRQUNoQyxXQUFXLEVBQUUsMkNBQTJDO1FBQ3hELFFBQVE7S0FDVDtJQUNELGFBQWEsRUFBRTtRQUNiLEdBQUcsRUFBRSx5QkFBeUI7UUFDOUIsV0FBVyxFQUFFLHlDQUF5QztRQUN0RCxRQUFRO0tBQ1Q7Q0FDRixDQUFDIn0=
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/ethereum",
3
- "version": "0.58.0",
3
+ "version": "0.60.0",
4
4
  "type": "module",
5
5
  "exports": "./dest/index.js",
6
6
  "typedocOptions": {
@@ -24,7 +24,8 @@
24
24
  "../package.common.json"
25
25
  ],
26
26
  "dependencies": {
27
- "@aztec/foundation": "0.58.0",
27
+ "@aztec/foundation": "0.60.0",
28
+ "@aztec/l1-artifacts": "0.60.0",
28
29
  "dotenv": "^16.0.3",
29
30
  "tslib": "^2.4.0",
30
31
  "viem": "^2.7.15"
@@ -2,6 +2,28 @@ import { type AztecAddress } from '@aztec/foundation/aztec-address';
2
2
  import { EthAddress } from '@aztec/foundation/eth-address';
3
3
  import { type Fr } from '@aztec/foundation/fields';
4
4
  import { type DebugLogger } from '@aztec/foundation/log';
5
+ import {
6
+ ApellaAbi,
7
+ ApellaBytecode,
8
+ FeeJuicePortalAbi,
9
+ FeeJuicePortalBytecode,
10
+ GerousiaAbi,
11
+ GerousiaBytecode,
12
+ InboxAbi,
13
+ InboxBytecode,
14
+ NomismatokopioAbi,
15
+ NomismatokopioBytecode,
16
+ OutboxAbi,
17
+ OutboxBytecode,
18
+ RegistryAbi,
19
+ RegistryBytecode,
20
+ RollupAbi,
21
+ RollupBytecode,
22
+ SysstiaAbi,
23
+ SysstiaBytecode,
24
+ TestERC20Abi,
25
+ TestERC20Bytecode,
26
+ } from '@aztec/l1-artifacts';
5
27
 
6
28
  import type { Abi, Narrow } from 'abitype';
7
29
  import {
@@ -89,8 +111,67 @@ export interface L1ContractArtifactsForDeployment {
89
111
  * Fee juice portal contract artifacts. Optional for now as gas is not strictly enforced
90
112
  */
91
113
  feeJuicePortal: ContractArtifacts;
114
+ /**
115
+ * Nomismatokopio contract artifacts.
116
+ */
117
+ nomismatokopio: ContractArtifacts;
118
+ /**
119
+ * Sysstia contract artifacts.
120
+ */
121
+ sysstia: ContractArtifacts;
122
+ /**
123
+ * Gerousia contract artifacts.
124
+ */
125
+ gerousia: ContractArtifacts;
126
+ /**
127
+ * Apella contract artifacts.
128
+ */
129
+ apella: ContractArtifacts;
92
130
  }
93
131
 
132
+ export const l1Artifacts: L1ContractArtifactsForDeployment = {
133
+ registry: {
134
+ contractAbi: RegistryAbi,
135
+ contractBytecode: RegistryBytecode,
136
+ },
137
+ inbox: {
138
+ contractAbi: InboxAbi,
139
+ contractBytecode: InboxBytecode,
140
+ },
141
+ outbox: {
142
+ contractAbi: OutboxAbi,
143
+ contractBytecode: OutboxBytecode,
144
+ },
145
+ rollup: {
146
+ contractAbi: RollupAbi,
147
+ contractBytecode: RollupBytecode,
148
+ },
149
+ feeJuice: {
150
+ contractAbi: TestERC20Abi,
151
+ contractBytecode: TestERC20Bytecode,
152
+ },
153
+ feeJuicePortal: {
154
+ contractAbi: FeeJuicePortalAbi,
155
+ contractBytecode: FeeJuicePortalBytecode,
156
+ },
157
+ sysstia: {
158
+ contractAbi: SysstiaAbi,
159
+ contractBytecode: SysstiaBytecode,
160
+ },
161
+ nomismatokopio: {
162
+ contractAbi: NomismatokopioAbi,
163
+ contractBytecode: NomismatokopioBytecode,
164
+ },
165
+ gerousia: {
166
+ contractAbi: GerousiaAbi,
167
+ contractBytecode: GerousiaBytecode,
168
+ },
169
+ apella: {
170
+ contractAbi: ApellaAbi,
171
+ contractBytecode: ApellaBytecode,
172
+ },
173
+ };
174
+
94
175
  export interface DeployL1ContractsArgs {
95
176
  /**
96
177
  * The address of the L2 Fee Juice contract.
@@ -161,7 +242,6 @@ export function createL1Clients(
161
242
  * @param account - Private Key or HD Account that will deploy the contracts.
162
243
  * @param chain - The chain instance to deploy to.
163
244
  * @param logger - A logger object.
164
- * @param contractsToDeploy - The set of L1 artifacts to be deployed
165
245
  * @param args - Arguments for initialization of L1 contracts
166
246
  * @returns A list of ETH addresses of the deployed contracts.
167
247
  */
@@ -170,7 +250,6 @@ export const deployL1Contracts = async (
170
250
  account: HDAccount | PrivateKeyAccount,
171
251
  chain: Chain,
172
252
  logger: DebugLogger,
173
- contractsToDeploy: L1ContractArtifactsForDeployment,
174
253
  args: DeployL1ContractsArgs,
175
254
  ): Promise<DeployL1Contracts> => {
176
255
  // We are assuming that you are running this on a local anvil node which have 1s block times
@@ -186,7 +265,7 @@ export const deployL1Contracts = async (
186
265
  return await (await fetch(rpcUrl, content)).json();
187
266
  };
188
267
  if (isAnvilTestChain(chain.id)) {
189
- const interval = 12;
268
+ const interval = 12; // @todo #8084
190
269
  const res = await rpcCall('anvil_setBlockTimestampInterval', [interval]);
191
270
  if (res.error) {
192
271
  throw new Error(`Error setting block interval: ${res.error.message}`);
@@ -198,15 +277,51 @@ export const deployL1Contracts = async (
198
277
 
199
278
  const walletClient = createWalletClient({ account, chain, transport: http(rpcUrl) });
200
279
  const publicClient = createPublicClient({ chain, transport: http(rpcUrl) });
201
- const deployer = new L1Deployer(walletClient, publicClient, args.salt, logger);
280
+ // Governance stuff
281
+ const govDeployer = new L1Deployer(walletClient, publicClient, args.salt, logger);
202
282
 
203
- const registryAddress = await deployer.deploy(contractsToDeploy.registry, [account.address.toString()]);
283
+ const registryAddress = await govDeployer.deploy(l1Artifacts.registry, [account.address.toString()]);
204
284
  logger.info(`Deployed Registry at ${registryAddress}`);
205
285
 
206
- const feeJuiceAddress = await deployer.deploy(contractsToDeploy.feeJuice);
286
+ const feeJuiceAddress = await govDeployer.deploy(l1Artifacts.feeJuice);
207
287
  logger.info(`Deployed Fee Juice at ${feeJuiceAddress}`);
208
288
 
209
- const feeJuicePortalAddress = await deployer.deploy(contractsToDeploy.feeJuicePortal, [
289
+ const nomismatokopioAddress = await govDeployer.deploy(l1Artifacts.nomismatokopio, [
290
+ feeJuiceAddress.toString(),
291
+ 1n * 10n ** 18n, // @todo #8084
292
+ account.address.toString(),
293
+ ]);
294
+ logger.info(`Deployed Nomismatokopio at ${nomismatokopioAddress}`);
295
+
296
+ const sysstiaAddress = await govDeployer.deploy(l1Artifacts.sysstia, [
297
+ feeJuiceAddress.toString(),
298
+ registryAddress.toString(),
299
+ ]);
300
+ logger.info(`Deployed Sysstia at ${sysstiaAddress}`);
301
+
302
+ // @todo #8084
303
+ // @note These numbers are just chosen to make testing simple.
304
+ const quorumSize = 6n;
305
+ const roundSize = 10n;
306
+ const gerousiaAddress = await govDeployer.deploy(l1Artifacts.gerousia, [
307
+ registryAddress.toString(),
308
+ quorumSize,
309
+ roundSize,
310
+ ]);
311
+ logger.info(`Deployed Gerousia at ${gerousiaAddress}`);
312
+
313
+ const apellaAddress = await govDeployer.deploy(l1Artifacts.apella, [
314
+ feeJuiceAddress.toString(),
315
+ gerousiaAddress.toString(),
316
+ ]);
317
+ logger.info(`Deployed Apella at ${apellaAddress}`);
318
+
319
+ await govDeployer.waitForDeployments();
320
+ logger.info(`All governance contracts deployed`);
321
+
322
+ const deployer = new L1Deployer(walletClient, publicClient, args.salt, logger);
323
+
324
+ const feeJuicePortalAddress = await deployer.deploy(l1Artifacts.feeJuicePortal, [
210
325
  account.address.toString(),
211
326
  registryAddress.toString(),
212
327
  feeJuiceAddress.toString(),
@@ -214,7 +329,7 @@ export const deployL1Contracts = async (
214
329
  ]);
215
330
  logger.info(`Deployed Fee Juice Portal at ${feeJuicePortalAddress}`);
216
331
 
217
- const rollupAddress = await deployer.deploy(contractsToDeploy.rollup, [
332
+ const rollupAddress = await deployer.deploy(l1Artifacts.rollup, [
218
333
  feeJuicePortalAddress.toString(),
219
334
  args.vkTreeRoot.toString(),
220
335
  args.protocolContractTreeRoot.toString(),
@@ -224,23 +339,23 @@ export const deployL1Contracts = async (
224
339
  logger.info(`Deployed Rollup at ${rollupAddress}`);
225
340
 
226
341
  await deployer.waitForDeployments();
227
- logger.info(`All contracts deployed`);
342
+ logger.info(`All core contracts deployed`);
228
343
 
229
344
  const feeJuicePortal = getContract({
230
345
  address: feeJuicePortalAddress.toString(),
231
- abi: contractsToDeploy.feeJuicePortal.contractAbi,
346
+ abi: l1Artifacts.feeJuicePortal.contractAbi,
232
347
  client: walletClient,
233
348
  });
234
349
 
235
350
  const feeJuice = getContract({
236
351
  address: feeJuiceAddress.toString(),
237
- abi: contractsToDeploy.feeJuice.contractAbi,
352
+ abi: l1Artifacts.feeJuice.contractAbi,
238
353
  client: walletClient,
239
354
  });
240
355
 
241
356
  const rollup = getContract({
242
357
  address: getAddress(rollupAddress.toString()),
243
- abi: contractsToDeploy.rollup.contractAbi,
358
+ abi: l1Artifacts.rollup.contractAbi,
244
359
  client: walletClient,
245
360
  });
246
361
 
@@ -310,7 +425,7 @@ export const deployL1Contracts = async (
310
425
  // We need to call a function on the registry to set the various contract addresses.
311
426
  const registryContract = getContract({
312
427
  address: getAddress(registryAddress.toString()),
313
- abi: contractsToDeploy.registry.contractAbi,
428
+ abi: l1Artifacts.registry.contractAbi,
314
429
  client: walletClient,
315
430
  });
316
431
  if (!(await registryContract.read.isRollupRegistered([getAddress(rollupAddress.toString())]))) {
@@ -323,6 +438,20 @@ export const deployL1Contracts = async (
323
438
  logger.verbose(`Registry ${registryAddress} has already registered rollup ${rollupAddress}`);
324
439
  }
325
440
 
441
+ // If the owner is not the Apella contract, transfer ownership to the Apella contract
442
+ if ((await registryContract.read.owner([])) !== getAddress(apellaAddress.toString())) {
443
+ const transferOwnershipTxHash = await registryContract.write.transferOwnership(
444
+ [getAddress(apellaAddress.toString())],
445
+ {
446
+ account,
447
+ },
448
+ );
449
+ logger.verbose(
450
+ `Transferring the ownership of the registry contract at ${registryAddress} to the Apella ${apellaAddress} in tx ${transferOwnershipTxHash}`,
451
+ );
452
+ txHashes.push(transferOwnershipTxHash);
453
+ }
454
+
326
455
  // Wait for all actions to be mined
327
456
  await Promise.all(txHashes.map(txHash => publicClient.waitForTransactionReceipt({ hash: txHash })));
328
457
  logger.verbose(`All transactions for L1 deployment have been mined`);
@@ -334,6 +463,10 @@ export const deployL1Contracts = async (
334
463
  outboxAddress,
335
464
  feeJuiceAddress,
336
465
  feeJuicePortalAddress,
466
+ nomismatokopioAddress,
467
+ sysstiaAddress,
468
+ gerousiaAddress,
469
+ apellaAddress,
337
470
  };
338
471
 
339
472
  return {
@@ -1,6 +1,5 @@
1
- import { type ConfigMappingsType, getConfigFromMappings } from '@aztec/foundation/config';
1
+ import { type ConfigMappingsType } from '@aztec/foundation/config';
2
2
  import { EthAddress } from '@aztec/foundation/eth-address';
3
- import type { DebugLogger } from '@aztec/foundation/log';
4
3
 
5
4
  /**
6
5
  * The names of the current L1 contract addresses.
@@ -14,6 +13,10 @@ export const l1ContractsNames = [
14
13
  'outboxAddress',
15
14
  'feeJuiceAddress',
16
15
  'feeJuicePortalAddress',
16
+ 'nomismatokopioAddress',
17
+ 'sysstiaAddress',
18
+ 'gerousiaAddress',
19
+ 'apellaAddress',
17
20
  ] as const;
18
21
 
19
22
  /**
@@ -56,37 +59,24 @@ export const l1ContractAddressesMapping: ConfigMappingsType<L1ContractAddresses>
56
59
  description: 'The deployed L1 Fee Juice portal contract address.',
57
60
  parseEnv,
58
61
  },
62
+ nomismatokopioAddress: {
63
+ env: 'NOMISMATOKOPIO_CONTRACT_ADDRESS',
64
+ description: 'The deployed L1 nomismatokopio contract address',
65
+ parseEnv,
66
+ },
67
+ sysstiaAddress: {
68
+ env: 'SYSSTIA_CONTRACT_ADDRESS',
69
+ description: 'The deployed L1 sysstia contract address',
70
+ parseEnv,
71
+ },
72
+ gerousiaAddress: {
73
+ env: 'GEROUSIA_CONTRACT_ADDRESS',
74
+ description: 'The deployed L1 gerousia contract address',
75
+ parseEnv,
76
+ },
77
+ apellaAddress: {
78
+ env: 'APELLA_CONTRACT_ADDRESS',
79
+ description: 'The deployed L1 apella contract address',
80
+ parseEnv,
81
+ },
59
82
  };
60
-
61
- export function getL1ContractAddressesFromEnv() {
62
- return getConfigFromMappings<L1ContractAddresses>(l1ContractAddressesMapping);
63
- }
64
-
65
- function convertToL1ContractAddresses(obj: any): L1ContractAddresses {
66
- if (typeof obj !== 'object' || obj === null) {
67
- throw new Error('Object is not valid');
68
- }
69
-
70
- const result: Partial<L1ContractAddresses> = {};
71
-
72
- for (const key of l1ContractsNames) {
73
- const value = obj[key];
74
- result[key] = EthAddress.fromString(value);
75
- }
76
-
77
- return result as L1ContractAddresses;
78
- }
79
-
80
- export async function getL1ContractAddressesFromUrl(url: string, log: DebugLogger): Promise<L1ContractAddresses> {
81
- try {
82
- const response = await fetch(url);
83
- if (!response.ok) {
84
- throw new Error(`HTTP error when fetching L1 contracts from ${url}. Status: ${response.status}`);
85
- }
86
- const data = await response.json();
87
- return convertToL1ContractAddresses(data);
88
- } catch (error) {
89
- log.error(`Error fetching JSON from ${url}:`, error);
90
- throw error;
91
- }
92
- }