chore: update tsconfigs

l1-contracts/.rebuild_patterns

@@ -1 +1,2 @@
 ^l1-contracts/src/.*\.sol$
+^l1-contracts/test/governance/scenario/NewGerousiaPayload.sol$

yarn-project/aztec-node/package.json

@@ -67,7 +67,6 @@
     "@aztec/ethereum": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/kv-store": "workspace:^",
-    "@aztec/l1-artifacts": "workspace:^",
     "@aztec/merkle-tree": "workspace:^",
     "@aztec/p2p": "workspace:^",
     "@aztec/protocol-contracts": "workspace:^",

yarn-project/aztec-node/tsconfig.json

@@ -27,9 +27,6 @@
     {
       "path": "../kv-store"
     },
-    {
-      "path": "../l1-artifacts"
-    },
     {
       "path": "../merkle-tree"
     },

yarn-project/aztec/package.json

@@ -43,7 +43,6 @@
     "@aztec/ethereum": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/kv-store": "workspace:^",
-    "@aztec/l1-artifacts": "workspace:^",
     "@aztec/noir-contracts.js": "workspace:^",
     "@aztec/noir-protocol-circuits-types": "workspace:^",
     "@aztec/p2p": "workspace:^",

yarn-project/aztec/tsconfig.json

@@ -51,9 +51,6 @@
     {
       "path": "../kv-store"
     },
-    {
-      "path": "../l1-artifacts"
-    },
     {
       "path": "../noir-contracts.js"
     },

yarn-project/end-to-end/scripts/native-network/deploy-l1-contracts.sh

