add inbox/outbox

Author: spypsy

l1-contracts/scripts/verify-from-json.sh

@@ -123,6 +123,10 @@ resolve_fqn() {
       echo "src/core/Rollup.sol:Rollup" ;;
     SlashFactory)
       echo "src/periphery/SlashFactory.sol:SlashFactory" ;;
+    Inbox)
+      echo "src/core/messagebridge/Inbox.sol:Inbox" ;;
+    Outbox)
+      echo "src/core/messagebridge/Outbox.sol:Outbox" ;;
     *)
       echo "" ;;
   esac
@@ -197,9 +201,11 @@ for i in $(seq 0 $((records_len - 1))); do
   if [[ -n "$libs_summary" ]]; then echo "    Libraries: $libs_summary"; fi
   if [[ -n "$ctor" && "$ctor" != "0x" ]]; then echo "    Constructor args: (hex) ${#ctor} bytes"; fi
 
-  echo "    Command: ${cmd[*]}"
-
   "${cmd[@]}"
+
+  # Wait a bit to ensure etherscan verification is complete
+  sleep 5
+
   sourcify_import "$addr"
 done
 

yarn-project/ethereum/package.json

@@ -32,6 +32,7 @@
   ],
   "dependencies": {
     "@aztec/blob-lib": "workspace:^",
+    "@aztec/constants": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/l1-artifacts": "workspace:^",
     "@viem/anvil": "^0.0.10",

yarn-project/ethereum/src/deploy_l1_contracts.ts

@@ -1,3 +1,4 @@
+import { L1_TO_L2_MSG_SUBTREE_HEIGHT } from '@aztec/constants';
 import { SecretValue, getActiveNetworkName } from '@aztec/foundation/config';
 import { keccak256String } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
@@ -1019,6 +1020,24 @@ export const deployL1Contracts = async (
   // Write verification data (constructor args + linked libraries) to file for later forge verify
   if (createVerificationJson) {
     try {
+      // Add Inbox / Outbox verification records (constructor args are created inside RollupCore)
+      const rollupAddr = l1Contracts.rollupAddress.toString();
+      const inboxAddr = l1Contracts.inboxAddress.toString();
+      const outboxAddr = l1Contracts.outboxAddress.toString();
+      const feeAsset = l1Contracts.feeJuiceAddress.toString();
+      const version = await rollup.getVersion();
+
+      const inboxCtor = encodeAbiParameters(
+        [{ type: 'address' }, { type: 'address' }, { type: 'uint256' }, { type: 'uint256' }],
+        [rollupAddr, feeAsset, version, BigInt(L1_TO_L2_MSG_SUBTREE_HEIGHT)],
+      );
+
+      const outboxCtor = encodeAbiParameters([{ type: 'address' }, { type: 'uint256' }], [rollupAddr, version]);
+
+      deployer.verificationRecords.push(
+        { name: 'Inbox', address: inboxAddr, constructorArgsHex: inboxCtor, libraries: [] },
+        { name: 'Outbox', address: outboxAddr, constructorArgsHex: outboxCtor, libraries: [] },
+      );
       const date = new Date();
       const formattedDate = date.toISOString().slice(2, 19).replace(/[-T:]/g, '');
       // Ensure the verification output directory exists

yarn-project/ethereum/tsconfig.json

@@ -10,6 +10,9 @@
     {
       "path": "../blob-lib"
     },
+    {
+      "path": "../constants"
+    },
     {
       "path": "../foundation"
     },

yarn-project/yarn.lock

@@ -672,6 +672,7 @@ __metadata:
   resolution: "@aztec/ethereum@workspace:ethereum"
   dependencies:
     "@aztec/blob-lib": "workspace:^"
+    "@aztec/constants": "workspace:^"
     "@aztec/foundation": "workspace:^"
     "@aztec/l1-artifacts": "workspace:^"
     "@jest/globals": "npm:^30.0.0"