@@ -43,6 +43,11 @@ INBOX_CONTRACT_ADDRESS=$(echo "$output" | grep -oP 'L1 -> L2 Inbox Address: \K0x
 OUTBOX_CONTRACT_ADDRESS=$(echo "$output" | grep -oP 'L2 -> L1 Outbox Address: \K0x[a-fA-F0-9]{40}')
 FEE_JUICE_CONTRACT_ADDRESS=$(echo "$output" | grep -oP 'Fee Juice Address: \K0x[a-fA-F0-9]{40}')
 FEE_JUICE_PORTAL_CONTRACT_ADDRESS=$(echo "$output" | grep -oP 'Fee Juice Portal Address: \K0x[a-fA-F0-9]{40}')
+NOMISMATOKOPIO_CONTRACT_ADDRESS=$(echo "$output" | grep -oP 'Nomismatokopio Address: \K0x[a-fA-F0-9]{40}')
+SYSSTIA_CONTRACT_ADDRESS=$(echo "$output" | grep -oP 'Sysstia Address: \K0x[a-fA-F0-9]{40}')
+GEROUSIA_CONTRACT_ADDRESS=$(echo "$output" | grep -oP 'Gerousia Address: \K0x[a-fA-F0-9]{40}')
+APELLA_CONTRACT_ADDRESS=$(echo "$output" | grep -oP 'Apella Address: \K0x[a-fA-F0-9]{40}')
+
 
 # Save contract addresses to state/l1-contracts.env
 cat << EOCONFIG > $(git rev-parse --show-toplevel)/yarn-project/end-to-end/scripts/native-network/state/l1-contracts.env
@@ -52,6 +57,10 @@ export INBOX_CONTRACT_ADDRESS=$INBOX_CONTRACT_ADDRESS
 export OUTBOX_CONTRACT_ADDRESS=$OUTBOX_CONTRACT_ADDRESS
 export FEE_JUICE_CONTRACT_ADDRESS=$FEE_JUICE_CONTRACT_ADDRESS
 export FEE_JUICE_PORTAL_CONTRACT_ADDRESS=$FEE_JUICE_PORTAL_CONTRACT_ADDRESS
+export NOMISMATOKOPIO_CONTRACT_ADDRESS=$NOMISMATOKOPIO_CONTRACT_ADDRESS
+export SYSSTIA_CONTRACT_ADDRESS=$SYSSTIA_CONTRACT_ADDRESS
+export GEROUSIA_CONTRACT_ADDRESS=$GEROUSIA_CONTRACT_ADDRESS
+export APELLA_CONTRACT_ADDRESS=$APELLA_CONTRACT_ADDRESS
 EOCONFIG
 
 echo "Contract addresses saved to state/l1-contracts.env"

yarn-project/end-to-end/src/e2e_p2p/gerousia.test.ts

@@ -46,6 +46,7 @@ describe('e2e_p2p_gerousia', () => {
   /**
    * There is some flaky behavior in here, likely similar to what is in the gossip test.
    * For this reason we are not running it as part of the CI.
+   * TODO(https://github.com/AztecProtocol/aztec-packages/issues/9164): Currently flakey
    */
   it.skip('Should cast votes to upgrade gerousia', async () => {
     // create the bootstrap node for the network

yarn-project/ethereum/tsconfig.json

@@ -5,10 +5,15 @@
     "rootDir": "src",
     "tsBuildInfoFile": ".tsbuildinfo"
   },
-  "include": ["src"],
+  "include": [
+    "src"
+  ],
   "references": [
     {
       "path": "../foundation"
+    },
+    {
+      "path": "../l1-artifacts"
     }
   ]
 }

yarn-project/sequencer-client/src/publisher/utils.ts

@@ -15,13 +15,8 @@ export function prettyLogViemErrorMsg(err: any) {
 }
 
 export function prettyLogViemError(err: any, logger: Logger) {
-  if (err instanceof BaseError) {
-    const revertError = err.walk(err => err instanceof ContractFunctionRevertedError);
-    if (revertError instanceof ContractFunctionRevertedError) {
-      const errorName = revertError.data?.errorName ?? '';
-      const args =
-        revertError.metaMessages && revertError.metaMessages?.length > 1 ? revertError.metaMessages[1].trimStart() : '';
-      logger.debug(`canProposeAtTime failed with "${errorName}${args}"`);
-    }
+  const msg = prettyLogViemErrorMsg(err);
+  if (msg) {
+    logger.debug(`canProposeAtTime failed with "${msg}"`);
   }
 }

yarn-project/sequencer-client/src/sequencer/sequencer.ts

@@ -40,7 +40,7 @@ import { inspect } from 'util';
 import { type BlockBuilderFactory } from '../block_builder/index.js';
 import { type GlobalVariableBuilder } from '../global_variable_builder/global_builder.js';
 import { type L1Publisher } from '../publisher/l1-publisher.js';
-import { prettyLogViemError } from '../publisher/utils.js';
+import { prettyLogViemErrorMsg } from '../publisher/utils.js';
 import { type TxValidatorFactory } from '../tx_validator/tx_validator_factory.js';
 import { type SequencerConfig } from './config.js';
 import { SequencerMetrics } from './metrics.js';
@@ -315,8 +315,10 @@ export class Sequencer {
       this.log.debug(`Can propose block ${proposalBlockNumber} at slot ${slot}`);
       return slot;
     } catch (err) {
-      this.log.verbose(`Rejected from being able to propose at next block with ${tipArchive}`);
-      prettyLogViemError(err, this.log);
+      const msg = prettyLogViemErrorMsg(err);
+      this.log.verbose(
+        `Rejected from being able to propose at next block with ${tipArchive.toString('hex')}: ${msg ? `${msg}` : ''}`,
+      );
       throw err;
     }
   }

yarn-project/yarn.lock

@@ -152,7 +152,6 @@ __metadata:
     "@aztec/ethereum": "workspace:^"
     "@aztec/foundation": "workspace:^"
     "@aztec/kv-store": "workspace:^"
-    "@aztec/l1-artifacts": "workspace:^"
     "@aztec/merkle-tree": "workspace:^"
     "@aztec/p2p": "workspace:^"
     "@aztec/protocol-contracts": "workspace:^"
@@ -248,7 +247,6 @@ __metadata:
     "@aztec/ethereum": "workspace:^"
     "@aztec/foundation": "workspace:^"
     "@aztec/kv-store": "workspace:^"
-    "@aztec/l1-artifacts": "workspace:^"
     "@aztec/noir-contracts.js": "workspace:^"
     "@aztec/noir-protocol-circuits-types": "workspace:^"
     "@aztec/p2p": "workspace:^"